Merge pull request #669 from aws/staging/b622329b-da3d-4e3c-b9b6-44ca1cb27ef5

Pull request: release <- staging/b622329b-da3d-4e3c-b9b6-44ca1cb27ef5

Author: aws-sdk-java-automation

.changes/2.10.18.json

@@ -0,0 +1,66 @@
+{
+    "version": "2.10.18",
+    "date": "2019-11-15",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Logs",
+            "description": "Documentation updates for logs"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "This release updates AWS Systems Manager Parameter Store documentation for the enhanced search capability."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "You can now add tags while copying snapshots. Previously, a user had to first copy the snapshot and then add tags to the copied snapshot manually. Moving forward, you can specify the list of tags you wish to be applied to the copied snapshot as a parameter on the Copy Snapshot API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime",
+            "description": "This release adds support for Chime Room Management APIs"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "When SdkException or one of its children is created without a 'message', inherit the message from the exception 'cause' (if any). This should reduce the chance of an exception being raised by the SDK with a null message."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "This release adds a new option in the User Pool to allow specifying sender's name in the emails sent by Amazon Cognito. This release also adds support to add SES Configuration Set to the emails sent by Amazon Cognito."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "description": "Added APIs to register your directories with Amazon WorkSpaces and to modify directory details."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic MapReduce",
+            "description": "Access to the cluster ARN makes it easier for you to author resource-level permissions policies in AWS Identity and Access Management. To simplify the process of obtaining the cluster ARN, Amazon EMR has added a new field containing the cluster ARN to all API responses that include the cluster ID."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "AWS Elemental MediaConvert SDK has added support for DolbyVision encoding, and SCTE35 & ESAM insertion to DASH ISO EMSG."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Introducing Amazon EKS managed node groups, a new feature that lets you easily provision worker nodes for Amazon EKS clusters and keep them up to date using the Amazon EKS management console, CLI, and APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Elastic Load Balancing",
+            "description": "Documentation-only change to the default value of the routing.http.drop_invalid_header_fields.enabled attribute."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GuardDuty",
+            "description": "This release includes new operations related to findings export, including: CreatePublishingDestination, UpdatePublishingDestination, DescribePublishingDestination, DeletePublishingDestination and ListPublishingDestinations."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,52 @@
+# __2.10.18__ __2019-11-15__
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - AWS Elemental MediaConvert SDK has added support for DolbyVision encoding, and SCTE35 & ESAM insertion to DASH ISO EMSG.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - When SdkException or one of its children is created without a 'message', inherit the message from the exception 'cause' (if any). This should reduce the chance of an exception being raised by the SDK with a null message.
+
+## __Amazon Chime__
+  - ### Features
+    - This release adds support for Chime Room Management APIs
+
+## __Amazon CloudWatch Logs__
+  - ### Features
+    - Documentation updates for logs
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - This release adds a new option in the User Pool to allow specifying sender's name in the emails sent by Amazon Cognito. This release also adds support to add SES Configuration Set to the emails sent by Amazon Cognito.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - You can now add tags while copying snapshots. Previously, a user had to first copy the snapshot and then add tags to the copied snapshot manually. Moving forward, you can specify the list of tags you wish to be applied to the copied snapshot as a parameter on the Copy Snapshot API.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Introducing Amazon EKS managed node groups, a new feature that lets you easily provision worker nodes for Amazon EKS clusters and keep them up to date using the Amazon EKS management console, CLI, and APIs.
+
+## __Amazon Elastic MapReduce__
+  - ### Features
+    - Access to the cluster ARN makes it easier for you to author resource-level permissions policies in AWS Identity and Access Management. To simplify the process of obtaining the cluster ARN, Amazon EMR has added a new field containing the cluster ARN to all API responses that include the cluster ID.
+
+## __Amazon GuardDuty__
+  - ### Features
+    - This release includes new operations related to findings export, including: CreatePublishingDestination, UpdatePublishingDestination, DescribePublishingDestination, DeletePublishingDestination and ListPublishingDestinations.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - This release updates AWS Systems Manager Parameter Store documentation for the enhanced search capability.
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - Added APIs to register your directories with Amazon WorkSpaces and to modify directory details.
+
+## __Elastic Load Balancing__
+  - ### Features
+    - Documentation-only change to the default value of the routing.http.drop_invalid_header_fields.enabled attribute.
+
 # __2.10.17__ __2019-11-14__
 ## __AWSMarketplace Metering__
   - ### Features

README.md

@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.10.17</version>
+      <version>2.10.18</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.10.17</version>
+  <version>2.10.18</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.10.17</version>
+  <version>2.10.18</version>
 </dependency>
 ```
 
@@ -99,7 +99,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.10.17</version>
+  <version>2.10.18</version>
 </dependency>
 ```
 

aws-sdk-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.17</version>
+        <version>2.10.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.17</version>
+        <version>2.10.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.17</version>
+        <version>2.10.18</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.10.17</version>
+        <version>2.10.18</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

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

codegen-lite/pom.xml

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

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

@@ -19,11 +19,13 @@
 import static software.amazon.awssdk.codegen.RemoveUnusedShapes.removeUnusedShapes;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
@@ -53,6 +55,8 @@
  */
 public class IntermediateModelBuilder {
 
+    private static final List<String> NO_BODY_METHODS = Arrays.asList("GET", "HEAD", "DELETE");
+
     private static final Logger log = LoggerFactory.getLogger(IntermediateModelBuilder.class);
     private final CustomizationConfig customConfig;
     private final ServiceModel service;
@@ -157,9 +161,28 @@ public IntermediateModel build() {
 
         setSimpleMethods(trimmedModel);
 
+        validateOperations(trimmedModel);
+
         return trimmedModel;
     }
 
+    /**
+     * Validates that operations that use GET, DELETE or HEAD do not have an HTTP body.
+     */
+    private void validateOperations(IntermediateModel model) {
+        List<String> methods = model.getOperations()
+                                    .values()
+                                    .stream()
+                                    .filter(e -> e.getInputShape().hasPayloadMembers())
+                                    .filter(e -> NO_BODY_METHODS.contains(e.getInputShape().getMarshaller().getVerb()))
+                                    .map(e -> e.getInputShape().getC2jName())
+                                    .collect(Collectors.toList());
+
+        if (methods.size() > 0) {
+            throw new RuntimeException("An HTTP body is not allowed on GET/DELETE/HEAD requests. Invalid operations: " + methods);
+        }
+    }
+
     /**
      * Link the member to it's corresponding shape (if it exists).
      *

codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package software.amazon.awssdk.codegen;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import org.junit.Test;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+
+public class IntermediateModelBuilderTest {
+
+    @Test(expected = RuntimeException.class)
+    public void modelWithUnsupportedPayloadMethods_ThrowsException() {
+        File serviceModel = new File(getClass().getResource("poet/client/c2j/unsupportedpayloads/service-2.json").getFile());
+        File customizationModel = new File(getClass().getResource("poet/client/c2j/unsupportedpayloads/customization.config").getFile());
+
+        C2jModels models = C2jModels.builder()
+                                    .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, serviceModel))
+                                    .customizationConfig(ModelLoaderUtils.loadModel(CustomizationConfig.class, customizationModel))
+                                    .build();
+
+        try {
+            new IntermediateModelBuilder(models).build();
+        } catch (RuntimeException e) {
+            assertTrue(e.getMessage().contains("GetBlacklistReportsRequest"));
+            assertTrue(e.getMessage().contains("GetDedicatedIpsRequest"));
+            throw e;
+        }
+
+        fail("Expected RuntimeException");
+    }
+
+}

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/unsupportedpayloads/customization.config

@@ -0,0 +1,5 @@
+{
+    "authPolicyActions" : {
+        "skip" : true
+    }
+}