S3Client breaking change: DEFAULT requests must pass operation name (#…

…802) **Issue:** see: awslabs/aws-c-s3#439 **Description of changes:** - When making requests with the `S3Client` of type `MetaRequestType.DEFAULT`, the user MUST specify the operation name - Latest submodules: ``` aws-c-cal v0.6.15 -> v0.7.1 aws-c-common v0.9.21 -> v0.9.23 aws-c-s3 v0.5.10 -> v0.6.0 s2n v1.4.16 -> v1.4.17 ```
awslabs · Jul 3, 2024 · 5e41fcb · 5e41fcb
1 parent 263d240
commit 5e41fcb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
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">