Merge pull request #891 from aws/staging/6182acd1-5d01-42b1-b91d-831477b0625c

Pull request: release <- staging/6182acd1-5d01-42b1-b91d-831477b0625c

Author: aws-sdk-java-automation

.changes/2.13.48.json

@@ -0,0 +1,36 @@
+{
+    "version": "2.13.48",
+    "date": "2020-06-30",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon CodeGuru Reviewer",
+            "description": "Release GitHub Enterprise Server source provider integration"
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fix marshaller binding for input event streams when member name and shape name are not equal."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Comprehend Medical",
+            "description": "This release adds the relationships between MedicalCondition and Anatomy in DetectEntitiesV2 API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "Documentation updates for rds"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Added support for tag-on-create for CreateVpc, CreateEgressOnlyInternetGateway, CreateSecurityGroup, CreateSubnet, CreateNetworkInterface, CreateNetworkAcl, CreateDhcpOptions and CreateInternetGateway. You can now specify tags when creating any of these resources. For more information about tagging, see AWS Tagging Strategies."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Registry",
+            "description": "Add a new parameter (ImageDigest) and a new exception (ImageDigestDoesNotMatchException) to PutImage API to support pushing image by digest."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,28 @@
+# __2.13.48__ __2020-06-30__
+## __AWS Comprehend Medical__
+  - ### Features
+    - This release adds the relationships between MedicalCondition and Anatomy in DetectEntitiesV2 API.
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Fix marshaller binding for input event streams when member name and shape name are not equal.
+
+## __Amazon CodeGuru Reviewer__
+  - ### Features
+    - Release GitHub Enterprise Server source provider integration
+
+## __Amazon EC2 Container Registry__
+  - ### Features
+    - Add a new parameter (ImageDigest) and a new exception (ImageDigestDoesNotMatchException) to PutImage API to support pushing image by digest.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Added support for tag-on-create for CreateVpc, CreateEgressOnlyInternetGateway, CreateSecurityGroup, CreateSubnet, CreateNetworkInterface, CreateNetworkAcl, CreateDhcpOptions and CreateInternetGateway. You can now specify tags when creating any of these resources. For more information about tagging, see AWS Tagging Strategies.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Documentation updates for rds
+
 # __2.13.47__ __2020-06-29__
 ## __AWS CodeStar connections__
   - ### Features

README.md

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

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/pom.xml

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

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java

@@ -46,7 +46,6 @@
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.model.config.customization.UtilitiesMethod;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
-import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
 import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.poet.PoetExtensions;
@@ -273,7 +272,7 @@ private CodeBlock createEventStreamTaggedUnionJsonMarshaller(ShapeModel eventStr
                                                             EventStreamTaggedUnionJsonMarshaller.class);
 
         List<String> eventNames = EventStreamUtils.getEventMembers(eventStreamShape)
-                                                  .map(MemberModel::getC2jName)
+                                                  .map(m -> m.getShape().getShapeName())
                                                   .collect(Collectors.toList());
 
         eventNames.forEach(event -> builder.add(".putMarshaller($T.class, new $T(protocolFactory))",

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java

@@ -60,7 +60,6 @@
 import software.amazon.awssdk.services.json.model.GetWithoutRequiredMembersRequest;
 import software.amazon.awssdk.services.json.model.GetWithoutRequiredMembersResponse;
 import software.amazon.awssdk.services.json.model.InputEvent;
-import software.amazon.awssdk.services.json.model.InputEventOne;
 import software.amazon.awssdk.services.json.model.InputEventStream;
 import software.amazon.awssdk.services.json.model.InputEventStreamTwo;
 import software.amazon.awssdk.services.json.model.InputEventTwo;
@@ -86,7 +85,6 @@
 import software.amazon.awssdk.services.json.transform.EventStreamOperationWithOnlyOutputRequestMarshaller;
 import software.amazon.awssdk.services.json.transform.GetWithoutRequiredMembersRequestMarshaller;
 import software.amazon.awssdk.services.json.transform.InputEventMarshaller;
-import software.amazon.awssdk.services.json.transform.InputEventOneMarshaller;
 import software.amazon.awssdk.services.json.transform.InputEventTwoMarshaller;
 import software.amazon.awssdk.services.json.transform.PaginatedOperationWithResultKeyRequestMarshaller;
 import software.amazon.awssdk.services.json.transform.PaginatedOperationWithoutResultKeyRequestMarshaller;
@@ -343,7 +341,7 @@ public CompletableFuture<EventStreamOperationWithOnlyInputResponse> eventStreamO
             HttpResponseHandler<AwsServiceException> errorResponseHandler = createErrorResponseHandler(protocolFactory,
                     operationMetadata);
             EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder()
-                    .putMarshaller(InputEventOne.class, new InputEventOneMarshaller(protocolFactory))
+                    .putMarshaller(InputEvent.class, new InputEventMarshaller(protocolFactory))
                     .putMarshaller(InputEventTwo.class, new InputEventTwoMarshaller(protocolFactory)).build();
             SdkPublisher<InputEventStreamTwo> eventPublisher = SdkPublisher.adapt(requestStream);
             Publisher<ByteBuffer> adapted = eventPublisher.map(event -> eventMarshaller.marshall(event)).map(

core/annotations/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/arns/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/auth/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
 
     <artifactId>core</artifactId>

core/profiles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
 
     <artifactId>profiles</artifactId>

core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java

@@ -42,7 +42,7 @@ public final class ProfileFileReader {
 
     private static final Pattern EMPTY_LINE = Pattern.compile("^[\t ]*$");
 
-    private static final Pattern VALID_IDENTIFIER = Pattern.compile("^[A-Za-z0-9_\\-/.%@]*$");
+    private static final Pattern VALID_IDENTIFIER = Pattern.compile("^[A-Za-z0-9_\\-/.%@:]*$");
 
     private ProfileFileReader() {
     }
@@ -214,7 +214,7 @@ private static Optional<String> parseProfileDefinition(ParserState state, String
         // If the profile name includes invalid characters, it should be ignored.
         if (!isValidIdentifier(profileName)) {
             log.warn(() -> "Ignoring profile '" + standardizedProfileName + "' on line " + state.currentLineNumber + " because " +
-                           "it was not alphanumeric with only these special characters: - / . % @ _");
+                           "it was not alphanumeric with only these special characters: - / . % @ _ :");
             return Optional.empty();
         }
 
@@ -257,7 +257,7 @@ private static Optional<Pair<String, String>> parsePropertyDefinition(ParserStat
         // If the profile name includes invalid characters, it should be ignored.
         if (!isValidIdentifier(propertyKey)) {
             log.warn(() -> "Ignoring property '" + propertyKey + "' on line " + state.currentLineNumber + " because " +
-                           "its name was not alphanumeric with only these special characters: - / . % @ _");
+                           "its name was not alphanumeric with only these special characters: - / . % @ _ :");
             return Optional.empty();
         }
 

core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java

@@ -326,14 +326,14 @@ public void invalidPropertyNamesAreIgnored() {
 
     @Test
     public void allValidProfileNameCharactersAreSupported() {
-        assertThat(configFileProfiles("[profile ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@]"))
-            .isEqualTo(profiles(profile("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@")));
+        assertThat(configFileProfiles("[profile ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@:]"))
+            .isEqualTo(profiles(profile("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@:")));
     }
 
     @Test
     public void allValidPropertyNameCharactersAreSupported() {
-        assertThat(configFileProfiles("[profile foo]\nABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@ = value"))
-            .isEqualTo(profiles(profile("foo", property("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@",
+        assertThat(configFileProfiles("[profile foo]\nABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@: = value"))
+            .isEqualTo(profiles(profile("foo", property("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@:",
                                                         "value"))));
     }
 

core/protocols/aws-cbor-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-ion-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-json-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-query-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-xml-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/protocol-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.13.47</version>
+        <version>2.13.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>