Merge pull request #2612 from aws/staging/9ff17ed4-ef6b-49f6-a747-55a0b897ee00

Pull request: release <- staging/9ff17ed4-ef6b-49f6-a747-55a0b897ee00

Author: aws-sdk-java-automation

.changes/2.20.99.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.20.99",
+    "date": "2023-07-05",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Comprehend Medical",
+            "contributor": "",
+            "description": "Update to Amazon Comprehend Medical documentation."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "contributor": "",
+            "description": "Added Dry Run Feature to cryptographic and cross-account mutating KMS APIs (14 in all). This feature allows users to test their permissions and parameters before making the actual API call."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Cross region bucket access for S3 Client. This feature will allow users to access buckets of different region using a single cross region configured client."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "contributor": "",
+            "description": "Documentation updates for AWS Security Hub"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Service",
+            "contributor": "",
+            "description": "GetMetricDataV2 API: Channels filters do not count towards overall limitation of 100 filter values."
+        },
+        {
+            "type": "feature",
+            "category": "Application Migration Service",
+            "contributor": "",
+            "description": "This release introduces the Global view feature and new Replication state APIs."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,28 @@
+# __2.20.99__ __2023-07-05__
+## __AWS Comprehend Medical__
+  - ### Features
+    - Update to Amazon Comprehend Medical documentation.
+
+## __AWS Key Management Service__
+  - ### Features
+    - Added Dry Run Feature to cryptographic and cross-account mutating KMS APIs (14 in all). This feature allows users to test their permissions and parameters before making the actual API call.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Cross region bucket access for S3 Client. This feature will allow users to access buckets of different region using a single cross region configured client.
+
+## __AWS SecurityHub__
+  - ### Features
+    - Documentation updates for AWS Security Hub
+
+## __Amazon Connect Service__
+  - ### Features
+    - GetMetricDataV2 API: Channels filters do not count towards overall limitation of 100 filter values.
+
+## __Application Migration Service__
+  - ### Features
+    - This release introduces the Global view feature and new Replication state APIs.
+
 # __2.20.98__ __2023-07-03__
 ## __AWS Batch__
   - ### Features

README.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.20.98</version>
+      <version>2.20.99</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.20.98</version>
+  <version>2.20.99</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.20.98</version>
+  <version>2.20.99</version>
 </dependency>
 ```
 
@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.20.98</version>
+  <version>2.20.99</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.98</version>
+        <version>2.20.99</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java

@@ -28,6 +28,6 @@ class CommonGeneratorTasks extends CompositeGeneratorTask {
               new ModelClassGeneratorTasks(params),
               new PackageInfoGeneratorTasks(params),
               new BaseExceptionClassGeneratorTasks(params),
-              new ClientOptionsClassGeneratorTasks(params));
+              new CommonInternalGeneratorTasks(params));
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ClientOptionsClassGeneratorTasks.java renamed to codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonInternalGeneratorTasks.java

@@ -15,26 +15,35 @@
 
 package software.amazon.awssdk.codegen.emitters.tasks;
 
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import software.amazon.awssdk.codegen.emitters.GeneratorTask;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.emitters.PoetGeneratorTask;
 import software.amazon.awssdk.codegen.poet.client.SdkClientOptions;
+import software.amazon.awssdk.codegen.poet.common.UserAgentUtilsSpec;
 
-public class ClientOptionsClassGeneratorTasks extends BaseGeneratorTasks {
+public class CommonInternalGeneratorTasks extends BaseGeneratorTasks {
     private final GeneratorTaskParams params;
 
-    public ClientOptionsClassGeneratorTasks(GeneratorTaskParams params) {
+    public CommonInternalGeneratorTasks(GeneratorTaskParams params) {
         super(params);
         this.params = params;
     }
 
     @Override
     protected List<GeneratorTask> createTasks() throws Exception {
-        return Collections.singletonList(
-            new PoetGeneratorTask(clientOptionsDir(), params.getModel().getFileHeader(), new SdkClientOptions(params.getModel()))
-        );
+        return Arrays.asList(createClientOptionTask(), createUserAgentTask());
+    }
+
+    private PoetGeneratorTask createClientOptionTask() {
+        return new PoetGeneratorTask(clientOptionsDir(), params.getModel().getFileHeader(),
+                                         new SdkClientOptions(params.getModel()));
+    }
+
+    private PoetGeneratorTask createUserAgentTask() {
+        return new PoetGeneratorTask(clientOptionsDir(), params.getModel().getFileHeader(),
+                                     new UserAgentUtilsSpec(params.getModel()));
     }
 
     private String clientOptionsDir() {

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import software.amazon.awssdk.codegen.model.service.ClientContextParam;
 import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.traits.PayloadTrait;
 import software.amazon.awssdk.utils.AttributeMap;
@@ -212,6 +213,20 @@ public class CustomizationConfig {
      */
     private boolean delegateSyncClientClass;
 
+    /**
+     * Fully qualified name of a class that given the default sync client instance can return the final client instance,
+     * for instance by decorating the client with specific-purpose implementations of the client interface.
+     * See S3 customization.config for an example.
+     */
+    private String syncClientDecorator;
+
+    /**
+     * Fully qualified name of a class that given the default async client instance can return the final client instance,
+     * for instance by decorating the client with specific-purpose implementations of the client interface.
+     * See S3 customization.config for an example.
+     */
+    private String asyncClientDecorator;
+
     /**
      * Whether to skip generating endpoint tests from endpoint-tests.json
      */
@@ -236,6 +251,11 @@ public class CustomizationConfig {
      */
     private boolean requiredTraitValidationEnabled = false;
 
+    /**
+     * Customization to attach map of Custom client param configs that can be set on a client builder.
+     */
+    private Map<String, ClientContextParam> customClientContextParams;
+
     private CustomizationConfig() {
     }
 
@@ -566,6 +586,22 @@ public void setDelegateAsyncClientClass(boolean delegateAsyncClientClass) {
         this.delegateAsyncClientClass = delegateAsyncClientClass;
     }
 
+    public String getSyncClientDecorator() {
+        return syncClientDecorator;
+    }
+
+    public void setSyncClientDecorator(String syncClientDecorator) {
+        this.syncClientDecorator = syncClientDecorator;
+    }
+
+    public String getAsyncClientDecorator() {
+        return asyncClientDecorator;
+    }
+
+    public void setAsyncClientDecorator(String asyncClientDecorator) {
+        this.asyncClientDecorator = asyncClientDecorator;
+    }
+
     public boolean isDelegateSyncClientClass() {
         return delegateSyncClientClass;
     }
@@ -621,4 +657,12 @@ public boolean isRequiredTraitValidationEnabled() {
     public void setRequiredTraitValidationEnabled(boolean requiredTraitValidationEnabled) {
         this.requiredTraitValidationEnabled = requiredTraitValidationEnabled;
     }
+
+    public Map<String, ClientContextParam> getCustomClientContextParams() {
+        return customClientContextParams;
+    }
+
+    public void setCustomClientContextParams(Map<String, ClientContextParam> customClientContextParams) {
+        this.customClientContextParams = customClientContextParams;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ServiceConfig.java

@@ -47,6 +47,8 @@ public class ServiceConfig {
 
     private boolean hasAccelerateModeEnabledProperty = false;
 
+    private boolean hasCrossRegionAccessEnabledProperty = false;
+
     public String getClassName() {
         return className;
     }
@@ -95,6 +97,14 @@ public void setHasPathStyleAccessEnabledProperty(boolean hasPathStyleAccessEnabl
         this.hasPathStyleAccessEnabledProperty = hasPathStyleAccessEnabledProperty;
     }
 
+    public boolean hasCrossRegionAccessEnabledProperty() {
+        return hasCrossRegionAccessEnabledProperty;
+    }
+
+    public void setHasCrossRegionAccessEnabledProperty(boolean hasCrossRegionAccessEnabledProperty) {
+        this.hasCrossRegionAccessEnabledProperty = hasCrossRegionAccessEnabledProperty;
+    }
+
     public boolean hasAccelerateModeEnabledProperty() {
         return hasAccelerateModeEnabledProperty;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java

@@ -235,6 +235,21 @@ public String getSdkResponseBaseClassName() {
         }
     }
 
+    public Optional<String> syncClientDecoratorClassName() {
+        if (customizationConfig.getSyncClientDecorator() != null) {
+            return Optional.of(customizationConfig.getSyncClientDecorator());
+        }
+        return Optional.empty();
+    }
+
+    public Optional<String> asyncClientDecoratorClassName() {
+        String asyncClientDecorator = customizationConfig.getAsyncClientDecorator();
+        if (customizationConfig.getAsyncClientDecorator() != null) {
+            return Optional.of(asyncClientDecorator);
+        }
+        return Optional.empty();
+    }
+
     public String getFileHeader() {
         return FILE_HEADER;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtension.java

@@ -73,6 +73,10 @@ public ClassName getServiceConfigClass() {
                                            + model.getMetadata().getServiceName() + "ServiceClientConfiguration");
     }
 
+    public ClassName getUserAgentClass() {
+        return ClassName.get(model.getMetadata().getFullClientInternalPackageName(), "UserAgentUtils");
+    }
+
     /**
      * @param operationName Name of the operation
      * @return A Poet {@link ClassName} for the response type of a paginated operation in the base service package.