Merge pull request #444 from aws/staging/128fcc1e-edbf-4e48-9f17-9f077f71e812

Pull request: release <- staging/128fcc1e-edbf-4e48-9f17-9f077f71e812

Author: aws-sdk-java-automation

.changes/2.5.5.json

@@ -0,0 +1,51 @@
+{
+    "date": "2019-03-07",
+    "version": "2.5.5",
+    "entries": [
+        {
+            "category": "Amazon GameLift",
+            "type": "feature",
+            "description": "Amazon GameLift-hosted instances can now securely access resources on other AWS services using IAM roles. See more details at https://aws.amazon.com/releasenotes/amazon-gamelift/."
+        },
+        {
+            "category": "Auto Scaling",
+            "type": "feature",
+            "description": "Documentation updates for autoscaling"
+        },
+        {
+            "category": "AWS SDK For Java v2",
+            "type": "bugfix",
+            "description": "Fix bug in the generated async clients where cancelling the `CompletableFuture` returned from an async operation does not result in cancelling the underlying HTTP request execution. In some cases, this can lead to unnecesarily keeping resources from being freed until the request execution finishes."
+        },
+        {
+            "category": "AWS Elemental MediaLive",
+            "type": "feature",
+            "description": "This release adds a MediaPackage output group, simplifying configuration of outputs to AWS Elemental MediaPackage."
+        },
+        {
+            "category": "AWS App Mesh",
+            "type": "feature",
+            "description": "This release includes a new version of the AWS App Mesh APIs. You can read more about the new APIs here: https://docs.aws.amazon.com/app-mesh/latest/APIReference/Welcome.html."
+        },
+        {
+            "category": "AWS Greengrass",
+            "type": "feature",
+            "description": "Greengrass group UID and GID settings can now be configured to use a provided default via FunctionDefaultConfig. If configured, all Lambda processes in your deployed Greengrass group will by default start with the provided UID and/or GID, rather than by default starting with UID \"ggc_user\" and GID \"ggc_group\" as they would if not configured. Individual Lambdas can also be configured to override the defaults if desired via each object in the Functions list of your FunctionDefinitionVersion."
+        },
+        {
+            "category": "Amazon EC2 Container Service",
+            "type": "feature",
+            "description": "This release of Amazon Elastic Container Service (Amazon ECS) introduces additional task definition parameters that enable you to define dependencies for container startup and shutdown, a per-container start and stop timeout value, as well as an AWS App Mesh proxy configuration which eases the integration between Amazon ECS and AWS App Mesh."
+        },
+        {
+            "category": "Netty NIO HTTP Client",
+            "type": "bugfix",
+            "description": "Fix a bug where, if the future returned from the `NettyRequestExecutor#execute` is cancelled, the client continues to wait for the `Channel` acquire to complete, which leads to keeping potentially many resources around unnecessarily."
+        },
+        {
+            "category": "Amazon Relational Database Service",
+            "type": "feature",
+            "description": "You can configure your Aurora database cluster to automatically copy tags on the cluster to any automated or manual database cluster snapshots that are created from the cluster. This allows you to easily set metadata on your snapshots to match the parent cluster, including access policies. You may enable or disable this functionality while creating a new cluster, or by modifying an existing database cluster."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,40 @@
+# __2.5.5__ __2019-03-07__
+## __AWS App Mesh__
+  - ### Features
+    - This release includes a new version of the AWS App Mesh APIs. You can read more about the new APIs here: https://docs.aws.amazon.com/app-mesh/latest/APIReference/Welcome.html.
+
+## __AWS Elemental MediaLive__
+  - ### Features
+    - This release adds a MediaPackage output group, simplifying configuration of outputs to AWS Elemental MediaPackage.
+
+## __AWS Greengrass__
+  - ### Features
+    - Greengrass group UID and GID settings can now be configured to use a provided default via FunctionDefaultConfig. If configured, all Lambda processes in your deployed Greengrass group will by default start with the provided UID and/or GID, rather than by default starting with UID "ggc_user" and GID "ggc_group" as they would if not configured. Individual Lambdas can also be configured to override the defaults if desired via each object in the Functions list of your FunctionDefinitionVersion.
+
+## __AWS SDK For Java v2__
+  - ### Bugfixes
+    - Fix bug in the generated async clients where cancelling the `CompletableFuture` returned from an async operation does not result in cancelling the underlying HTTP request execution. In some cases, this can lead to unnecesarily keeping resources from being freed until the request execution finishes.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release of Amazon Elastic Container Service (Amazon ECS) introduces additional task definition parameters that enable you to define dependencies for container startup and shutdown, a per-container start and stop timeout value, as well as an AWS App Mesh proxy configuration which eases the integration between Amazon ECS and AWS App Mesh.
+
+## __Amazon GameLift__
+  - ### Features
+    - Amazon GameLift-hosted instances can now securely access resources on other AWS services using IAM roles. See more details at https://aws.amazon.com/releasenotes/amazon-gamelift/.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - You can configure your Aurora database cluster to automatically copy tags on the cluster to any automated or manual database cluster snapshots that are created from the cluster. This allows you to easily set metadata on your snapshots to match the parent cluster, including access policies. You may enable or disable this functionality while creating a new cluster, or by modifying an existing database cluster.
+
+## __Auto Scaling__
+  - ### Features
+    - Documentation updates for autoscaling
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Fix a bug where, if the future returned from the `NettyRequestExecutor#execute` is cancelled, the client continues to wait for the `Channel` acquire to complete, which leads to keeping potentially many resources around unnecessarily.
+
 # __2.5.4__ __2019-03-06__
 ## __AWS Direct Connect__
   - ### Features

README.md

@@ -44,7 +44,7 @@ You can import the whole SDK into your project (includes all services) as follow
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.5.4</version>
+  <version>2.5.5</version>
 </dependency>
 ```
 
@@ -56,12 +56,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.5.4</version>
+  <version>2.5.5</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.5.4</version>
+  <version>2.5.5</version>
 </dependency>
 ```
 
@@ -75,7 +75,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.5.4</version>
+      <version>2.5.5</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

aws-sdk-java/pom.xml

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

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java

@@ -52,6 +52,7 @@
 import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
 import software.amazon.awssdk.protocols.json.BaseAwsJsonProtocolFactory;
 import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
+import software.amazon.awssdk.utils.CompletableFutureUtils;
 
 public class JsonProtocolSpec implements ProtocolSpec {
 
@@ -230,7 +231,11 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
         boolean isStreaming = opModel.hasStreamingOutput() || opModel.hasEventStreamOutput();
         String protocolFactory = protocolFactoryLiteral(opModel);
         String customerResponseHandler = opModel.hasEventStreamOutput() ? "asyncResponseHandler" : "asyncResponseTransformer";
-        builder.add("\n\n$L clientHandler.execute(new $T<$T, $T>()\n" +
+        TypeName responseType = opModel.hasEventStreamOutput() && !isRestJson ? ClassName.get(SdkResponse.class)
+                                                                              : pojoResponseType;
+        TypeName executeFutureValueType = executeFutureValueType(opModel);
+
+        builder.add("\n\n$T<$T> executeFuture = clientHandler.execute(new $T<$T, $T>()\n" +
                     ".withOperationName(\"$N\")\n" +
                     ".withMarshaller(new $T($L))\n" +
                     "$L" +
@@ -240,13 +245,12 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                     hostPrefixExpression(opModel) +
                     discoveredEndpoint(opModel) +
                     asyncRequestBody +
-                    ".withInput($L)$L)$L;",
-                    // If the operation has an event stream output we use a different future so we don't return the one
-                    // from the client.
-                    opModel.hasEventStreamOutput() ? "" : "return",
+                    ".withInput($L)$L);",
+                    CompletableFuture.class,
+                    executeFutureValueType,
                     ClientExecutionParams.class,
                     requestType,
-                    opModel.hasEventStreamOutput() && !isRestJson ? SdkResponse.class : pojoResponseType,
+                    responseType,
                     opModel.getOperationName(),
                     marshaller,
                     protocolFactory,
@@ -260,10 +264,15 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                         .builder().add(".withFullDuplex(true)").build() : "",
                     opModel.hasEventStreamOutput() && !isRestJson ? "voidResponseHandler" : "responseHandler",
                     opModel.getInput().getVariableName(),
-                    asyncResponseTransformerVariable(isStreaming, isRestJson, opModel),
-                    whenCompleteBody(opModel, customerResponseHandler));
+                    asyncResponseTransformerVariable(isStreaming, isRestJson, opModel));
+        String whenComplete = whenCompleteBody(opModel, customerResponseHandler);
+        if (!whenComplete.isEmpty()) {
+            builder.add("executeFuture$L;", whenComplete);
+        }
         if (opModel.hasEventStreamOutput()) {
-            builder.addStatement("return future");
+            builder.addStatement("return $T.forwardExceptionTo(future, executeFuture)", CompletableFutureUtils.class);
+        } else {
+            builder.addStatement("return executeFuture");
         }
         return builder.build();
     }
@@ -456,4 +465,14 @@ private String protocolFactoryLiteral(OperationModel opModel) {
     private boolean isRestJson(IntermediateModel model) {
         return Protocol.REST_JSON.equals(model.getMetadata().getProtocol());
     }
+
+    private TypeName executeFutureValueType(OperationModel opModel) {
+        if (opModel.hasEventStreamOutput()) {
+            return ClassName.get(Void.class);
+        } else if (opModel.hasStreamingOutput()) {
+            return TypeVariableName.get("ReturnT");
+        } else {
+            return getPojoResponseType(opModel);
+        }
+    }
 }