Merge pull request #723 from aws/staging/6b422956-0a82-430b-920b-9bcbac422702

Pull request: release <- staging/6b422956-0a82-430b-920b-9bcbac422702

Author: aws-sdk-java-automation

.changes/2.10.55.json

@@ -0,0 +1,36 @@
+{
+    "version": "2.10.55",
+    "date": "2020-01-23",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "This SDK release introduces APIs that automate the export of Amazon RDS snapshot data to Amazon S3. The new APIs include: StartExportTask, CancelExportTask, DescribeExportTasks. These APIs automate the extraction of data from an RDS snapshot and export it to an Amazon S3 bucket. The data is stored in a compressed, consistent, and query-able format. After the data is exported, you can query it directly using tools such as Amazon Athena or Redshift Spectrum. You can also consume the data as part of a data lake solution. If you archive the data in S3 Infrequent Access or Glacier, you can reduce long term data storage costs by applying data lifecycle policies."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Added ServiceMetadata.servicePartitions() to get partition metadata for a specific service"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Identity and Access Management",
+            "description": "This release enables the Identity and Access Management policy simulator to simulate permissions boundary policies."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Support for non-blocking asynchronous calling of all mapper operations"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Improved error messages on UnknownHostExceptions"
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,22 @@
+# __2.10.55__ __2020-01-23__
+## __AWS Identity and Access Management__
+  - ### Features
+    - This release enables the Identity and Access Management policy simulator to simulate permissions boundary policies.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Added ServiceMetadata.servicePartitions() to get partition metadata for a specific service
+    - Improved error messages on UnknownHostExceptions
+    - Updated service endpoint metadata.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Support for non-blocking asynchronous calling of all mapper operations
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This SDK release introduces APIs that automate the export of Amazon RDS snapshot data to Amazon S3. The new APIs include: StartExportTask, CancelExportTask, DescribeExportTasks. These APIs automate the extraction of data from an RDS snapshot and export it to an Amazon S3 bucket. The data is stored in a compressed, consistent, and query-able format. After the data is exported, you can query it directly using tools such as Amazon Athena or Redshift Spectrum. You can also consume the data as part of a data lake solution. If you archive the data in S3 Infrequent Access or Glacier, you can reduce long term data storage costs by applying data lifecycle policies.
+
 # __2.10.54__ __2020-01-21__
 ## __AWS Application Discovery Service__
   - ### 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.54</version>
+      <version>2.10.55</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.54</version>
+  <version>2.10.55</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.10.54</version>
+  <version>2.10.55</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.54</version>
+  <version>2.10.55</version>
 </dependency>
 ```
 

aws-sdk-java/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.54</version>
+        <version>2.10.55</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.10.54</version>
+        <version>2.10.55</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.54</version>
+        <version>2.10.55</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.54</version>
+        <version>2.10.55</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.10.54</version>
+        <version>2.10.55</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java

@@ -94,11 +94,7 @@ public void generateServiceMetadata(Path baseSourcesDirectory, Partitions partit
         Set<String> services = new HashSet<>();
         partitions.getPartitions().forEach(p -> services.addAll(p.getServices().keySet()));
 
-        services.stream()
-                // Use hardcoded file for elasticache until the incorrect fips endpoint is fixed
-                //TODO Remove once elasticache endpoints are fixed at source
-                .filter(s -> !"elasticache".equals(s))
-                .forEach(s -> new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataGenerator(partitions,
+        services.forEach(s -> new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataGenerator(partitions,
                                                                                                           s,
                                                                                                           SERVICE_METADATA_BASE,
                                                                                                           REGION_BASE))

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.54</version>
+        <version>2.10.55</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataGenerator.java

@@ -50,16 +50,16 @@
 public class ServiceMetadataGenerator implements PoetClass {
 
     private final Partitions partitions;
-    private final String service;
+    private final String serviceEndpointPrefix;
     private final String basePackage;
     private final String regionBasePackage;
 
     public ServiceMetadataGenerator(Partitions partitions,
-                                    String service,
+                                    String serviceEndpointPrefix,
                                     String basePackage,
                                     String regionBasePackage) {
         this.partitions = partitions;
-        this.service = service;
+        this.serviceEndpointPrefix = serviceEndpointPrefix;
         this.basePackage = basePackage;
         this.regionBasePackage = regionBasePackage;
     }
@@ -68,6 +68,8 @@ public ServiceMetadataGenerator(Partitions partitions,
     public TypeSpec poetClass() {
         TypeName listOfRegions = ParameterizedTypeName.get(ClassName.get(List.class), ClassName.get(regionBasePackage, "Region"));
         TypeName mapOfStringString = ParameterizedTypeName.get(Map.class, String.class, String.class);
+        TypeName listOfServicePartitionMetadata =
+            ParameterizedTypeName.get(ClassName.get(List.class), ClassName.get(regionBasePackage, "ServicePartitionMetadata"));
 
         return TypeSpec.classBuilder(className())
                        .addModifiers(Modifier.PUBLIC)
@@ -79,7 +81,7 @@ public TypeSpec poetClass() {
                        .addSuperinterface(ClassName.get(regionBasePackage, "ServiceMetadata"))
                        .addField(FieldSpec.builder(String.class, "ENDPOINT_PREFIX")
                                           .addModifiers(PRIVATE, FINAL, STATIC)
-                                          .initializer("$S", service)
+                                          .initializer("$S", serviceEndpointPrefix)
                                           .build())
                        .addField(FieldSpec.builder(mapOfStringString, "PARTITION_OVERRIDDEN_ENDPOINTS")
                                           .addModifiers(PRIVATE, FINAL, STATIC)
@@ -97,15 +99,20 @@ public TypeSpec poetClass() {
                                           .addModifiers(PRIVATE, FINAL, STATIC)
                                           .initializer(signingRegionOverrides(partitions))
                                           .build())
+                       .addField(FieldSpec.builder(listOfServicePartitionMetadata, "PARTITIONS")
+                                          .addModifiers(PRIVATE, FINAL, STATIC)
+                                          .initializer(servicePartitions(partitions))
+                                          .build())
                        .addMethod(regions())
                        .addMethod(endpointFor())
                        .addMethod(signingRegion())
+                       .addMethod(partitions(listOfServicePartitionMetadata))
                        .build();
     }
 
     @Override
     public ClassName className() {
-        String sanitizedServiceName = service.replace(".", "-");
+        String sanitizedServiceName = serviceEndpointPrefix.replace(".", "-");
         return ClassName.get(basePackage, Stream.of(sanitizedServiceName.split("-"))
                                                 .map(Utils::capitalize)
                                                 .collect(Collectors.joining()) + "ServiceMetadata");
@@ -150,8 +157,8 @@ private CodeBlock regionsField(Partitions partitions) {
 
         partitions.getPartitions()
                   .stream()
-                  .filter(p -> p.getServices().containsKey(service))
-                  .forEach(p -> regions.addAll(p.getServices().get(service).getEndpoints().keySet()
+                  .filter(p -> p.getServices().containsKey(serviceEndpointPrefix))
+                  .forEach(p -> regions.addAll(p.getServices().get(serviceEndpointPrefix).getEndpoints().keySet()
                                                 .stream()
                                                 .filter(r -> RegionValidationUtil.validRegion(r, p.getRegionRegex()))
                                                 .collect(Collectors.toList())));
@@ -185,6 +192,39 @@ private CodeBlock signingRegionOverrides(Partitions partitions) {
         return builder.add(".build()").build();
     }
 
+    private CodeBlock servicePartitions(Partitions partitions) {
+        return CodeBlock.builder()
+                        .add("$T.unmodifiableList($T.asList(", Collections.class, Arrays.class)
+                        .add(commaSeparatedServicePartitions(partitions))
+                        .add("))")
+                        .build();
+    }
+
+    private CodeBlock commaSeparatedServicePartitions(Partitions partitions) {
+        ClassName defaultServicePartitionMetadata = ClassName.get(regionBasePackage + ".internal",
+                                                                  "DefaultServicePartitionMetadata");
+        return partitions.getPartitions()
+                  .stream()
+                  .filter(p -> p.getServices().containsKey(serviceEndpointPrefix))
+                  .map(p -> CodeBlock.of("new $T($S, $L)",
+                                         defaultServicePartitionMetadata,
+                                         p.getPartition(),
+                                         globalRegion(p)))
+                  .collect(CodeBlock.joining(","));
+    }
+
+    private CodeBlock globalRegion(Partition partition) {
+        ClassName region = ClassName.get(regionBasePackage, "Region");
+        Service service = partition.getServices().get(this.serviceEndpointPrefix);
+        boolean hasGlobalRegionForPartition = service.isRegionalized() != null &&
+                                              !service.isRegionalized() &&
+                                              service.isPartitionWideEndpointAvailable();
+        String globalRegionForPartition = hasGlobalRegionForPartition ? service.getPartitionEndpoint() : null;
+        return globalRegionForPartition == null
+                                    ? CodeBlock.of("null")
+                                    : CodeBlock.of("$T.of($S)", region, globalRegionForPartition);
+    }
+
     private MethodSpec regions() {
         TypeName listOfRegions = ParameterizedTypeName.get(ClassName.get(List.class),
                                                            ClassName.get(regionBasePackage, "Region"));
@@ -219,14 +259,23 @@ private MethodSpec signingRegion() {
                          .build();
     }
 
+    private MethodSpec partitions(TypeName listOfServicePartitionMetadata) {
+        return MethodSpec.methodBuilder("servicePartitions")
+                         .addModifiers(Modifier.PUBLIC)
+                         .addAnnotation(Override.class)
+                         .returns(listOfServicePartitionMetadata)
+                         .addStatement("return $L", "PARTITIONS")
+                         .build();
+    }
+
     private Map<Partition, Service> getServiceData(Partitions partitions) {
         Map<Partition, Service> serviceData = new TreeMap<>(Comparator.comparing(Partition::getPartition));
 
         partitions.getPartitions()
                   .forEach(p -> p.getServices()
                                  .entrySet()
                                  .stream()
-                                 .filter(s -> s.getKey().equalsIgnoreCase(service))
+                                 .filter(s -> s.getKey().equalsIgnoreCase(serviceEndpointPrefix))
                                  .forEach(s -> serviceData.put(p, s.getValue())));
 
         return serviceData;

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Service.java

@@ -45,7 +45,7 @@ public final class Service {
     /**
      * Returns true if the service is regionalized.
      */
-    private boolean isRegionalized;
+    private Boolean isRegionalized;
 
     public Service() {}
 
@@ -99,15 +99,15 @@ public void setPartitionEndpoint(String partitionEndpoint) {
     /**
      * returns true if the service is regionalized.
      */
-    public boolean isRegionalized() {
+    public Boolean isRegionalized() {
         return isRegionalized;
     }
 
     /**
      * sets the regionalized property for a service..
      */
     @JsonProperty(value = "isRegionalized")
-    public void setIsRegionalized(boolean regionalized) {
+    public void setIsRegionalized(Boolean regionalized) {
         isRegionalized = regionalized;
     }