Skip to content

Commit e932b19

Browse files
committed
Update CRT to v0.30.1
1 parent 2cc31ab commit e932b19

File tree

4 files changed

+16
-32
lines changed

4 files changed

+16
-32
lines changed

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,7 @@ if (LEGACY_BUILD)
240240
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_PREV})
241241
endif ()
242242
else ()
243-
# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
244-
set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
245-
string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
246-
# Append that generated list to the module search path
247-
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
243+
find_package(aws-c-common REQUIRED)
248244
include(AwsFindPackage)
249245
set(IN_SOURCE_BUILD OFF)
250246
endif ()

prefetch_crt_dependency.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
# SPDX-License-Identifier: Apache-2.0.
44

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

2222

tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ TEST_F(SmithyClientTest, testSigV4) {
241241
auto res = ptr->SelectAuthSchemeOption(ctx);
242242

243243
EXPECT_EQ(res.IsSuccess(), true);
244-
std::cout<<"selected scheme id="<<res.GetResult().schemeId<<std::endl;
245244
EXPECT_EQ(res.GetResult().schemeId, key);
246245

247246
Aws::String uri{"https://treasureisland-cb93079d-24a0-4862-8es2-88456ead.xyz.amazonaws.com"};
@@ -251,9 +250,6 @@ TEST_F(SmithyClientTest, testSigV4) {
251250
auto res2 = ptr->SignRequest(httpRequest, res.GetResult());
252251

253252
EXPECT_EQ(res2.IsSuccess(), true);
254-
255-
std::cout<<"Final auth="<<res2.GetResult()->GetAwsAuthorization()<<std::endl;
256-
257253
EXPECT_EQ(res2.GetResult()->GetSigningAccessKey(), "dummyAccessId");
258254

259255

@@ -293,8 +289,6 @@ TEST_F(SmithyClientTest, testSigV4a) {
293289
auto res = ptr->SelectAuthSchemeOption(ctx);
294290

295291
EXPECT_EQ(res.IsSuccess(), true);
296-
297-
std::cout<<"selected scheme id="<<res.GetResult().schemeId<<std::endl;
298292
EXPECT_EQ(res.GetResult().schemeId, key);
299293

300294
Aws::String uri{"https://treasureisland-cb93079d-24a0-4862-8es2-88456ead.xyz.amazonaws.com"};
@@ -341,8 +335,6 @@ TEST_F(SmithyClientTest, bearer)
341335
auto res = ptr->SelectAuthSchemeOption(ctx);
342336

343337
EXPECT_EQ(res.IsSuccess(), true);
344-
345-
std::cout << "selected scheme id=" << res.GetResult().schemeId << std::endl;
346338
EXPECT_EQ(res.GetResult().schemeId, key);
347339

348340
Aws::String uri{
@@ -359,10 +351,6 @@ TEST_F(SmithyClientTest, bearer)
359351
EXPECT_EQ(res2.IsSuccess(), true);
360352

361353
EXPECT_TRUE(!res2.GetResult()->GetHeaderValue("authorization").empty());
362-
363-
std::cout << "header=" << res2.GetResult()->GetHeaderValue("authorization")
364-
<< std::endl;
365-
366354
EXPECT_EQ(res2.GetResult()->GetHeaderValue("authorization"),
367355
"Bearer testBearerToken");
368356
}

0 commit comments

Comments
 (0)