Merge pull request #2280 from aws/staging/b3e668e3-c8f1-4850-936e-abf487d18d85

Pull request: release <- staging/b3e668e3-c8f1-4850-936e-abf487d18d85

Author: aws-sdk-java-automation

.changes/2.18.33.json

@@ -0,0 +1,48 @@
+{
+    "version": "2.18.33",
+    "date": "2022-12-07",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "S3 query param validation\n\nThe SDK will raise SdkClientException when a null value is set for a member marked with the required trait."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "contributor": "",
+            "description": "This release adds the LinkedAccountName field to the GetAnomalies API response under RootCause"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "contributor": "",
+            "description": "Updated examples and exceptions for External Key Store (XKS)."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Adding utilities for signing CloudFront URLs and cookies"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudFront",
+            "contributor": "",
+            "description": "Introducing UpdateDistributionWithStagingConfig that can be used to promote the staging configuration to the production."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "contributor": "",
+            "description": "Adds support for EKS add-ons configurationValues fields and DescribeAddonConfiguration function"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,31 @@
+# __2.18.33__ __2022-12-07__
+## __AWS Cost Explorer Service__
+  - ### Features
+    - This release adds the LinkedAccountName field to the GetAnomalies API response under RootCause
+
+## __AWS Key Management Service__
+  - ### Features
+    - Updated examples and exceptions for External Key Store (XKS).
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Adding utilities for signing CloudFront URLs and cookies
+    - Updated endpoint and partition metadata.
+
+## __Amazon CloudFront__
+  - ### Features
+    - Introducing UpdateDistributionWithStagingConfig that can be used to promote the staging configuration to the production.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Adds support for EKS add-ons configurationValues fields and DescribeAddonConfiguration function
+
+## __Amazon S3__
+  - ### Bugfixes
+    - S3 query param validation
+
+      The SDK will raise SdkClientException when a null value is set for a member marked with the required trait.
+
 # __2.18.32__ __2022-12-06__
 ## __AWS SDK for Java v2__
   - ### 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.18.32</version>
+      <version>2.18.33</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.18.32</version>
+  <version>2.18.33</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.18.32</version>
+  <version>2.18.33</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.18.32</version>
+  <version>2.18.33</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

buildspecs/build.yml

@@ -7,9 +7,10 @@ phases:
 
   build:
     commands:
-      - mvn clean install -T1C
+      - mvn clean install -T1C $MAVEN_OPTIONS
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
+      - echo $MAVEN_OPTIONS
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
           cd test/module-path-tests

buildspecs/integ-test.yml

@@ -15,9 +15,10 @@ phases:
           AWS_SESSION_TOKEN=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $3 }'`
           echo "Using role $INTEGRATION_TEST_ROLE_ARN with access key $AWS_ACCESS_KEY_ID."
         fi
-      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -T1C
+      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -T1C $MAVEN_OPTIONS
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
+      - echo $MAVEN_OPTIONS
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
           cd test/module-path-tests

buildspecs/stability-test.yml

@@ -7,7 +7,8 @@ phases:
 
   build:
     commands:
-      - mvn clean install -P stability-tests -pl :stability-tests --am
+      - mvn clean install -P stability-tests -pl :stability-tests --am $MAVEN_OPTIONS
+      - echo $MAVEN_OPTIONS
     finally:
       - mkdir -p codebuild-test-reports
       - find ./ -name 'TEST-*.xml' -type f -exec cp {} codebuild-test-reports/ \;

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</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.18.32</version>
+        <version>2.18.33</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

@@ -23,6 +23,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import software.amazon.awssdk.codegen.internal.TypeUtils;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.EnumModel;
@@ -192,6 +193,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
         memberModel.setXmlAttribute(c2jMemberDefinition.isXmlAttribute());
         memberModel.setUnionEnumTypeName(namingStrategy.getUnionEnumTypeName(memberModel));
         memberModel.setContextParam(c2jMemberDefinition.getContextParam());
+        memberModel.setRequired(isRequiredMember(c2jMemberName, parentShape));
 
 
         // Pass the xmlNameSpace from the member reference
@@ -309,6 +311,12 @@ private boolean isFlattened(Member member, Shape memberShape) {
                || memberShape.isFlattened();
     }
 
+    private boolean isRequiredMember(String memberName, Shape memberShape) {
+        return Optional.ofNullable(memberShape.getRequired())
+                       .map(l -> l.contains(memberName))
+                       .orElse(false);
+    }
+
     /**
      * @param parentShape  Shape containing the member in question.
      * @param allC2jShapes All shapes in the service model.

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

@@ -215,6 +215,11 @@ public class CustomizationConfig {
 
     private List<String> interceptors = new ArrayList<>();
 
+    /**
+     * Whether marshallers perform validations against members marked with RequiredTrait.
+     */
+    private boolean requiredTraitValidationEnabled = false;
+
     private CustomizationConfig() {
     }
 
@@ -559,4 +564,12 @@ public List<String> getInterceptors() {
     public void setInterceptors(List<String> interceptors) {
         this.interceptors = interceptors;
     }
+    
+    public boolean isRequiredTraitValidationEnabled() {
+        return requiredTraitValidationEnabled;
+    }
+
+    public void setRequiredTraitValidationEnabled(boolean requiredTraitValidationEnabled) {
+        this.requiredTraitValidationEnabled = requiredTraitValidationEnabled;
+    }
 }

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

@@ -59,6 +59,8 @@ public class MemberModel extends DocumentationModel {
 
     private String deprecatedMessage;
 
+    private boolean required;
+
     private ListModel listModel;
 
     private MapModel mapModel;
@@ -316,6 +318,14 @@ public void setDeprecatedMessage(String deprecatedMessage) {
         this.deprecatedMessage = deprecatedMessage;
     }
 
+    public boolean isRequired() {
+        return required;
+    }
+
+    public void setRequired(boolean required) {
+        this.required = required;
+    }
+
     public boolean isEventPayload() {
         return eventPayload;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java

@@ -45,6 +45,7 @@
 import software.amazon.awssdk.core.traits.LocationTrait;
 import software.amazon.awssdk.core.traits.MapTrait;
 import software.amazon.awssdk.core.traits.PayloadTrait;
+import software.amazon.awssdk.core.traits.RequiredTrait;
 import software.amazon.awssdk.core.traits.TimestampFormatTrait;
 import software.amazon.awssdk.core.traits.XmlAttributeTrait;
 import software.amazon.awssdk.core.traits.XmlAttributesTrait;
@@ -184,6 +185,9 @@ private CodeBlock traits(MemberModel m) {
         if (m.isXmlAttribute()) {
             traits.add(createXmlAttributeTrait());
         }
+        if (customizationConfig.isRequiredTraitValidationEnabled() && m.isRequired()) {
+            traits.add(createRequiredTrait());
+        }
 
         if (!traits.isEmpty()) {
             return CodeBlock.builder()
@@ -268,6 +272,12 @@ private CodeBlock createPayloadTrait() {
                         .build();
     }
 
+    private CodeBlock createRequiredTrait() {
+        return CodeBlock.builder()
+                        .add("$T.create()", ClassName.get(RequiredTrait.class))
+                        .build();
+    }
+
     private CodeBlock createMapTrait(MemberModel m) {
         return CodeBlock.builder()
                         .add("$T.builder()\n"
@@ -306,7 +316,7 @@ private CodeBlock createXmlAttributesTrait(MemberModel model) {
         String uri = xmlNamespace.getUri();
         String prefix = xmlNamespace.getPrefix();
         CodeBlock.Builder codeBlockBuilder = CodeBlock.builder()
-                                         .add("$T.create(", ClassName.get(XmlAttributesTrait.class));
+                                                      .add("$T.create(", ClassName.get(XmlAttributesTrait.class));
 
         String namespacePrefix = "xmlns:" + prefix;
         codeBlockBuilder.add("$T.of($S, $T.builder().attributeGetter((ignore) -> $S).build())",