Merge branch 'main' into RequestResponseStreaming

awslabs · Feb 6, 2025 · 87454a3 · 87454a3
2 parents 5039412 + 495dfe8
commit 87454a3
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -162,7 +162,7 @@ jobs:
         ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
 
   linux-musl-arm:
-    runs-on: ubuntu-24.04 # latest
+    runs-on: ubuntu-22.04 # temporarily downgrade to old ubuntu as 24.04 likes to segfault in the middle of the build
     strategy:
       matrix:
         image:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,43 +1,17 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 
 project(aws-crt-jni C)
 option(BUILD_DEPS "Builds aws common runtime dependencies as part of build" ON)
 option(CRT_FIPS "Whether to build aws-lc with FIPS compliance" OFF)
 
-if (POLICY CMP0077)
-    cmake_policy(SET CMP0077 NEW) # Enable options to get their values from normal variables
-endif()
-
-if (DEFINED CMAKE_PREFIX_PATH)
-    file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
-endif()
-
-if (DEFINED CMAKE_INSTALL_PREFIX)
-    file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
-endif()
-
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-endif()
-
-if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-    set(FIND_LIBRARY_USE_LIB64_PATHS true)
-endif()
+include(GNUInstallDirs)
 
 if (NOT WIN32 AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 endif()
 
 message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-# Append that generated list to the module search path
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
-
 # Local CMake scripts
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
@@ -111,6 +85,9 @@ if (BUILD_DEPS)
     add_subdirectory(crt/aws-c-event-stream)
     add_subdirectory(crt/aws-c-s3)
 else()
+    # this is required so we can use aws-c-common's CMake modules
+    find_package(aws-c-common REQUIRED)
+
     include(AwsFindPackage)
     include(AwsCFlags)
     set(IN_SOURCE_BUILD OFF)

diff --git a/codebuild/cd/musl-arm64-build.yml b/codebuild/cd/musl-arm64-build.yml
@@ -8,7 +8,7 @@ phases:
   build:
     commands:
       - cd aws-crt-java
-      - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-arm64 linux-aarch_64-musl
+      - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-arm64 linux-aarch_64-musl linux/aarch64
 
   post_build:
     commands:

diff --git a/codebuild/cd/musl-armv7-build.yml b/codebuild/cd/musl-armv7-build.yml
@@ -9,7 +9,7 @@ phases:
     commands:
       - cd aws-crt-java
       - export AWS_CRT_ARCH=armv7
-      - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-armv7 linux-armv7-musl
+      - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-armv7 linux-armv7-musl linux/arm/v7
 
   post_build:
     commands:

diff --git a/codebuild/cd/musl-linux-build.sh b/codebuild/cd/musl-linux-build.sh
@@ -6,18 +6,25 @@ IMAGE_NAME=$1
 shift
 CLASSIFIER=$1
 shift
+ARCH=$1
+shift
 
 # Pry the builder version this CRT is using out of ci.yml
 BUILDER_VERSION=$(cat .github/workflows/ci.yml | grep 'BUILDER_VERSION:' | sed 's/\s*BUILDER_VERSION:\s*\(.*\)/\1/')
 echo "Using builder version ${BUILDER_VERSION}"
 
 aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
 export DOCKER_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/${IMAGE_NAME}:${BUILDER_VERSION}
-export QEMU_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/multiarch-qemu-user-static:latest
-docker run --rm --privileged ${QEMU_IMAGE} --reset -p yes
+
+# on x86-64 and aarch64 we run on native images in codebuild 
+# on other platforms we require emulation which is done through binfmt
+if [ "$ARCH" != "linux/aarch64" ]; then 
+  export QEMU_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/multiarch-qemu-user-static:latest
+  docker run --rm --privileged ${QEMU_IMAGE} --reset -p yes
+fi
 
 export BRANCH_TAG=$(git describe --tags)
-docker run --mount type=bind,src=$(pwd),dst=/root/aws-crt-java --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-java --classifier ${CLASSIFIER} --branch ${BRANCH_TAG} run_tests=false
+docker run --mount type=bind,src=$(pwd),dst=/root/aws-crt-java --env CXXFLAGS --env AWS_CRT_ARCH --platform ${ARCH} $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-java --classifier ${CLASSIFIER} --branch ${BRANCH_TAG} run_tests=false
 docker container prune -f
 
 # Upload the artifacts to S3

diff --git a/codebuild/cd/musl-x64-build.yml b/codebuild/cd/musl-x64-build.yml
@@ -8,7 +8,7 @@ phases:
   build:
     commands:
       - cd aws-crt-java
-      - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-x64 linux-x86_64-musl
+      - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-x64 linux-x86_64-musl linux/amd64
 
   post_build:
     commands:

diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
diff --git a/crt/aws-checksums b/crt/aws-checksums
diff --git a/crt/s2n b/crt/s2n
+159 −74		.github/workflows/ci.yml
+9 −22		CMakeLists.txt
+0 −2		bin/produce_x_platform_fuzz_corpus/CMakeLists.txt
+0 −2		bin/run_x_platform_fuzz_corpus/CMakeLists.txt
+0 −2		bin/sha256_profile/CMakeLists.txt
+1 −1		.github/PULL_REQUEST_TEMPLATE.md
+2 −2		.github/workflows/codecov.yml
+1 −1		.github/workflows/proof_ci.yaml
+1 −1		AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+7 −10		CMakeLists.txt
+0 −2		bin/system_info/CMakeLists.txt
+6 −20		cmake/AwsSharedLibSetup.cmake
+1 −1		cmake/CPackConfig.cmake
+3 −0		cmake/aws-c-common-config.cmake
+11 −0		source/arch/intel/asm/cpuid.c
+71 −102		source/arch/intel/cpuid.c
+5 −0		source/arch/intel/msvc/cpuid.c
+29 −16		source/host_utils.c
+3 −2		source/uri.c
+1 −0		tests/CMakeLists.txt
+23 −2		tests/host_util_test.c
+12 −0		tests/uri_test.c
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+76 −26		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+9 −23		CMakeLists.txt
+1 −1		source/huffman_generator/CMakeLists.txt
+2 −3		source/huffman_generator/generator.c
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+80 −31		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+8 −32		CMakeLists.txt
+134 −51		.github/workflows/ci.yml
+8 −22		CMakeLists.txt
+1 −3		bin/elasticurl/CMakeLists.txt
+1 −1		builder.json
+172 −73		.github/workflows/ci.yml
+3 −3		.github/workflows/proof-alarm.yml
+33 −34		CMakeLists.txt
+26 −0		include/aws/io/event_loop.h
+25 −8		include/aws/io/private/event_loop_impl.h
+72 −0		include/aws/io/private/socket_impl.h
+31 −15		include/aws/io/socket.h
+0 −1		include/aws/testing/io_testing_channel.h
+3 −1		source/bsd/kqueue_event_loop.c
+1 −1		source/darwin/secure_transport_tls_channel_handler.c
+167 −9		source/event_loop.c
+1 −1		source/linux/epoll_event_loop.c
+75 −44		source/posix/socket.c
+258 −0		source/socket.c
+1 −0		source/windows/host_resolver.c
+1 −1		source/windows/iocp/iocp_event_loop.c
+108 −81		source/windows/iocp/socket.c
+1 −0		source/windows/winsock_init.c
+6 −0		tests/CMakeLists.txt
+76 −3		tests/event_loop_test.c
+1 −1		tests/socket_handler_test.c
+48 −0		tests/socket_test.c
+1 −1		tests/tls_handler_test.c
+2 −2		tests/vcc/Makefile
+3 −3		tests/vcc/new_destroy.c
+1 −1		tests/vcc/preamble.h
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+79 −30		.github/workflows/ci.yml
+18 −12		.github/workflows/codecov.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+12 −26		CMakeLists.txt
+1 −3		bin/elastipubsub/CMakeLists.txt
+1 −3		bin/elastipubsub5/CMakeLists.txt
+1 −3		bin/elastishadow/CMakeLists.txt
+5 −1		bin/elastishadow/main.c
+1 −3		bin/mqtt5canary/CMakeLists.txt
+4 −1		include/aws/mqtt/request-response/request_response_client.h
+1 −1		source/request-response/request_response_client.c
+2 −2		source/v5/mqtt5_options_storage.c
+133 −45		tests/request-response/request_response_client_tests.c
+35 −18		.github/workflows/ci.yml
+2 −2		.github/workflows/codecov.yml
+8 −23		CMakeLists.txt
+4 −0		include/aws/s3/private/s3_copy_object.h
+8 −1		include/aws/s3/private/s3_request_messages.h
+10 −3		include/aws/s3/private/s3express_credentials_provider_impl.h
+17 −4		include/aws/s3/s3_client.h
+2 −0		include/aws/s3/s3express_credentials_provider.h
+1 −3		samples/s3/CMakeLists.txt
+4 −4		source/s3_client.c
+14 −1		source/s3_copy_object.c
+158 −153		source/s3_endpoint_resolver/aws_s3_endpoint_resolver_partition.c
+1 −0		source/s3_meta_request.c
+56 −14		source/s3_request_messages.c
+85 −28		source/s3express_credentials_provider.c
+3 −0		tests/CMakeLists.txt
+14 −0		tests/mock_s3_server/CompleteMultipartUpload/sse_kms.json
+21 −0		tests/mock_s3_server/CreateSession/sse_kms.json
+2 −0		tests/mock_s3_server/README.md
+15 −4		tests/mock_s3_server/mock_s3_server.py
+143 −6		tests/s3_data_plane_tests.c
+81 −2		tests/s3_mock_server_s3express_provider_test.c
+84 −4		tests/s3_s3express_client_test.c
+30 −14		tests/s3_tester.c
+8 −2		tests/s3_tester.h
+80 −30		.github/workflows/ci.yml
+18 −12		.github/workflows/codecov.yml
+9 −24		CMakeLists.txt
+1 −0		include/aws/sdkutils/aws_profile.h
+47 −29		source/aws_profile.c
+3 −2		tests/CMakeLists.txt
+297 −299		tests/aws_profile_tests.c
+2 −2		tests/endpoints_regex_tests.c
+173 −95		.github/workflows/ci.yml
+8 −22		CMakeLists.txt
+1 −3		bin/benchmark/CMakeLists.txt
+0 −53		cmake/AwsSharedLibSetup.cmake