Skip to content

Update CRT to v0.42.0 #3868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sbiscigl wants to merge 1 commit into from
Closed

Update CRT to v0.42.0 #3868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crt/aws-crt-cpp
Open in desktop
Submodule aws-crt-cpp updated 32 files
+20 −3 .github/workflows/ci.yml
+6 −3 .github/workflows/issue-regression-labeler.yml
+20 −0 CMakeLists.txt
+1 −1 VERSION
+1 −1 crt/aws-c-auth
+1 −1 crt/aws-c-common
+1 −1 crt/aws-c-io
+1 −1 crt/aws-c-s3
+1 −1 crt/aws-c-sdkutils
+1 −1 crt/aws-lc
+1 −1 crt/s2n
+1 −0 include/aws/crt/Types.h
+64 −0 include/aws/crt/endpoints/BddEngine.h
+25 −6 include/aws/crt/io/TlsOptions.h
+1,235 −0 include/aws/crt/s3/S3.h
+76 −0 include/aws/crt/s3/S3BufferTicket.h
+5 −0 source/Types.cpp
+42 −0 source/endpoints/BddEngine.cpp
+14 −4 source/io/TlsOptions.cpp
+9 −10 source/mqtt/Mqtt5ClientCore.cpp
+1,078 −0 source/s3/S3.cpp
+57 −0 source/s3/S3BufferTicket.cpp
+63 −0 tests/BddEngineTest.cpp
+7 −1 tests/CMakeLists.txt
+111 −0 tests/EndpointEngineTest.cpp
+107 −5 tests/Mqtt5ClientTest.cpp
+8 −169 tests/RuleEngineTest.cpp
+ − tests/resources/endpoint_engine/model.bin
+41 −0 tests/resources/endpoint_engine/model.json
+38 −0 tests/resources/endpoint_engine/model_bdd.json
+45 −0 tests/resources/endpoint_engine/partitions.json
+45 −0 tests/resources/sample_partitions.json
15 changes: 14 additions & 1 deletion generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,19 @@ void S3CrtClient::S3CrtRequestProgressCallback(struct aws_s3_meta_request* meta_
return;
}

namespace {
// evil enum name sfinae hacking
template <typename E>
constexpr auto PartSizeMismatchError(int) -> decltype(E::AWS_ERROR_S3_INTERNAL_BUFFER_SIZE_MISMATCH_RETRYING_WITH_RANGE) {
return E::AWS_ERROR_S3_INTERNAL_BUFFER_SIZE_MISMATCH_RETRYING_WITH_RANGE;
}

template <typename E>
constexpr auto PartSizeMismatchError(long) -> decltype(E::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE) {
return E::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE;
}
} // namespace

CoreErrors MapCrtError(const int crtErrorCode) {
switch (crtErrorCode) {
case aws_s3_errors::AWS_ERROR_S3_REQUEST_HAS_COMPLETED:
Expand Down Expand Up @@ -674,7 +687,7 @@ CoreErrors MapCrtError(const int crtErrorCode) {
case aws_s3_errors::AWS_ERROR_S3_LIST_PARTS_PARSE_FAILED:
case aws_s3_errors::AWS_ERROR_S3_RESUMED_PART_CHECKSUM_MISMATCH:
case aws_s3_errors::AWS_ERROR_S3_FILE_MODIFIED:
case aws_s3_errors::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE:
case PartSizeMismatchError<aws_s3_errors>(0):
case aws_s3_errors::AWS_ERROR_S3_RECV_FILE_ALREADY_EXISTS:
case aws_s3_errors::AWS_ERROR_S3_RECV_FILE_NOT_FOUND:
return CoreErrors::VALIDATION;
Expand Down
16 changes: 8 additions & 8 deletions prefetch_crt_dependency.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
# SPDX-License-Identifier: Apache-2.0.

CRT_URI_PREFIX=https://codeload.github.com/awslabs
CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/64429d60265ee8c30ae1c8f2ff8e1b9474eea455 # v0.40.1
CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/4bc47ee0c30a482831f809769a2421385c192a6d # v0.42.0

AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/4cb7127fc2fe402310f9b2ccd7719baa348b2a19 # v0.10.3
AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/4b5d524bf1a511b05e0fffe5bdc51800770b9427 # v0.10.4
AWS_C_CAL_URI=${CRT_URI_PREFIX}/aws-c-cal/zip/9edd8eac2b21ca6a04535b91d60d361c2f1bb60f # v0.9.14
AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/48dd6cdff7bac0005a9c6b49c15a0765622c0e70 # v0.14.0
AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/a9d57d2d372582fa18bf1d81741e107c59a23226 # v0.14.2
AWS_C_COMPRESSION_URI=${CRT_URI_PREFIX}/aws-c-compression/zip/d8264e64f698341eb03039b96b4f44702a9b3f83 # v0.3.2
AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/51bef3c44e1058b1689751539170b2e0f589ccdb # v0.7.1
AWS_C_HTTP_URI=${CRT_URI_PREFIX}/aws-c-http/zip/8aefd899fc3210bfd0e3fd414011a3cb708bf6e4 # v0.11.0
AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/bdfd85e293965439146bc30a70379e7889c27bb7 # v0.27.0
AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/54350963b64dfc6c4b0ea623b08aa252aae3d7d7 # v0.27.4
AWS_C_MQTT_URI=${CRT_URI_PREFIX}/aws-c-mqtt/zip/2ef9605ec9c50bea3f921e08022ddd57eed70901 # v0.16.0
AWS_C_S3_URI=${CRT_URI_PREFIX}/aws-c-s3/zip/e8bf59aaa77442d7f066a2df05604f40889f044a # v0.12.6
AWS_C_SDKUTILS_URI=${CRT_URI_PREFIX}/aws-c-sdkutils/zip/c70418c17d8f970ff1d80d88d08beeccd425a887 # v0.2.5
AWS_C_S3_URI=${CRT_URI_PREFIX}/aws-c-s3/zip/142f6c3a12f02b77008676e9c18d163b8ea46a6f # v0.13.0
AWS_C_SDKUTILS_URI=${CRT_URI_PREFIX}/aws-c-sdkutils/zip/cb14fea362c82c995eebd34e2e96590ab4e0ed58 # v0.2.7
AWS_CHECKSUMS_URI=${CRT_URI_PREFIX}/aws-checksums/zip/1d5f2f1f3e5d013aae8810878ceb5b3f6f258c4e # v0.2.10
AWS_LC_URI=${CRT_URI_PREFIX}/aws-lc/zip/6f246af4cd1de8cee8c62d76139bcda299c1aa00 # v5.0.0
S2N_URI=${CRT_URI_PREFIX}/s2n/zip/eaf2c08a78f7fca6279e3704d3fa1c4e6c9a6abc # v1.7.4
AWS_LC_URI=${CRT_URI_PREFIX}/aws-lc/zip/683ebde4bf3bcc016a9a710ad6b49c0c91b59161 # v5.2.0
S2N_URI=${CRT_URI_PREFIX}/s2n/zip/f5f6c6c2ce2370de1aa3ade6899a7321d1127bb8 # v1.7.5


echo "Removing CRT"
Expand Down
15 changes: 14 additions & 1 deletion ...s/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,19 @@ void S3CrtClient::S3CrtRequestProgressCallback(struct aws_s3_meta_request *meta_
return;
}

namespace {
//evil enum name sfinae hacking
template <typename E>
constexpr auto PartSizeMismatchError(int)
-> decltype(E::AWS_ERROR_S3_INTERNAL_BUFFER_SIZE_MISMATCH_RETRYING_WITH_RANGE)
{ return E::AWS_ERROR_S3_INTERNAL_BUFFER_SIZE_MISMATCH_RETRYING_WITH_RANGE; }

template <typename E>
constexpr auto PartSizeMismatchError(long)
-> decltype(E::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE)
{ return E::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE; }
} // namespace

CoreErrors MapCrtError(const int crtErrorCode) {
switch (crtErrorCode) {
case aws_s3_errors::AWS_ERROR_S3_REQUEST_HAS_COMPLETED:
Expand Down Expand Up @@ -135,7 +148,7 @@ CoreErrors MapCrtError(const int crtErrorCode) {
case aws_s3_errors::AWS_ERROR_S3_LIST_PARTS_PARSE_FAILED:
case aws_s3_errors::AWS_ERROR_S3_RESUMED_PART_CHECKSUM_MISMATCH:
case aws_s3_errors::AWS_ERROR_S3_FILE_MODIFIED:
case aws_s3_errors::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE:
case PartSizeMismatchError<aws_s3_errors>(0):
case aws_s3_errors::AWS_ERROR_S3_RECV_FILE_ALREADY_EXISTS:
case aws_s3_errors::AWS_ERROR_S3_RECV_FILE_NOT_FOUND:
return CoreErrors::VALIDATION;
Expand Down
15 changes: 14 additions & 1 deletion ...amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,19 @@ void S3CrtClient::S3CrtRequestProgressCallback(struct aws_s3_meta_request *meta_
return;
}

namespace {
//evil enum name sfinae hacking
template <typename E>
constexpr auto PartSizeMismatchError(int)
-> decltype(E::AWS_ERROR_S3_INTERNAL_BUFFER_SIZE_MISMATCH_RETRYING_WITH_RANGE)
{ return E::AWS_ERROR_S3_INTERNAL_BUFFER_SIZE_MISMATCH_RETRYING_WITH_RANGE; }

template <typename E>
constexpr auto PartSizeMismatchError(long)
-> decltype(E::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE)
{ return E::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE; }
} // namespace

CoreErrors MapCrtError(const int crtErrorCode) {
switch (crtErrorCode) {
case aws_s3_errors::AWS_ERROR_S3_REQUEST_HAS_COMPLETED:
Expand Down Expand Up @@ -135,7 +148,7 @@ CoreErrors MapCrtError(const int crtErrorCode) {
case aws_s3_errors::AWS_ERROR_S3_LIST_PARTS_PARSE_FAILED:
case aws_s3_errors::AWS_ERROR_S3_RESUMED_PART_CHECKSUM_MISMATCH:
case aws_s3_errors::AWS_ERROR_S3_FILE_MODIFIED:
case aws_s3_errors::AWS_ERROR_S3_INTERNAL_PART_SIZE_MISMATCH_RETRYING_WITH_RANGE:
case PartSizeMismatchError<aws_s3_errors>(0):
case aws_s3_errors::AWS_ERROR_S3_RECV_FILE_ALREADY_EXISTS:
case aws_s3_errors::AWS_ERROR_S3_RECV_FILE_NOT_FOUND:
return CoreErrors::VALIDATION;
Expand Down
Loading