Skip to content

Commit 020ce02

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #443 from aws/staging/76861d78-bfb9-40b1-a37d-90008e411411
Pull request: release <- staging/76861d78-bfb9-40b1-a37d-90008e411411
2 parents 11ddc00 + ceccf25 commit 020ce02

File tree

219 files changed

+461
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+461
-314
lines changed

‎.changes/2.5.4.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"date": "2019-03-06",
3+
"version": "2.5.4",
4+
"entries": [
5+
{
6+
"category": "AWS Direct Connect",
7+
"type": "feature",
8+
"description": "Exposed a new available port speeds field in the DescribeLocation api call."
9+
},
10+
{
11+
"category": "Amazon Elastic File System",
12+
"type": "feature",
13+
"description": "Documentation updates for elasticfilesystem adding new examples for EFS Lifecycle Management feature."
14+
},
15+
{
16+
"category": "Amazon Elastic Compute Cloud",
17+
"type": "feature",
18+
"description": "This release adds pagination support for ec2.DescribeVpcs, ec2.DescribeInternetGateways and ec2.DescribeNetworkAcls APIs"
19+
},
20+
{
21+
"category": "AWS SDK for Java v2",
22+
"type": "bugfix",
23+
"description": "Fix the generated ServiceMetadata classes for services that have PARTITION_OVERRIDDEN_ENDPOINTS"
24+
}
25+
]
26+
}

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# __2.5.4__ __2019-03-06__
2+
## __AWS Direct Connect__
3+
- ### Features
4+
- Exposed a new available port speeds field in the DescribeLocation api call.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Bugfixes
8+
- Fix the generated ServiceMetadata classes for services that have PARTITION_OVERRIDDEN_ENDPOINTS
9+
10+
## __Amazon Elastic Compute Cloud__
11+
- ### Features
12+
- This release adds pagination support for ec2.DescribeVpcs, ec2.DescribeInternetGateways and ec2.DescribeNetworkAcls APIs
13+
14+
## __Amazon Elastic File System__
15+
- ### Features
16+
- Documentation updates for elasticfilesystem adding new examples for EFS Lifecycle Management feature.
17+
118
# __2.5.3__ __2019-03-05__
219
## __AWS CodeDeploy__
320
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You can import the whole SDK into your project (includes all services) as follow
4444
<dependency>
4545
<groupId>software.amazon.awssdk</groupId>
4646
<artifactId>aws-sdk-java</artifactId>
47-
<version>2.5.3</version>
47+
<version>2.5.4</version>
4848
</dependency>
4949
```
5050

@@ -56,12 +56,12 @@ Alternatively you can add dependencies for the specific services you use only:
5656
<dependency>
5757
<groupId>software.amazon.awssdk</groupId>
5858
<artifactId>ec2</artifactId>
59-
<version>2.5.3</version>
59+
<version>2.5.4</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.amazon.awssdk</groupId>
6363
<artifactId>s3</artifactId>
64-
<version>2.5.3</version>
64+
<version>2.5.4</version>
6565
</dependency>
6666
```
6767

@@ -75,7 +75,7 @@ To automatically manage module versions (currently all modules have the same ver
7575
<dependency>
7676
<groupId>software.amazon.awssdk</groupId>
7777
<artifactId>bom</artifactId>
78-
<version>2.5.3</version>
78+
<version>2.5.4</version>
7979
<type>pom</type>
8080
<scope>import</scope>
8181
</dependency>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.3</version>
7+
<version>2.5.4</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.3</version>
7+
<version>2.5.4</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.3</version>
24+
<version>2.5.4</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.5.3</version>
10+
<version>2.5.4</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.5.3</version>
9+
<version>2.5.4</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<name>AWS Java SDK :: Code Generator Lite</name>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ private CodeBlock partitionEndpoints(Partitions partitions) {
116116

117117
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, String>builder()", ImmutableMap.class);
118118

119-
services.entrySet().forEach(e -> {
120-
if (e.getValue().getDefaults() != null && e.getValue().getDefaults().getHostname() != null) {
121-
builder.add(".put($S, $S)", e.getKey(), e.getValue().getDefaults().getHostname());
119+
services.forEach((key, value) -> {
120+
if (value.getDefaults() != null && value.getDefaults().getHostname() != null) {
121+
builder.add(".put($S, $S)", key.getPartition(), value.getDefaults().getHostname());
122122
}
123123
});
124124

‎codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ public void serviceMetadataClass() {
7777
assertThat(serviceMetadataGenerator, generatesTo("s3-service-metadata.java"));
7878
}
7979

80+
@Test
81+
public void serviceWithOverriddenPartitionsMetadataClass() {
82+
ServiceMetadataGenerator serviceMetadataGenerator = new ServiceMetadataGenerator(partitions,
83+
"sts",
84+
SERVICE_METADATA_BASE,
85+
REGION_BASE);
86+
87+
assertThat(serviceMetadataGenerator, generatesTo("sts-service-metadata.java"));
88+
}
89+
8090
@Test
8191
public void serviceMetadataProviderClass() {
8292
ServiceMetadataProviderGenerator serviceMetadataProviderGenerator = new ServiceMetadataProviderGenerator(partitions,

‎codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/sts-service-metadata.java

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.regions.servicemetadata;
17+
18+
import java.net.URI;
19+
import java.util.Arrays;
20+
import java.util.Collections;
21+
import java.util.List;
22+
import java.util.Map;
23+
import software.amazon.awssdk.annotations.Generated;
24+
import software.amazon.awssdk.annotations.SdkPublicApi;
25+
import software.amazon.awssdk.regions.Region;
26+
import software.amazon.awssdk.regions.ServiceMetadata;
27+
import software.amazon.awssdk.utils.ImmutableMap;
28+
29+
@Generated("software.amazon.awssdk:codegen")
30+
@SdkPublicApi
31+
public final class StsServiceMetadata implements ServiceMetadata {
32+
private static final String ENDPOINT_PREFIX = "sts";
33+
34+
private static final Map<String, String> PARTITION_OVERRIDDEN_ENDPOINTS = ImmutableMap.<String, String> builder()
35+
.put("aws", "sts.amazonaws.com").build();
36+
37+
private static final Map<String, String> REGION_OVERRIDDEN_ENDPOINTS = ImmutableMap.<String, String> builder()
38+
.put("ap-northeast-2", "sts.ap-northeast-2.amazonaws.com").put("us-east-1-fips", "sts-fips.us-east-1.amazonaws.com")
39+
.put("us-east-2-fips", "sts-fips.us-east-2.amazonaws.com").put("us-west-1-fips", "sts-fips.us-west-1.amazonaws.com")
40+
.put("us-west-2-fips", "sts-fips.us-west-2.amazonaws.com").build();
41+
42+
private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(Region.of("ap-northeast-1"),
43+
Region.of("ap-northeast-2"), Region.of("ap-northeast-3"), Region.of("ap-south-1"), Region.of("ap-southeast-1"),
44+
Region.of("ap-southeast-2"), Region.of("aws-global"), Region.of("ca-central-1"), Region.of("eu-central-1"),
45+
Region.of("eu-west-1"), Region.of("eu-west-2"), Region.of("eu-west-3"), Region.of("sa-east-1"),
46+
Region.of("us-east-1"), Region.of("us-east-1-fips"), Region.of("us-east-2"), Region.of("us-east-2-fips"),
47+
Region.of("us-west-1"), Region.of("us-west-1-fips"), Region.of("us-west-2"), Region.of("us-west-2-fips"),
48+
Region.of("cn-north-1"), Region.of("cn-northwest-1"), Region.of("us-gov-west-1")));
49+
50+
private static final Map<String, String> SIGNING_REGION_OVERRIDES = ImmutableMap.<String, String> builder()
51+
.put("ap-northeast-2", "ap-northeast-2").put("us-east-1-fips", "us-east-1").put("us-east-2-fips", "us-east-2")
52+
.put("us-west-1-fips", "us-west-1").put("us-west-2-fips", "us-west-2").build();
53+
54+
@Override
55+
public List<Region> regions() {
56+
return REGIONS;
57+
}
58+
59+
@Override
60+
public URI endpointFor(Region region) {
61+
return URI.create(REGION_OVERRIDDEN_ENDPOINTS.containsKey(region.id()) ? REGION_OVERRIDDEN_ENDPOINTS.get(region.id())
62+
: computeEndpoint(ENDPOINT_PREFIX, PARTITION_OVERRIDDEN_ENDPOINTS, region));
63+
}
64+
65+
@Override
66+
public Region signingRegion(Region region) {
67+
return Region.of(SIGNING_REGION_OVERRIDES.getOrDefault(region.id(), region.id()));
68+
}
69+
}

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.5.3</version>
25+
<version>2.5.4</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.3</version>
24+
<version>2.5.4</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.3</version>
10+
<version>2.5.4</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.3</version>
10+
<version>2.5.4</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.3</version>
24+
<version>2.5.4</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.5.3</version>
25+
<version>2.5.4</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.3</version>
8+
<version>2.5.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/regions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.5.3</version>
25+
<version>2.5.4</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/sdk-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>core</artifactId>
24-
<version>2.5.3</version>
24+
<version>2.5.4</version>
2525
</parent>
2626
<artifactId>sdk-core</artifactId>
2727
<name>AWS Java SDK :: SDK Core</name>

‎http-client-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>aws-sdk-java-pom</artifactId>
2424
<groupId>software.amazon.awssdk</groupId>
25-
<version>2.5.3</version>
25+
<version>2.5.4</version>
2626
</parent>
2727
<artifactId>http-client-spi</artifactId>
2828
<name>AWS Java SDK :: HTTP Client Interface</name>

‎http-clients/apache-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>http-clients</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.3</version>
24+
<version>2.5.4</version>
2525
</parent>
2626

2727
<artifactId>apache-client</artifactId>

0 commit comments

Comments
 (0)