Update CRT to v0.30.1

aws · Jan 31, 2025 · 727526c · 727526c
1 parent 7f9d72c
commit 727526c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 #
 
-cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.13...3.31)
 
 option(LEGACY_BUILD "If enabled, the SDK will use 1.11.0 version of CMake files to build" ON)
 if (LEGACY_BUILD)
@@ -240,11 +240,7 @@ if (LEGACY_BUILD)
             set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_PREV})
         endif ()
     else ()
-        # 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})
+        find_package(aws-c-common REQUIRED)
         include(AwsFindPackage)
         set(IN_SOURCE_BUILD OFF)
     endif ()

diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp
diff --git a/prefetch_crt_dependency.sh b/prefetch_crt_dependency.sh
@@ -3,20 +3,20 @@
 # SPDX-License-Identifier: Apache-2.0.
 
 CRT_URI_PREFIX=https://codeload.github.com/awslabs
-CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/b5577fa39c3a11f09c06db10ac6eaaca3910cbe2  # v0.29.7
-
-AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/3982bd75fea74efd8f9b462b27fedd4599db4f53  # v0.8.0
-AWS_C_CAL_URI=${CRT_URI_PREFIX}/aws-c-cal/zip/fbbe2612a3385d1ded02a52d20ad7fd2da4501f4  # v0.8.1
-AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/fadfef492042ae53387d4369a6de652c930a5be4  # v0.10.5
-AWS_C_COMPRESSION_URI=${CRT_URI_PREFIX}/aws-c-compression/zip/c6c1191e525e5aa6ead9e1afc392e35d3b50331e  # v0.3.0
-AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/d2dcc9344dae24de320866045d85166d8a91a0d1  # v0.5.0
-AWS_C_HTTP_URI=${CRT_URI_PREFIX}/aws-c-http/zip/fc3eded2465c37d07fd9cc15e9b5b011224c9c9a  # v0.9.2
-AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/fcb38c804364dd627c335da752a99a125a88f6e9  # v0.15.3
-AWS_C_MQTT_URI=${CRT_URI_PREFIX}/aws-c-mqtt/zip/627c3334e52021aa8d5772b6ca076884610f3219  # v0.11.0
-AWS_C_S3_URI=${CRT_URI_PREFIX}/aws-c-s3/zip/337155f6c07d39e61234e705ed6e58c31d4841eb  # v0.7.5
-AWS_C_SDKUTILS_URI=${CRT_URI_PREFIX}/aws-c-sdkutils/zip/ce09f79768653dbdc810fc14cad8685dd90acba1  # v0.2.1
-AWS_CHECKSUMS_URI=${CRT_URI_PREFIX}/aws-checksums/zip/3e4101b9f85a2c090774d27ae2131fca1082f522  # v0.2.2
-AWS_LC_URI=${CRT_URI_PREFIX}/aws-lc/zip/59828538a790094113eacd5dd23d01be2885b36a  # v1.40.0
+CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/9a820b302264b2bfe2e3f61a443fb1c652e6bd79  # v0.30.1
+
+AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/b513db4bf82429a1134fecbd6d12e5fda45255a6  # v0.8.4
+AWS_C_CAL_URI=${CRT_URI_PREFIX}/aws-c-cal/zip/7299c6ab9244595b140d604475cdd6c6921be8ae  # v0.8.3
+AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/0e7637fa852a472bd4c37fc07a325a09c942a5fc  # v0.11.0
+AWS_C_COMPRESSION_URI=${CRT_URI_PREFIX}/aws-c-compression/zip/f951ab2b819fc6993b6e5e6cfef64b1a1554bfc8  # v0.3.1
+AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/9422ef78aac566414d1bebb1a5431a4c53a7547c  # v0.5.1
+AWS_C_HTTP_URI=${CRT_URI_PREFIX}/aws-c-http/zip/590c7b597f87e5edc080b8b77418690c30319832  # v0.9.3
+AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/3041dabfc13fe9bc9a0467e15aa1d5a09c7fc06f  # v0.15.4
+AWS_C_MQTT_URI=${CRT_URI_PREFIX}/aws-c-mqtt/zip/83247bde8268905018327891fcf0147f3e438a80  # v0.12.1
+AWS_C_S3_URI=${CRT_URI_PREFIX}/aws-c-s3/zip/6eb8be530b100fed5c6d24ca48a57ee2e6098fbf  # v0.7.11
+AWS_C_SDKUTILS_URI=${CRT_URI_PREFIX}/aws-c-sdkutils/zip/ba6a28fab7ed5d7f1b3b1d12eb672088be093824  # v0.2.3
+AWS_CHECKSUMS_URI=${CRT_URI_PREFIX}/aws-checksums/zip/fb8bd0b8cff00c8c24a35d601fce1b4c611df6da  # v0.2.3
+AWS_LC_URI=${CRT_URI_PREFIX}/aws-lc/zip/ffd6fb71b1e1582a620149337b77706f2391578d  # v1.43.0
 S2N_URI=${CRT_URI_PREFIX}/s2n/zip/493b77167dc367c394de23cfe78a029298e2a254  # v1.5.9
 
 

diff --git a/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp b/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp
@@ -241,7 +241,6 @@ TEST_F(SmithyClientTest, testSigV4) {
     auto res = ptr->SelectAuthSchemeOption(ctx);
 
     EXPECT_EQ(res.IsSuccess(), true);
-    std::cout<<"selected scheme id="<<res.GetResult().schemeId<<std::endl;
     EXPECT_EQ(res.GetResult().schemeId, key);
 
     Aws::String uri{"https://treasureisland-cb93079d-24a0-4862-8es2-88456ead.xyz.amazonaws.com"};
@@ -251,9 +250,6 @@ TEST_F(SmithyClientTest, testSigV4) {
     auto res2 = ptr->SignRequest(httpRequest, res.GetResult());
 
     EXPECT_EQ(res2.IsSuccess(), true);
-
-    std::cout<<"Final auth="<<res2.GetResult()->GetAwsAuthorization()<<std::endl;
-
     EXPECT_EQ(res2.GetResult()->GetSigningAccessKey(), "dummyAccessId");
 
 
@@ -293,8 +289,6 @@ TEST_F(SmithyClientTest, testSigV4a) {
     auto res = ptr->SelectAuthSchemeOption(ctx);
 
     EXPECT_EQ(res.IsSuccess(), true);
-
-    std::cout<<"selected scheme id="<<res.GetResult().schemeId<<std::endl;
     EXPECT_EQ(res.GetResult().schemeId, key);
 
     Aws::String uri{"https://treasureisland-cb93079d-24a0-4862-8es2-88456ead.xyz.amazonaws.com"};
@@ -341,8 +335,6 @@ TEST_F(SmithyClientTest, bearer)
     auto res = ptr->SelectAuthSchemeOption(ctx);
 
     EXPECT_EQ(res.IsSuccess(), true);
-
-    std::cout << "selected scheme id=" << res.GetResult().schemeId << std::endl;
     EXPECT_EQ(res.GetResult().schemeId, key);
 
     Aws::String uri{
@@ -359,10 +351,6 @@ TEST_F(SmithyClientTest, bearer)
     EXPECT_EQ(res2.IsSuccess(), true);
 
     EXPECT_TRUE(!res2.GetResult()->GetHeaderValue("authorization").empty());
-
-    std::cout << "header=" << res2.GetResult()->GetHeaderValue("authorization")
-              << std::endl;
-
     EXPECT_EQ(res2.GetResult()->GetHeaderValue("authorization"),
               "Bearer testBearerToken");
 }

diff --git a/tools/CI/install-test/CMakeLists.txt b/tools/CI/install-test/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.31)
 # -- Preamble --
 project("sample_app"
         LANGUAGES CXX

diff --git a/...erator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm b/...erator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm
@@ -1,6 +1,6 @@
 #set($metadata = $serviceModel.metadata)
 #if($metadata.standalone)
-cmake_minimum_required (VERSION 3.13 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.13...3.31)
 
 project(aws-cpp-sdk-${metadata.projectName})
 find_package(AWSSDK REQUIRED COMPONENTS core)
+1 −1		.github/workflows/ci.yml
+19 −44		CMakeLists.txt
+1 −1		VERSION
+1 −3		bin/elasticurl_cpp/CMakeLists.txt
+1 −3		bin/mqtt5_app/CMakeLists.txt
+1 −3		bin/mqtt5_canary/CMakeLists.txt
+1 −1		crt/aws-c-auth
+1 −1		crt/aws-c-cal
+1 −1		crt/aws-c-common
+1 −1		crt/aws-c-compression
+1 −1		crt/aws-c-event-stream
+1 −1		crt/aws-c-http
+1 −1		crt/aws-c-io
+1 −1		crt/aws-c-mqtt
+1 −1		crt/aws-c-s3
+1 −1		crt/aws-c-sdkutils
+1 −1		crt/aws-checksums
+1 −1		crt/aws-lc
+26 −2		include/aws/iot/MqttRequestResponseClient.h
+9 −3		source/iot/MqttRequestResponseClient.cpp
+22 −5		tests/IotServiceTest.cpp
+26 −61		tests/Mqtt5ClientTest.cpp
+17 −6		tests/MqttRequestResponse.cpp