Skip to content

Commit

Permalink
Update dependencies (#52)
Browse files Browse the repository at this point in the history 
* Added aws-c-compression @ v0.2.2

* Updated aws-c-common to v0.3.13

* Updated aws-c-io to v0.3.13

* Updated aws-c-http to v0.2.18

* Updated aws-c-mqtt to v0.3.8

* Updated aws-c-cal to v0.1.5

* Added aws-c-compression to setup.py

* Removed redundant build of native module

* Fixed linker ordering
  • Loading branch information
Justin Boswell authored Jun 17, 2019
1 parent 0f1725d commit 091baaf
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "aws-c-http"]
path = aws-c-http
url = git://github.com/awslabs/aws-c-http
[submodule "aws-c-compression"]
path = aws-c-compression
url = git://github.com/awslabs/aws-c-compression
2 changes: 1 addition & 1 deletion aws-c-cal
Submodule aws-c-cal updated 8 files
+1 −1 .clang-tidy
+5 −1 CMakeLists.txt
+2 −2 source/bcrypt/bcrypt_hash.c
+1 −1 source/bcrypt/bcrypt_hmac.c
+1 −1 source/commoncrypto/commoncrypto_hmac.c
+1 −1 source/hash.c
+1 −1 source/hmac.c
+1 −1 source/opensslcrypto/opensslcrypto_hmac.c
2 changes: 1 addition & 1 deletion aws-c-common
Submodule aws-c-common updated 284 files
1 change: 1 addition & 0 deletions aws-c-compression
Submodule aws-c-compression added at 9cefc6
2 changes: 1 addition & 1 deletion aws-c-http
Submodule aws-c-http updated 46 files
+1 −1 .clang-tidy
+6 −0 .travis.yml
+7 −2 CMakeLists.txt
+20 −13 bin/elasticurl/main.c
+1 −0 cmake/aws-c-http-config.cmake
+1 −0 codebuild/common-posix.sh
+1 −0 codebuild/common-windows.bat
+48 −0 continuous-delivery/build-elasticurl-manylinux-x64.yml
+33 −0 continuous-delivery/build-elasticurl-osx.sh
+38 −0 continuous-delivery/build-elasticurl-unix.sh
+35 −0 continuous-delivery/build-elasticurl-win64.bat
+10 −2 include/aws/http/connection.h
+113 −0 include/aws/http/connection_manager.h
+6 −0 include/aws/http/http.h
+6 −18 include/aws/http/private/connection_impl.h
+51 −0 include/aws/http/private/connection_manager_function_table.h
+0 −108 include/aws/http/private/decode.h
+54 −0 include/aws/http/private/h1_decoder.h
+70 −0 include/aws/http/private/hpack.h
+84 −0 include/aws/http/private/hpack_header_static_table.def
+276 −0 include/aws/http/private/hpack_huffman_static_table.def
+54 −0 include/aws/http/private/http_impl.h
+1 −1 include/aws/http/private/websocket_encoder.h
+3 −6 include/aws/http/private/websocket_impl.h
+68 −36 include/aws/http/websocket.h
+164 −75 source/connection.c
+967 −0 source/connection_manager.c
+46 −62 source/h1_connection.c
+58 −76 source/h1_decoder.c
+441 −0 source/hpack.c
+2,347 −0 source/hpack_huffman_static.c
+16 −1 source/http.c
+6 −6 source/request_response.c
+768 −121 source/websocket.c
+7 −7 source/websocket_decoder.c
+10 −19 source/websocket_encoder.c
+59 −28 tests/CMakeLists.txt
+591 −0 tests/test_connection_manager.c
+0 −814 tests/test_decode.c
+5 −20 tests/test_h1_client.c
+822 −0 tests/test_h1_decoder.c
+357 −0 tests/test_hpack.c
+1 −90 tests/test_tls.c
+1 −1 tests/test_websocket_decoder.c
+9 −55 tests/test_websocket_encoder.c
+971 −32 tests/test_websocket_handler.c
2 changes: 1 addition & 1 deletion aws-c-io
Submodule aws-c-io updated 59 files
+1 −1 .clang-tidy
+5 −1 CMakeLists.txt
+2 −0 include/aws/io/io.h
+2 −193 include/aws/io/logging.h
+58 −0 include/aws/io/shared_library.h
+13 −0 include/aws/io/uri.h
+78 −21 include/aws/testing/io_testing_channel.h
+3 −2 source/alpn_handler.c
+20 −23 source/bsd/kqueue_event_loop.c
+23 −29 source/channel.c
+208 −137 source/channel_bootstrap.c
+3 −2 source/darwin/darwin_pki_utils.c
+9 −11 source/darwin/secure_transport_tls_channel_handler.c
+29 −27 source/event_loop.c
+216 −111 source/host_resolver.c
+6 −0 source/io.c
+23 −24 source/libuv/uv_event_loop.c
+4 −10 source/linux/epoll_event_loop.c
+5 −7 source/log_channel.c
+3 −4 source/log_formatter.c
+2 −2 source/log_writer.c
+7 −140 source/logging.c
+4 −7 source/message_pool.c
+2 −2 source/pki_utils.c
+23 −27 source/posix/pipe.c
+76 −0 source/posix/shared_library.c
+19 −20 source/posix/socket.c
+11 −12 source/s2n/s2n_tls_channel_handler.c
+17 −11 source/socket_channel_handler.c
+7 −7 source/stream.c
+130 −0 source/uri.c
+24 −24 source/windows/iocp/iocp_event_loop.c
+21 −26 source/windows/iocp/pipe.c
+31 −36 source/windows/iocp/socket.c
+69 −73 source/windows/secure_channel_tls_handler.c
+75 −0 source/windows/shared_library.c
+1 −1 source/windows/windows_pki_utils.c
+4 −4 source/windows/winsock_init.c
+12 −19 tests/CMakeLists.txt
+1 −1 tests/alpn_handler_test.c
+63 −25 tests/channel_test.c
+31 −0 tests/io_testing_channel_test.c
+0 −31 tests/logging/logging_filter_debug_static_test.c
+0 −31 tests/logging/logging_filter_error_static_test.c
+0 −31 tests/logging/logging_filter_fatal_static_test.c
+0 −31 tests/logging/logging_filter_info_static_test.c
+0 −31 tests/logging/logging_filter_none_static_test.c
+0 −29 tests/logging/logging_filter_trace_static_test.c
+0 −31 tests/logging/logging_filter_warn_static_test.c
+0 −39 tests/logging/logging_general_test.c
+0 −46 tests/logging/logging_test_utilities.c
+0 −65 tests/logging/logging_test_utilities.h
+0 −124 tests/logging/test_logger.c
+0 −45 tests/logging/test_logger.h
+9 −9 tests/pipe_test.c
+93 −0 tests/shared_library_test.c
+1 −1 tests/socket_test.c
+108 −5 tests/tls_handler_test.c
+77 −0 tests/uri_test.c
2 changes: 1 addition & 1 deletion aws-c-mqtt
Submodule aws-c-mqtt updated 11 files
+1 −1 .clang-tidy
+1 −0 .gitignore
+5 −6 CMakeLists.txt
+37 −35 source/client.c
+7 −7 source/client_channel_handler.c
+8 −10 source/fixed_header.c
+50 −51 source/packets.c
+27 −27 source/topic_tree.c
+7 −7 tests/aws_iot_client_test.c
+6 −6 tests/packet_encoding_test.c
+6 −6 tests/paho_client_test.c
3 changes: 1 addition & 2 deletions codebuild/common-linux.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CMAKE_ARGS="$@"
git submodule update --init --recursive
export AWS_C_INSTALL=`pwd`/build/deps/install

python3 setup.py build
python3 setup.py install

# Tests cannot be run on ancient linux, which is detectable because it does not have lsb_release on it
LSB_BINARY=`which lsb_release`
Expand All @@ -21,7 +21,6 @@ cert=$(aws secretsmanager get-secret-value --secret-id "unit-test/certificate" -
key=$(aws secretsmanager get-secret-value --secret-id "unit-test/privatekey" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$key" > /tmp/privatekey.pem
ENDPOINT=$(aws secretsmanager get-secret-value --secret-id "unit-test/endpoint" --query "SecretString" | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')

python3 setup.py build install
python3 elasticurl.py -v ERROR -P -H "content-type: application/json" -i -d "{'test':'testval'}" http://httpbin.org/post
python3 elasticurl.py -v ERROR -i https://example.com
python3 mqtt_test.py --endpoint $ENDPOINT --port 8883 --cert /tmp/certificate.pem --key /tmp/privatekey.pem --root-ca /tmp/AmazonRootCA1.pem
3 changes: 2 additions & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,15 @@ def build_dependency(lib_name):
build_dependency('aws-c-io')
build_dependency('aws-c-mqtt')
build_dependency('aws-c-cal')
build_dependency('aws-c-compression')
build_dependency('aws-c-http')

os.chdir(current_dir)

from distutils.ccompiler import get_default_compiler
compiler_type = get_default_compiler()

aws_c_libs = ['aws-c-mqtt', 'aws-c-io', 'aws-c-common', 'aws-c-cal', 'aws-c-http']
aws_c_libs = ['aws-c-mqtt', 'aws-c-http', 'aws-c-io', 'aws-c-compression', 'aws-c-cal', 'aws-c-common']

def get_from_env(key):
try:
Expand Down

0 comments on commit 091baaf

Please sign in to comment.