Merge pull request #2760 from aws/staging/a5694233-9596-4ea9-b616-0ed7bfd36dba

Pull request: release <- staging/a5694233-9596-4ea9-b616-0ed7bfd36dba

Author: aws-sdk-java-automation

.changes/2.21.21.json

@@ -0,0 +1,60 @@
+{
+    "version": "2.21.21",
+    "date": "2023-11-10",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "contributor": "",
+            "description": "Fix an issue where data received on a channel while it was idling was not handled until the channel was leased again for a request. This caused issues such as late notification of channel closes, manifesting as channels being closed at the beginning of a request."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Control Tower",
+            "contributor": "",
+            "description": "AWS Control Tower supports tagging for enabled controls. This release introduces TagResource, UntagResource and ListTagsForResource APIs to manage tags in existing enabled controls. It updates EnabledControl API to tag resources at creation time."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost and Usage Report Service",
+            "contributor": "",
+            "description": "This release adds support for tagging and customers can now tag report definitions. Additionally, ReportStatus is now added to report definition to show when the last delivered time stamp and if it succeeded or not."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "contributor": "",
+            "description": "This release includes the ability to specify any input source as the primary input for corresponding follow modes, and allows users to specify fit and fill behaviors without resizing content."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Marketplace Entitlement Service",
+            "contributor": "",
+            "description": "Add paginators to GetEntitlements."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "EC2 adds API updates to enable ENA Express at instance launch time."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "contributor": "",
+            "description": "Updates Amazon RDS documentation for zero-ETL integrations."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon S3",
+            "contributor": "anirudh9391",
+            "description": "Create a plugin framework for Code-gen to consume plugins specified in customization.config and configure them on the client instance"
+        },
+        {
+            "type": "feature",
+            "category": "Firewall Management Service",
+            "contributor": "",
+            "description": "Adds optimizeUnassociatedWebACL flag to ManagedServiceData, updates third-party firewall examples, and other minor documentation updates."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,45 @@
+# __2.21.21__ __2023-11-10__
+## __AWS Control Tower__
+  - ### Features
+    - AWS Control Tower supports tagging for enabled controls. This release introduces TagResource, UntagResource and ListTagsForResource APIs to manage tags in existing enabled controls. It updates EnabledControl API to tag resources at creation time.
+
+## __AWS Cost and Usage Report Service__
+  - ### Features
+    - This release adds support for tagging and customers can now tag report definitions. Additionally, ReportStatus is now added to report definition to show when the last delivered time stamp and if it succeeded or not.
+
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - This release includes the ability to specify any input source as the primary input for corresponding follow modes, and allows users to specify fit and fill behaviors without resizing content.
+
+## __AWS Marketplace Entitlement Service__
+  - ### Features
+    - Add paginators to GetEntitlements.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - EC2 adds API updates to enable ENA Express at instance launch time.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Updates Amazon RDS documentation for zero-ETL integrations.
+
+## __Amazon S3__
+  - ### Features
+    - Create a plugin framework for Code-gen to consume plugins specified in customization.config and configure them on the client instance
+        - Contributed by: [@anirudh9391](https://github.com/anirudh9391)
+
+## __Firewall Management Service__
+  - ### Features
+    - Adds optimizeUnassociatedWebACL flag to ManagedServiceData, updates third-party firewall examples, and other minor documentation updates.
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Fix an issue where data received on a channel while it was idling was not handled until the channel was leased again for a request. This caused issues such as late notification of channel closes, manifesting as channels being closed at the beginning of a request.
+
+## __Contributors__
+Special thanks to the following contributors to this release: 
+
+[@anirudh9391](https://github.com/anirudh9391)
 # __2.21.20__ __2023-11-09__
 ## __AWS CloudFormation__
   - ### Features
@@ -1276,7 +1318,7 @@ Special thanks to the following contributors to this release:
 ## __Contributors__
 Special thanks to the following contributors to this release: 
 
-[@psnilesh](https://github.com/psnilesh), [@faucct](https://github.com/faucct)
+[@faucct](https://github.com/faucct), [@psnilesh](https://github.com/psnilesh)
 # __2.20.146__ __2023-09-12__
 ## __AWS CRT-based S3 Client__
   - ### Bugfixes
@@ -3017,7 +3059,7 @@ Special thanks to the following contributors to this release:
 ## __Contributors__
 Special thanks to the following contributors to this release: 
 
-[@breader124](https://github.com/breader124), [@bmaizels](https://github.com/bmaizels)
+[@bmaizels](https://github.com/bmaizels), [@breader124](https://github.com/breader124)
 # __2.20.85__ __2023-06-13__
 ## __AWS CloudTrail__
   - ### 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.21.20</version>
+      <version>2.21.21</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.21.20</version>
+  <version>2.21.21</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.21.20</version>
+  <version>2.21.21</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.21.20</version>
+  <version>2.21.21</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</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.21.20</version>
+        <version>2.21.21</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

@@ -208,7 +208,7 @@ public class CustomizationConfig {
     private UnderscoresInNameBehavior underscoresInNameBehavior;
 
     private String userAgent;
-    
+
     private RetryMode defaultRetryMode;
 
     /**
@@ -259,6 +259,8 @@ public class CustomizationConfig {
 
     private List<String> interceptors = new ArrayList<>();
 
+    private List<String> internalPlugins = new ArrayList<>();
+
     /**
      * Whether marshallers perform validations against members marked with RequiredTrait.
      */
@@ -698,7 +700,15 @@ public List<String> getInterceptors() {
     public void setInterceptors(List<String> interceptors) {
         this.interceptors = interceptors;
     }
-    
+
+    public List<String> getInternalPlugins() {
+        return internalPlugins;
+    }
+
+    public void setInternalPlugins(List<String> internalPlugins) {
+        this.internalPlugins = internalPlugins;
+    }
+
     public boolean isRequiredTraitValidationEnabled() {
         return requiredTraitValidationEnabled;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -178,6 +178,7 @@ public TypeSpec poetSpec() {
         builder.addMethod(setOverridesMethod());
         addServiceHttpConfigIfNeeded(builder, model);
         builder.addMethod(invokePluginsMethod());
+        builder.addMethod(internalPluginsMethod());
         builder.addMethod(validateClientOptionsMethod());
 
 
@@ -721,15 +722,24 @@ private MethodSpec authSchemesMethod() {
 
     private MethodSpec invokePluginsMethod() {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("invokePlugins")
-            .addAnnotation(Override.class)
+                                               .addAnnotation(Override.class)
                                                .addModifiers(PROTECTED)
                                                .addParameter(SdkClientConfiguration.class, "config")
                                                .returns(SdkClientConfiguration.class);
-        builder.addStatement("$T plugins = plugins()",
+
+        builder.addStatement("$T internalPlugins = internalPlugins()",
+                             ParameterizedTypeName.get(List.class, SdkPlugin.class));
+
+        builder.addStatement("$T externalPlugins = plugins()",
                              ParameterizedTypeName.get(List.class, SdkPlugin.class))
-               .beginControlFlow("if (plugins.isEmpty())")
+               .beginControlFlow("if (internalPlugins.isEmpty() && externalPlugins.isEmpty())")
                .addStatement("return config")
                .endControlFlow();
+
+        builder.addStatement("$T plugins = $T.mergeLists(internalPlugins, externalPlugins)",
+                             ParameterizedTypeName.get(List.class, SdkPlugin.class),
+                             CollectionUtils.class);
+
         builder.addStatement("$1T.BuilderInternal serviceConfigBuilder = $1T.builder(config.toBuilder())",
                              configurationUtils.serviceClientConfigurationBuilderClassName());
         builder.addStatement("serviceConfigBuilder.overrideConfiguration(overrideConfiguration())");
@@ -741,6 +751,33 @@ private MethodSpec invokePluginsMethod() {
         return builder.build();
     }
 
+    private MethodSpec internalPluginsMethod() {
+
+        ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName
+            .get(ClassName.get(List.class), ClassName.get(SdkPlugin.class));
+
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("internalPlugins")
+                                               .addModifiers(PRIVATE)
+                                               .returns(parameterizedTypeName);
+
+        builder.addStatement("$T internalPlugins = new $T<>()",
+                             ParameterizedTypeName.get(List.class, SdkPlugin.class),
+                             ArrayList.class);
+
+        List<ClassName> internalPlugins = new ArrayList<>();
+
+        for (String internalPlugin : model.getCustomizationConfig().getInternalPlugins()) {
+            internalPlugins.add(ClassName.bestGuess(internalPlugin));
+        }
+
+        for (ClassName internalPlugin : internalPlugins) {
+            builder.addStatement("internalPlugins.add(new $T())", internalPlugin);
+        }
+
+        builder.addStatement("return internalPlugins");
+        return builder.build();
+    }
+
     private MethodSpec setOverridesMethod() {
         return MethodSpec.methodBuilder("setOverrides")
                          .addModifiers(PROTECTED)

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-bearer-auth-client-builder-class.java

@@ -132,10 +132,12 @@ protected SdkClientConfiguration setOverrides(SdkClientConfiguration configurati
 
     @Override
     protected SdkClientConfiguration invokePlugins(SdkClientConfiguration config) {
-        List<SdkPlugin> plugins = plugins();
-        if (plugins.isEmpty()) {
+        List<SdkPlugin> internalPlugins = internalPlugins();
+        List<SdkPlugin> externalPlugins = plugins();
+        if (internalPlugins.isEmpty() && externalPlugins.isEmpty()) {
             return config;
         }
+        List<SdkPlugin> plugins = CollectionUtils.mergeLists(internalPlugins, externalPlugins);
         JsonServiceClientConfigurationBuilder.BuilderInternal serviceConfigBuilder = JsonServiceClientConfigurationBuilder
             .builder(config.toBuilder());
         serviceConfigBuilder.overrideConfiguration(overrideConfiguration());
@@ -146,6 +148,11 @@ protected SdkClientConfiguration invokePlugins(SdkClientConfiguration config) {
         return serviceConfigBuilder.buildSdkClientConfiguration();
     }
 
+    private List<SdkPlugin> internalPlugins() {
+        List<SdkPlugin> internalPlugins = new ArrayList<>();
+        return internalPlugins;
+    }
+
     protected static void validateClientOptions(SdkClientConfiguration c) {
         Validate.notNull(c.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER),
                          "The 'tokenProvider' must be configured in the client builder.");