awslabs · graebm · Jul 3, 2024 · Jun 20, 2024 · Jun 24, 2024 · Jun 28, 2024
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-s3 b/crt/aws-c-s3
diff --git a/crt/s2n b/crt/s2n
diff --git a/src/main/java/software/amazon/awssdk/crt/s3/S3Client.java b/src/main/java/software/amazon/awssdk/crt/s3/S3Client.java
@@ -142,11 +142,10 @@ public S3MetaRequest makeMetaRequest(S3MetaRequestOptions options) {
         }
 
         String operationName = options.getOperationName();
-        if (operationName == null && options.getMetaRequestType() == S3MetaRequestOptions.MetaRequestType.DEFAULT) {
-            // The upcoming release of aws-c-s3 v0.6.0 will require an operation name for DEFAULT meta-requests.
-            // Set a default value for now, in case this code gets mixed with the upcoming aws-c-s3 release.
-            // But when we take the upcoming release for real, change this code to throw IllegalArgumentException.
-            operationName = new String("DEFAULT");
+        if (options.getMetaRequestType() == S3MetaRequestOptions.MetaRequestType.DEFAULT && operationName == null) {
+            Log.log(Log.LogLevel.Error, Log.LogSubject.S3Client,
+                    "S3Client.makeMetaRequest has invalid options; Operation name must be set for MetaRequestType.DEFAULT.");
+            throw new IllegalArgumentException("S3Client.makeMetaRequest has invalid options; Operation name must be set for MetaRequestType.DEFAULT.");
         }
 
         S3MetaRequest metaRequest = new S3MetaRequest();

diff --git a/src/main/java/software/amazon/awssdk/crt/s3/S3MetaRequestOptions.java b/src/main/java/software/amazon/awssdk/crt/s3/S3MetaRequestOptions.java
@@ -102,7 +102,7 @@ public MetaRequestType getMetaRequestType() {
 
     /**
      * The S3 operation name (eg: "CreateBucket"),
-     * this should be set for {@link MetaRequestType#DEFAULT},
+     * this MUST be set for {@link MetaRequestType#DEFAULT},
      * it is ignored for other meta request types since the operation is implicit.
      *
      * See <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_Operations_Amazon_Simple_Storage_Service.html">
+9 −0		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+5 −0		builder.json
+47 −0		format-check.py
+0 −25		format-check.sh
+2 −2		include/aws/cal/private/symmetric_cipher_priv.h
+32 −26		include/aws/cal/symmetric_cipher.h
+1 −1		source/cal.c
+16 −15		source/darwin/commoncrypto_aes.c
+8 −10		source/ecc.c
+4 −4		source/rsa.c
+10 −8		source/symmetric_cipher.c
+38 −34		source/unix/openssl_aes.c
+150 −124		source/windows/bcrypt_aes.c
+3 −0		tests/CMakeLists.txt
+185 −13		tests/aes256_test.c
+1 −1		.clang-tidy
+4 −7		.github/workflows/clang-format.yml
+6 −5		.github/workflows/proof_ci_resources/config.yaml
+10 −1		CMakeLists.txt
+26 −0		THIRD-PARTY-LICENSES.txt
+47 −0		format-check.py
+0 −24		format-check.sh
+2 −4		include/aws/common/atomics.h
+1 −1		include/aws/common/byte_buf.h
+449 −0		include/aws/common/cbor.h
+2 −4		include/aws/common/condition_variable.h
+7 −2		include/aws/common/error.h
+3 −2		include/aws/common/logging.h
+19 −1		include/aws/common/macros.h
+2 −4		include/aws/common/mutex.h
+19 −0		include/aws/common/private/byte_buf.h
+7 −3		include/aws/common/private/external_module_impl.h
+2 −4		include/aws/common/rw_lock.h
+1 −1		include/aws/common/statistics.h
+1 −2		include/aws/common/thread.h
+129 −0		scripts/import_libcbor.py
+8 −3		scripts/latest_submodules.py
+1 −1		source/allocator.c
+3 −1		source/android/logging.c
+19 −0		source/byte_buf.c
+647 −0		source/cbor.c
+12 −2		source/common.c
+19 −0		source/external/libcbor/allocators.c
+425 −0		source/external/libcbor/cbor.c
+74 −0		source/external/libcbor/cbor.h
+131 −0		source/external/libcbor/cbor/arrays.c
+137 −0		source/external/libcbor/cbor/arrays.h
+119 −0		source/external/libcbor/cbor/bytestrings.c
+150 −0		source/external/libcbor/cbor/bytestrings.h
+121 −0		source/external/libcbor/cbor/callbacks.c
+189 −0		source/external/libcbor/cbor/callbacks.h
+14 −0		source/external/libcbor/cbor/cbor_export.h
+163 −0		source/external/libcbor/cbor/common.c
+339 −0		source/external/libcbor/cbor/common.h
+46 −0		source/external/libcbor/cbor/configuration.h
+264 −0		source/external/libcbor/cbor/data.h
+200 −0		source/external/libcbor/cbor/encoding.c
+140 −0		source/external/libcbor/cbor/encoding.h
+189 −0		source/external/libcbor/cbor/floats_ctrls.c
+240 −0		source/external/libcbor/cbor/floats_ctrls.h
+422 −0		source/external/libcbor/cbor/internal/builder_callbacks.c
+85 −0		source/external/libcbor/cbor/internal/builder_callbacks.h
+98 −0		source/external/libcbor/cbor/internal/encoders.c
+41 −0		source/external/libcbor/cbor/internal/encoders.h
+80 −0		source/external/libcbor/cbor/internal/loaders.c
+43 −0		source/external/libcbor/cbor/internal/loaders.h
+57 −0		source/external/libcbor/cbor/internal/memory_utils.c
+50 −0		source/external/libcbor/cbor/internal/memory_utils.h
+33 −0		source/external/libcbor/cbor/internal/stack.c
+53 −0		source/external/libcbor/cbor/internal/stack.h
+95 −0		source/external/libcbor/cbor/internal/unicode.c
+33 −0		source/external/libcbor/cbor/internal/unicode.h
+190 −0		source/external/libcbor/cbor/ints.c
+211 −0		source/external/libcbor/cbor/ints.h
+125 −0		source/external/libcbor/cbor/maps.c
+121 −0		source/external/libcbor/cbor/maps.h
+368 −0		source/external/libcbor/cbor/serialization.c
+168 −0		source/external/libcbor/cbor/serialization.h
+600 −0		source/external/libcbor/cbor/streaming.c
+37 −0		source/external/libcbor/cbor/streaming.h
+142 −0		source/external/libcbor/cbor/strings.c
+183 −0		source/external/libcbor/cbor/strings.h
+46 −0		source/external/libcbor/cbor/tags.c
+74 −0		source/external/libcbor/cbor/tags.h
+1 −1		source/json.c
+1 −1		source/posix/clock.c
+1 −1		source/priority_queue.c
+1 −0		source/windows/thread.c
+11 −0		tests/CMakeLists.txt
+2 −0		tests/assert_test.c
+58 −1		tests/byte_buf_test.c
+489 −0		tests/cbor_test.c
+18 −14		tests/condition_variable_test.c
+9 −7		tests/error_test.c
+87 −0		tests/fuzz/cbor_decoding_transitive.c
+66 −0		tests/fuzz/cbor_double_encode_decode.c
+0 −1		verification/cbmc/proofs/Makefile.common
+4 −1		verification/cbmc/sources/utils.c
+1 −1		.github/workflows/ci.yml
+3 −5		.github/workflows/clang-format.yml
+47 −0		format-check.py
+0 −24		format-check.sh
+1 −1		include/aws/s3/private/s3_default_meta_request.h
+5 −0		include/aws/s3/private/s3_paginator.h
+2 −2		include/aws/s3/private/s3_request.h
+23 −6		include/aws/s3/private/s3_util.h
+22 −9		include/aws/s3/s3_client.h
+102 −1		source/s3.c
+13 −1		source/s3_client.c
+18 −15		source/s3_default_meta_request.c
+12 −1		source/s3_endpoint_resolver/aws_s3_endpoint_rule_set.c
+1 −0		source/s3_list_objects.c
+1 −0		source/s3_list_parts.c
+7 −8		source/s3_meta_request.c
+7 −0		source/s3_paginator.c
+2 −8		source/s3_request.c
+0 −27		source/s3_util.c
+3 −0		tests/CMakeLists.txt
+4 −1		tests/s3_client_test.c
+51 −0		tests/s3_data_plane_tests.c
+4 −1		tests/s3_meta_request_test.c
+4 −1		tests/s3_mock_server_s3express_provider_test.c
+7 −2		tests/s3_mock_server_tests.c
+4 −1		tests/s3_parallel_read_stream_test.c
+4 −1		tests/s3_s3express_client_test.c
+8 −2		tests/s3_tester.c
+1 −0		tests/s3_tester.h
+39 −1		tests/s3_util_tests.c
+1 −0		tests/test_helper/README.md
+142 −130		tests/test_helper/test_helper.py