Merge pull request #1793 from aws/staging/3ad03742-c86d-4083-b0ae-a5f…

…376d714f9

Pull request: release <- staging/3ad03742-c86d-4083-b0ae-a5f376d714f9

.changes/2.17.68.json

@@ -0,0 +1,36 @@
+{
+    "version": "2.17.68",
+    "date": "2021-10-26",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Chime SDK Identity",
+            "contributor": "",
+            "description": "The Amazon Chime SDK now supports push notifications through Amazon Pinpoint"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EMR Containers",
+            "contributor": "",
+            "description": "This feature enables auto-generation of certificate to secure the managed-endpoint and removes the need for customer provided certificate-arn during managed-endpoint setup."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "Truncate the async request body when the content-length is shorter than the request body, instead of raising a \"Data read has a different checksum\" exception."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "Raise an exception instead of hanging when a put-object content-length exceeds the data written by the async request body."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime SDK Messaging",
+            "contributor": "",
+            "description": "The Amazon Chime SDK now supports push notifications through Amazon Pinpoint"
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,21 @@
+# __2.17.68__ __2021-10-26__
+## __Amazon Chime SDK Identity__
+  - ### Features
+    - The Amazon Chime SDK now supports push notifications through Amazon Pinpoint
+
+## __Amazon Chime SDK Messaging__
+  - ### Features
+    - The Amazon Chime SDK now supports push notifications through Amazon Pinpoint
+
+## __Amazon EMR Containers__
+  - ### Features
+    - This feature enables auto-generation of certificate to secure the managed-endpoint and removes the need for customer provided certificate-arn during managed-endpoint setup.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Raise an exception instead of hanging when a put-object content-length exceeds the data written by the async request body.
+    - Truncate the async request body when the content-length is shorter than the request body, instead of raising a "Data read has a different checksum" exception.
+
 # __2.17.67__ __2021-10-25__
 ## __AWS Audit Manager__
   - ### 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.17.67</version>
+      <version>2.17.68</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.17.67</version>
+  <version>2.17.68</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.17.67</version>
+  <version>2.17.68</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.17.67</version>
+  <version>2.17.68</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

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

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

@@ -187,17 +187,11 @@ public List<MemberModel> getUnboundMembers() {
         List<MemberModel> unboundMembers = new ArrayList<>();
         if (members != null) {
             for (MemberModel member : members) {
-                if (member.getHttp().getLocation() == null && !member.getHttp().getIsPayload()) {
+                if (member.getHttp().getLocation() == null) {
                     if (hasPayloadMember) {
-                        // There is an explicit payload, but this unbound
-                        // member isn't it.
-                        // Note: Somewhat unintuitive, explicit payloads don't
-                        // have an explicit location; they're identified by
-                        // the payload HTTP trait being true.
                         throw new IllegalStateException(String.format(
-                                "C2J Shape %s has both an explicit payload member and unbound (no explicit location) member, %s."
-                                + " This is undefined behavior, verify the correctness of the C2J model.",
-                                c2jName, member.getName()));
+                                "C2J Shape %s has both an explicit payload member and unbound (no explicit location) members. "
+                                + "This is undefined behavior, verify the correctness of the C2J model", c2jName));
                     }
                     unboundMembers.add(member);
                 }
@@ -227,12 +221,7 @@ public List<MemberModel> getUnboundEventMembers() {
     public boolean hasPayloadMembers() {
         return hasPayloadMember ||
                getExplicitEventPayloadMember() != null ||
-               hasImplicitPayloadMembers();
-
-    }
-
-    public boolean hasImplicitPayloadMembers() {
-        return !getUnboundMembers().isEmpty() ||
+               !getUnboundMembers().isEmpty() ||
                (isEvent() && !getUnboundEventMembers().isEmpty());
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java

@@ -95,7 +95,6 @@ protected FieldSpec operationInfoField() {
                                       .add(".httpMethod($T.$L)", SdkHttpMethod.class, shapeModel.getMarshaller().getVerb())
                                       .add(".hasExplicitPayloadMember($L)", shapeModel.isHasPayloadMember() ||
                                                                             shapeModel.getExplicitEventPayloadMember() != null)
-                                      .add(".hasImplicitPayloadMembers($L)", shapeModel.hasImplicitPayloadMembers())
                                       .add(".hasPayloadMembers($L)", shapeModel.hasPayloadMembers());
 
         if (StringUtils.isNotBlank(shapeModel.getMarshaller().getTarget())) {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/alltypesrequestmarshaller.java

@@ -19,8 +19,7 @@
 @SdkInternalApi
 public class AllTypesRequestMarshaller implements Marshaller<AllTypesRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
-            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true)
-            .hasPayloadMembers(true).build();
+                                                                            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,10 +32,11 @@ public SdkHttpFullRequest marshall(AllTypesRequest allTypesRequest) {
         Validate.paramNotNull(allTypesRequest, "allTypesRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(allTypesRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
+

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java

@@ -19,8 +19,8 @@
 @SdkInternalApi
 public class EventStreamOperationRequestMarshaller implements Marshaller<EventStreamOperationRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-            .requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
-            .hasImplicitPayloadMembers(false).hasPayloadMembers(true).hasEventStreamingInput(true).build();
+                                                                            .requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
+                                                                            .hasPayloadMembers(true).hasEventStreamingInput(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,7 +33,7 @@ public SdkHttpFullRequest marshall(EventStreamOperationRequest eventStreamOperat
         Validate.paramNotNull(eventStreamOperationRequest, "eventStreamOperationRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(eventStreamOperationRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java

@@ -17,11 +17,11 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 @SdkInternalApi
-public class EventStreamOperationWithOnlyInputRequestMarshaller implements Marshaller<EventStreamOperationWithOnlyInputRequest> {
+public class EventStreamOperationWithOnlyInputRequestMarshaller implements
+                                                                Marshaller<EventStreamOperationWithOnlyInputRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-            .requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST)
-            .hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true).hasPayloadMembers(true).hasEventStreamingInput(true)
-            .build();
+                                                                            .requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST)
+                                                                            .hasExplicitPayloadMember(false).hasPayloadMembers(true).hasEventStreamingInput(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -34,10 +34,11 @@ public SdkHttpFullRequest marshall(EventStreamOperationWithOnlyInputRequest even
         Validate.paramNotNull(eventStreamOperationWithOnlyInputRequest, "eventStreamOperationWithOnlyInputRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(eventStreamOperationWithOnlyInputRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
+

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/nestedcontainersrequestmarshaller.java

@@ -19,8 +19,7 @@
 @SdkInternalApi
 public class NestedContainersRequestMarshaller implements Marshaller<NestedContainersRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
-            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true)
-            .hasPayloadMembers(true).build();
+                                                                            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,10 +32,11 @@ public SdkHttpFullRequest marshall(NestedContainersRequest nestedContainersReque
         Validate.paramNotNull(nestedContainersRequest, "nestedContainersRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(nestedContainersRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
+

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/operationwithnoinputoroutputrequestmarshaller.java

@@ -17,10 +17,10 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 @SdkInternalApi
-public class OperationWithNoInputOrOutputRequestMarshaller implements Marshaller<OperationWithNoInputOrOutputRequest> {
+public class OperationWithNoInputOrOutputRequestMarshaller implements
+                                                           Marshaller<OperationWithNoInputOrOutputRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
-            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(false)
-            .hasPayloadMembers(false).build();
+                                                                            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(false).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,10 +33,11 @@ public SdkHttpFullRequest marshall(OperationWithNoInputOrOutputRequest operation
         Validate.paramNotNull(operationWithNoInputOrOutputRequest, "operationWithNoInputOrOutputRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(operationWithNoInputOrOutputRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
+

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streaminginputoperationrequestmarshaller.java

@@ -19,8 +19,8 @@
 @SdkInternalApi
 public class StreamingInputOperationRequestMarshaller implements Marshaller<StreamingInputOperationRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-            .requestUri("/2016-03-11/streamingInputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
-            .hasImplicitPayloadMembers(false).hasPayloadMembers(true).hasStreamingInput(true).build();
+                                                                            .requestUri("/2016-03-11/streamingInputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
+                                                                            .hasPayloadMembers(true).hasStreamingInput(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,10 +33,11 @@ public SdkHttpFullRequest marshall(StreamingInputOperationRequest streamingInput
         Validate.paramNotNull(streamingInputOperationRequest, "streamingInputOperationRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(streamingInputOperationRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
+