Merge branch 'master' into zoewang/reenableCodingConventionTest

aws · Dec 12, 2024 · 37e015b · 37e015b
2 parents e7f154d + 89e0e75
commit 37e015b
Show file tree

Hide file tree

Showing 561 changed files with 5,593 additions and 4,306 deletions.
diff --git a/.changes/2.29.32.json b/.changes/2.29.32.json
@@ -0,0 +1,60 @@
+{
+    "version": "2.29.32",
+    "date": "2024-12-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Artifact",
+            "contributor": "",
+            "description": "Add support for listing active customer agreements for the calling AWS Account."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudTrail",
+            "contributor": "",
+            "description": "Doc-only updates for CloudTrail."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Control Catalog",
+            "contributor": "",
+            "description": "Minor documentation updates to the content of ImplementationDetails object part of the Control Catalog GetControl API"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Migration Hub",
+            "contributor": "",
+            "description": "API and documentation updates for AWS MigrationHub related to adding support for listing migration task updates and associating, disassociating and listing source resources"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "contributor": "",
+            "description": "Updated descriptions for some API operations and parameters, corrected some errors in Cognito user pools"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Email Service",
+            "contributor": "",
+            "description": "Introduces support for multi-region endpoint."
+        },
+        {
+            "type": "feature",
+            "category": "EMR Serverless",
+            "contributor": "",
+            "description": "This release adds support for accessing system profile logs in Lake Formation-enabled jobs."
+        },
+        {
+            "type": "feature",
+            "category": "Timestream InfluxDB",
+            "contributor": "",
+            "description": "Adds networkType parameter to CreateDbInstance API which allows IPv6 support to the InfluxDB endpoint"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,41 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.29.32__ __2024-12-11__
+## __AWS Artifact__
+  - ### Features
+    - Add support for listing active customer agreements for the calling AWS Account.
+
+## __AWS CloudTrail__
+  - ### Features
+    - Doc-only updates for CloudTrail.
+
+## __AWS Control Catalog__
+  - ### Features
+    - Minor documentation updates to the content of ImplementationDetails object part of the Control Catalog GetControl API
+
+## __AWS Migration Hub__
+  - ### Features
+    - API and documentation updates for AWS MigrationHub related to adding support for listing migration task updates and associating, disassociating and listing source resources
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - Updated descriptions for some API operations and parameters, corrected some errors in Cognito user pools
+
+## __Amazon Simple Email Service__
+  - ### Features
+    - Introduces support for multi-region endpoint.
+
+## __EMR Serverless__
+  - ### Features
+    - This release adds support for accessing system profile logs in Lake Formation-enabled jobs.
+
+## __Timestream InfluxDB__
+  - ### Features
+    - Adds networkType parameter to CreateDbInstance API which allows IPv6 support to the InfluxDB endpoint
+
 # __2.29.31__ __2024-12-10__
 ## __AWS Billing and Cost Management Pricing Calculator__
   - ### Features

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.29.31</version>
+      <version>2.29.32</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.29.31</version>
+  <version>2.29.32</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.29.31</version>
+  <version>2.29.32</version>
 </dependency>
 ```
 
@@ -102,7 +102,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.29.31</version>
+  <version>2.29.32</version>
 </dependency>
 ```
 

diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

diff --git a/bundle-logging-bridge/pom.xml b/bundle-logging-bridge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32-SNAPSHOT</version>
+        <version>2.29.33-SNAPSHOT</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
@@ -113,6 +113,8 @@ public TypeSpec poetSpec() {
                                                .addMethod(addModifier(sdkFieldNameToFieldMethod(), FINAL))
                                                .addTypes(nestedModelClassTypes());
 
+        shapeModelSpec.additionalMethods().forEach(specBuilder::addMethod);
+
         if (shapeModel.isUnion()) {
             specBuilder.addField(unionTypeField());
         }

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java
@@ -18,6 +18,7 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.WildcardTypeName;
 import java.util.ArrayList;
@@ -128,7 +129,7 @@ public Iterable<FieldSpec> staticFields(Modifier... modifiers) {
                                                                sdkFieldType),
                                      "SDK_NAME_TO_FIELD",
                                      Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
-                       .initializer(memberNameToFieldInitializer(nameToField))
+                       .initializer(memberNameToFieldInitializer())
                        .build());
         return fields;
     }
@@ -150,6 +151,22 @@ private CodeBlock sdkFieldInitializer(MemberModel m) {
                         .build();
     }
 
+    public List<MethodSpec> additionalMethods() {
+        return Collections.singletonList(memberNameToFieldInitializerMethod(nameToField()));
+    }
+
+    public Map<String, String> nameToField() {
+        Map<String, String> nameToField = new LinkedHashMap<>();
+        shapeModel.getNonStreamingMembers().stream()
+                  .filter(m -> m.getShape() == null || m.getShape().getShapeType() != ShapeType.Exception)
+                  .filter(m -> !m.isSynthetic())
+                  .forEach(m -> {
+                      String name = m.getHttp().getMarshallLocationName();
+                      nameToField.put(name, namingStrategy.getSdkFieldFieldName(m));
+                  });
+        return nameToField;
+    }
+
     private CodeBlock containerSdkFieldInitializer(MemberModel m) {
         ClassName sdkFieldType = ClassName.get(SdkField.class);
         return CodeBlock.builder()
@@ -392,18 +409,29 @@ private CodeBlock sdkFieldsInitializer(List<FieldSpec> fields) {
         return builder.build();
     }
 
-    private CodeBlock memberNameToFieldInitializer(Map<String, String> nameToField) {
-        CodeBlock.Builder builder = CodeBlock.builder();
+    private CodeBlock memberNameToFieldInitializer() {
+        return CodeBlock.builder()
+                        .add("memberNameToFieldInitializer()")
+                        .build();
+    }
+
+    private MethodSpec memberNameToFieldInitializerMethod(Map<String, String> nameToField) {
+        ParameterizedTypeName sdkFieldT = ParameterizedTypeName.get(ClassName.get(SdkField.class),
+                                                                    WildcardTypeName.subtypeOf(Object.class));
+        ParameterizedTypeName mapT = ParameterizedTypeName.get(ClassName.get(Map.class), ClassName.get(String.class),
+                                                               sdkFieldT);
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("memberNameToFieldInitializer")
+            .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
+            .returns(mapT);
+
         if (nameToField.isEmpty()) {
-            builder.add("$T.emptyMap()", Collections.class);
-            return builder.build();
+            builder.addStatement("return $T.emptyMap()", Collections.class);
+        } else {
+            builder.addStatement("$T map = new $T<>()", mapT, HashMap.class);
+            nameToField.forEach((name, field) -> builder.addStatement("map.put($S, $L)", name, field));
+            builder.addStatement("return $T.unmodifiableMap(map)", Collections.class);
         }
-        builder.add("$T.unmodifiableMap(", Collections.class);
-        builder.add("new $T<$T, $T<?>>() {{\n", HashMap.class, String.class, SdkField.class);
-        nameToField.forEach((name, field) -> builder.add("put($S, $L);\n", name, field));
-        builder.add("}}");
-        builder.add(")");
+
         return builder.build();
     }
-
 }