Merge pull request #1112 from aws/staging/0e6dd94a-3bd9-40aa-a91e-77f3363cff76

Pull request: release <- staging/0e6dd94a-3bd9-40aa-a91e-77f3363cff76

Author: millems

.changes/2.15.49.json

@@ -0,0 +1,72 @@
+{
+    "version": "2.15.49",
+    "date": "2020-12-17",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Route 53 Resolver",
+            "contributor": "",
+            "description": "Route 53 Resolver adds support for enabling resolver DNSSEC validation in virtual private cloud (VPC)."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "contributor": "",
+            "description": "Adding PutExternalEvaluation API which grants permission to deliver evaluation result to AWS Config"
+        },
+        {
+            "type": "feature",
+            "category": "EC2 Image Builder",
+            "contributor": "",
+            "description": "This release adds support for building and distributing container images within EC2 Image Builder."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Route 53",
+            "contributor": "",
+            "description": "This release adds support for DNSSEC signing in Amazon Route 53."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "This change fixes a bug in the code generation related to eventstreams that prevents multiple events to share the same shape."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Service Catalog",
+            "contributor": "",
+            "description": "Support TagOptions sharing with Service Catalog portfolio sharing."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "C6gn instances are powered by AWS Graviton2 processors and offer 100 Gbps networking bandwidth. These instances deliver up to 40% better price-performance benefit versus comparable x86-based instances"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Data Lifecycle Manager",
+            "contributor": "",
+            "description": "Provide Cross-account copy event based policy support in DataLifecycleManager (DLM)"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Queue Service",
+            "contributor": "",
+            "description": "Amazon SQS adds queue attributes to enable high throughput FIFO."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "contributor": "",
+            "description": "Added CreationDate and LastUpdatedDate timestamps to ListAliases API response"
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,47 @@
+# __2.15.49__ __2020-12-17__
+## __AWS Config__
+  - ### Features
+    - Adding PutExternalEvaluation API which grants permission to deliver evaluation result to AWS Config
+
+## __AWS Key Management Service__
+  - ### Features
+    - Added CreationDate and LastUpdatedDate timestamps to ListAliases API response
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+  - ### Bugfixes
+    - This change fixes a bug in the code generation related to eventstreams that prevents multiple events to share the same shape.
+
+## __AWS Service Catalog__
+  - ### Features
+    - Support TagOptions sharing with Service Catalog portfolio sharing.
+
+## __Amazon Data Lifecycle Manager__
+  - ### Features
+    - Provide Cross-account copy event based policy support in DataLifecycleManager (DLM)
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - C6gn instances are powered by AWS Graviton2 processors and offer 100 Gbps networking bandwidth. These instances deliver up to 40% better price-performance benefit versus comparable x86-based instances
+
+## __Amazon Route 53__
+  - ### Features
+    - This release adds support for DNSSEC signing in Amazon Route 53.
+
+## __Amazon Route 53 Resolver__
+  - ### Features
+    - Route 53 Resolver adds support for enabling resolver DNSSEC validation in virtual private cloud (VPC).
+
+## __Amazon Simple Queue Service__
+  - ### Features
+    - Amazon SQS adds queue attributes to enable high throughput FIFO.
+
+## __EC2 Image Builder__
+  - ### Features
+    - This release adds support for building and distributing container images within EC2 Image Builder.
+
 # __2.15.48__ __2020-12-16__
 ## __AWS Cost Explorer Service__
   - ### 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.15.48</version>
+      <version>2.15.49</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.15.48</version>
+  <version>2.15.49</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.15.48</version>
+  <version>2.15.49</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.15.48</version>
+  <version>2.15.49</version>
 </dependency>
 ```
 

archetypes/archetype-lambda/pom.xml

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

buildspecs/release-javadoc.yml

@@ -22,3 +22,5 @@ phases:
     - aws s3 sync $DOC_PATH/$RELEASE_VERSION/ $DOC_PATH/latest/ --acl=public-read --delete
     - jar cf aws-java-sdk-v2-docs.jar -C target/site/apidocs .
     - aws s3 cp aws-java-sdk-v2-docs.jar $DOC_PATH/ --acl="public-read"
+    - python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json  --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
+    - aws s3 cp ./scripts/crosslink_redirect.html $DOC_PATH/latest/ --acl="public-read"

bundle/pom.xml

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

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java

@@ -33,7 +33,9 @@ public static CodegenCustomizationProcessor getProcessorFor(
                 new ShapeModifiersProcessor(config.getShapeModifiers()),
                 new ShapeSubstitutionsProcessor(config.getShapeSubstitutions()),
                 new OperationModifiersProcessor(config.getOperationModifiers()),
-                new RemoveExceptionMessagePropertyProcessor()
+                new RemoveExceptionMessagePropertyProcessor(),
+                new UseLegacyEventGenerationSchemeProcessor(),
+                new NewAndLegacyEventStreamProcessor()
         );
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/NewAndLegacyEventStreamProcessor.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright 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.customization.processors;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+
+/**
+ * Services that have "legacy" streams, Kinesis and Transcribe Streaming builds should fail if there is a new
+ * evenstream added, that codegen doesn't know about. This is so we can decide if we want to generate the new stream in
+ * the legacy style so they look like the existing streams, or if we use the new style (e.g. because it won't work with
+ * the old style).
+ */
+public final class NewAndLegacyEventStreamProcessor implements CodegenCustomizationProcessor {
+    // Map from service ID -> list of event streams we know about and approve
+    private static final Map<String, Set<String>> APPROVED_EVENT_STREAMS;
+
+    static {
+        Map<String, Set<String>> approvedEventStreams = new HashMap<>();
+
+        approvedEventStreams.put("Kinesis", new HashSet<>(Arrays.asList("SubscribeToShardEventStream")));
+        approvedEventStreams.put("Transcribe Streaming",
+                new HashSet<>(Arrays.asList("AudioStream", "TranscriptResultStream", "MedicalTranscriptResultStream")));
+
+        APPROVED_EVENT_STREAMS = Collections.unmodifiableMap(approvedEventStreams);
+    }
+
+
+    @Override
+    public void preprocess(ServiceModel serviceModel) {
+        String serviceId = serviceModel.getMetadata().getServiceId();
+        if (!APPROVED_EVENT_STREAMS.containsKey(serviceId)) {
+            return;
+        }
+
+        Set<String> approvedStreams = APPROVED_EVENT_STREAMS.get(serviceId);
+
+        serviceModel.getShapes().entrySet().stream()
+                .filter(e -> e.getValue().isEventstream())
+                .forEach(e -> {
+                    String name = e.getKey();
+                    if (!approvedStreams.contains(name)) {
+                        throw unknownStreamError(serviceId, name);
+                    }
+                });
+    }
+
+    @Override
+    public void postprocess(IntermediateModel intermediateModel) {
+        // no-op
+    }
+
+    private static RuntimeException unknownStreamError(String serviceId, String evenstreamName) {
+        String msg = String.format("Encountered a new eventstream for service %s: %s. This service contains " +
+                "evenstreams that are code generated using an older style that requires a customization. Please " +
+                "contact the Java SDK maintainers for assistance.", serviceId, evenstreamName);
+
+        return new RuntimeException(msg);
+    }
+}