Merge pull request #2453 from aws/staging/56f3828c-d139-464d-b157-83f93728dfd8

dagnir · web-flow · commit 28c534d0a4cb · 2023-04-11T13:15:55.000-07:00
Pull request: release &lt;- staging/56f3828c-d139-464d-b157-83f93728dfd8
diff --git a/.changes/2.20.44.json b/.changes/2.20.44.json
@@ -0,0 +1,54 @@
+{
+    "version": "2.20.44",
+    "date": "2023-04-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "contributor": "",
+            "description": "Re-release to remove unexpected API changes"
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT Data Plane",
+            "contributor": "",
+            "description": "This release adds support for MQTT5 user properties when calling the AWS IoT GetRetainedMessage API"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Exposes endpointOverride in SdkClient through ServiceClientConfiguration"
+        },
+        {
+            "type": "feature",
+            "category": "AWS WAFV2",
+            "contributor": "",
+            "description": "For web ACLs that protect CloudFront protections, the default request body inspection size is now 16 KB, and you can use the new association configuration to increase the inspection size further, up to 64 KB. Sizes over 16 KB can incur additional costs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Container Registry Public",
+            "contributor": "",
+            "description": "This release will allow using registry alias as registryId in BatchDeleteImage request."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EventBridge",
+            "contributor": "",
+            "description": "EventBridge PutTarget support for multiple SQL arguments on RedshiftDataParameters"
+        },
+        {
+            "type": "feature",
+            "category": "EMR Serverless",
+            "contributor": "",
+            "description": "This release extends GetJobRun API to return job run timeout (executionTimeoutMinutes) specified during StartJobRun call (or default timeout of 720 minutes if none was specified)."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# __2.20.44__ __2023-04-11__
+## __AWS IoT__
+  - ### Features
+    - Re-release to remove unexpected API changes
+
+## __AWS IoT Data Plane__
+  - ### Features
+    - This release adds support for MQTT5 user properties when calling the AWS IoT GetRetainedMessage API
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Exposes endpointOverride in SdkClient through ServiceClientConfiguration
+    - Updated endpoint and partition metadata.
+
+## __AWS WAFV2__
+  - ### Features
+    - For web ACLs that protect CloudFront protections, the default request body inspection size is now 16 KB, and you can use the new association configuration to increase the inspection size further, up to 64 KB. Sizes over 16 KB can incur additional costs.
+
+## __Amazon Elastic Container Registry Public__
+  - ### Features
+    - This release will allow using registry alias as registryId in BatchDeleteImage request.
+
+## __Amazon EventBridge__
+  - ### Features
+    - EventBridge PutTarget support for multiple SQL arguments on RedshiftDataParameters
+
+## __EMR Serverless__
+  - ### Features
+    - This release extends GetJobRun API to return job run timeout (executionTimeoutMinutes) specified during StartJobRun call (or default timeout of 720 minutes if none was specified).
+
 # __2.20.43__ __2023-04-10__
 ## __AWS Elemental MediaConvert__
   - ### Features
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
@@ -19,6 +19,7 @@
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeSpec;
+import java.net.URI;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
@@ -124,9 +125,17 @@ private MethodSpec buildClientMethod() {
                          .returns(clientInterfaceName)
                          .addStatement("$T clientConfiguration = super.asyncClientConfiguration()", SdkClientConfiguration.class)
                          .addStatement("this.validateClientOptions(clientConfiguration)")
+                         .addStatement("$T endpointOverride = null", URI.class)
+                         .addCode("if (clientConfiguration.option($T.ENDPOINT_OVERRIDDEN) != null"
+                                  + "&& $T.TRUE.equals(clientConfiguration.option($T.ENDPOINT_OVERRIDDEN))) {"
+                                  + "endpointOverride = clientConfiguration.option($T.ENDPOINT);"
+                                  + "}",
+                                  SdkClientOption.class, Boolean.class, SdkClientOption.class, SdkClientOption.class)
                          .addStatement("$T serviceClientConfiguration = $T.builder()"
                                        + ".overrideConfiguration(overrideConfiguration())"
-                                       + ".region(clientConfiguration.option($T.AWS_REGION)).build()",
+                                       + ".region(clientConfiguration.option($T.AWS_REGION))"
+                                       + ".endpointOverride(endpointOverride)"
+                                       + ".build()",
                                        serviceConfigClassName, serviceConfigClassName, AwsClientOption.class)
                          .addStatement("return new $T(serviceClientConfiguration, clientConfiguration)", clientClassName)
                          .build();
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
@@ -19,6 +19,7 @@
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeSpec;
+import java.net.URI;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
@@ -124,9 +125,17 @@ private MethodSpec buildClientMethod() {
                          .returns(clientInterfaceName)
                          .addStatement("$T clientConfiguration = super.syncClientConfiguration()", SdkClientConfiguration.class)
                          .addStatement("this.validateClientOptions(clientConfiguration)")
+                         .addStatement("$T endpointOverride = null", URI.class)
+                         .addCode("if (clientConfiguration.option($T.ENDPOINT_OVERRIDDEN) != null"
+                                  + "&& $T.TRUE.equals(clientConfiguration.option($T.ENDPOINT_OVERRIDDEN))) {"
+                                  + "endpointOverride = clientConfiguration.option($T.ENDPOINT);"
+                                  + "}",
+                                  SdkClientOption.class, Boolean.class, SdkClientOption.class, SdkClientOption.class)
                          .addStatement("$T serviceClientConfiguration = $T.builder()"
                                        + ".overrideConfiguration(overrideConfiguration())"
-                                       + ".region(clientConfiguration.option($T.AWS_REGION)).build()",
+                                       + ".region(clientConfiguration.option($T.AWS_REGION))"
+                                       + ".endpointOverride(endpointOverride)"
+                                       + ".build()",
                                        serviceConfigClassName, serviceConfigClassName, AwsClientOption.class)
                          .addStatement("return new $T(serviceClientConfiguration, clientConfiguration)", clientClassName)
                          .build();
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceClientConfigurationClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceClientConfigurationClass.java
@@ -24,6 +24,7 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.TypeSpec;
+import java.net.URI;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.awscore.AwsServiceClientConfiguration;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -89,12 +90,21 @@ private TypeSpec builderInterfaceSpec() {
                                             .returns(className())
                                             .build())
                        .addMethod(MethodSpec.methodBuilder("region")
+                                            .addAnnotation(Override.class)
                                             .addModifiers(PUBLIC, ABSTRACT)
                                             .addParameter(Region.class, "region")
                                             .returns(className().nestedClass("Builder"))
                                             .addJavadoc("Configure the region")
                                             .build())
+                       .addMethod(MethodSpec.methodBuilder("endpointOverride")
+                                            .addAnnotation(Override.class)
+                                            .addModifiers(PUBLIC, ABSTRACT)
+                                            .addParameter(URI.class, "endpointOverride")
+                                            .returns(className().nestedClass("Builder"))
+                                            .addJavadoc("Configure the endpointOverride")
+                                            .build())
                        .addMethod(MethodSpec.methodBuilder("overrideConfiguration")
+                                            .addAnnotation(Override.class)
                                             .addModifiers(PUBLIC, ABSTRACT)
                                             .addParameter(ClientOverrideConfiguration.class, "clientOverrideConfiguration")
                                             .returns(className().nestedClass("Builder"))
@@ -132,6 +142,14 @@ private TypeSpec builderImplSpec() {
                                             .addStatement("this.overrideConfiguration = clientOverrideConfiguration")
                                             .addStatement("return this")
                                             .build())
+                       .addMethod(MethodSpec.methodBuilder("endpointOverride")
+                                            .addAnnotation(Override.class)
+                                            .addModifiers(PUBLIC)
+                                            .addParameter(URI.class, "endpointOverride")
+                                            .returns(className().nestedClass("Builder"))
+                                            .addStatement("this.endpointOverride = endpointOverride")
+                                            .addStatement("return this")
+                                            .build())
                        .addMethod(MethodSpec.methodBuilder("build")
                                       .addAnnotation(Override.class)
                                       .addModifiers(PUBLIC)
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-async-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-async-client-builder-class.java
@@ -1,5 +1,6 @@
 package software.amazon.awssdk.services.json;
 
+import java.net.URI;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
@@ -31,9 +32,14 @@ public DefaultJsonAsyncClientBuilder tokenProvider(SdkTokenProvider tokenProvide
     protected final JsonAsyncClient buildClient() {
         SdkClientConfiguration clientConfiguration = super.asyncClientConfiguration();
         this.validateClientOptions(clientConfiguration);
+        URI endpointOverride = null;
+        if (clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) != null
+            && Boolean.TRUE.equals(clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN))) {
+            endpointOverride = clientConfiguration.option(SdkClientOption.ENDPOINT);
+        }
         JsonServiceClientConfiguration serviceClientConfiguration = JsonServiceClientConfiguration.builder()
                                                                                                   .overrideConfiguration(overrideConfiguration()).region(clientConfiguration.option(AwsClientOption.AWS_REGION))
-                                                                                                  .build();
+                                                                                                  .endpointOverride(endpointOverride).build();
         return new DefaultJsonAsyncClient(serviceClientConfiguration, clientConfiguration);
     }
 }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-sync-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-sync-client-builder-class.java
@@ -1,5 +1,6 @@
 package software.amazon.awssdk.services.json;
 
+import java.net.URI;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
@@ -31,9 +32,14 @@ public DefaultJsonClientBuilder tokenProvider(SdkTokenProvider tokenProvider) {
     protected final JsonClient buildClient() {
         SdkClientConfiguration clientConfiguration = super.syncClientConfiguration();
         this.validateClientOptions(clientConfiguration);
+        URI endpointOverride = null;
+        if (clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) != null
+            && Boolean.TRUE.equals(clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN))) {
+            endpointOverride = clientConfiguration.option(SdkClientOption.ENDPOINT);
+        }
         JsonServiceClientConfiguration serviceClientConfiguration = JsonServiceClientConfiguration.builder()
                                                                                                   .overrideConfiguration(overrideConfiguration()).region(clientConfiguration.option(AwsClientOption.AWS_REGION))
-                                                                                                  .build();
+                                                                                                  .endpointOverride(endpointOverride).build();
         return new DefaultJsonClient(serviceClientConfiguration, clientConfiguration);
     }
 }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/serviceclientconfiguration.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/serviceclientconfiguration.java
@@ -1,5 +1,6 @@
 package software.amazon.awssdk.services.jsonprotocoltests;
 
+import java.net.URI;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.awscore.AwsServiceClientConfiguration;
@@ -30,11 +31,19 @@ public interface Builder extends AwsServiceClientConfiguration.Builder {
         /**
          * Configure the region
          */
+        @Override
         Builder region(Region region);
 
+        /**
+         * Configure the endpointOverride
+         */
+        @Override
+        Builder endpointOverride(URI endpointOverride);
+
         /**
          * Configure the client override configuration
          */
+        @Override
         Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration);
     }
 
@@ -58,6 +67,12 @@ public Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideC
             return this;
         }
 
+        @Override
+        public Builder endpointOverride(URI endpointOverride) {
+            this.endpointOverride = endpointOverride;
+            return this;
+        }
+
         @Override
         public JsonProtocolTestsServiceClientConfiguration build() {
             return new JsonProtocolTestsServiceClientConfiguration(this);
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsServiceClientConfiguration.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsServiceClientConfiguration.java
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.awscore;
 
+import java.net.URI;
 import java.util.Objects;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.SdkServiceClientConfiguration;
@@ -74,33 +75,28 @@ public interface Builder extends SdkServiceClientConfiguration.Builder {
          */
         Builder region(Region region);
 
+        @Override
+        Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration);
+
+        @Override
+        Builder endpointOverride(URI endpointOverride);
+
         @Override
         AwsServiceClientConfiguration build();
     }
 
     protected abstract static class BuilderImpl implements Builder {
         protected ClientOverrideConfiguration overrideConfiguration;
         protected Region region;
+        protected URI endpointOverride;
 
         protected BuilderImpl() {
         }
 
         protected BuilderImpl(AwsServiceClientConfiguration awsServiceClientConfiguration) {
             this.overrideConfiguration = awsServiceClientConfiguration.overrideConfiguration();
             this.region = awsServiceClientConfiguration.region();
-        }
-
-
-        @Override
-        public Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration) {
-            this.overrideConfiguration = clientOverrideConfiguration;
-            return this;
-        }
-
-        @Override
-        public Builder region(Region region) {
-            this.region = region;
-            return this;
+            this.endpointOverride = awsServiceClientConfiguration.endpointOverride().orElse(null);
         }
 
         @Override
@@ -112,6 +108,11 @@ public final ClientOverrideConfiguration overrideConfiguration() {
         public final Region region() {
             return region;
         }
+
+        @Override
+        public final URI endpointOverride() {
+            return endpointOverride;
+        }
     }
 
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkServiceClientConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkServiceClientConfiguration.java
diff --git a/services/iot/src/main/resources/codegen-resources/endpoint-tests.json b/services/iot/src/main/resources/codegen-resources/endpoint-tests.json
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/serviceclientconfiguration/ServiceClientConfigurationTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/serviceclientconfiguration/ServiceClientConfigurationTest.java
