Skip to content

Commit 49a1fe5

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #834 from aws/staging/90b75130-9cce-4f5c-acad-e391fa2f4e74
Pull request: release <- staging/90b75130-9cce-4f5c-acad-e391fa2f4e74
2 parents c1deb56 + 9c0e8f2 commit 49a1fe5

File tree

276 files changed

+522
-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.

276 files changed

+522
-314
lines changed

‎.changes/2.13.13.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": "2.13.13",
3+
"date": "2020-05-08",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon SageMaker Service",
8+
"description": "This release adds a new parameter (EnableInterContainerTrafficEncryption) to CreateProcessingJob API to allow for enabling inter-container traffic encryption on processing jobs."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS Resource Groups Tagging API",
13+
"description": "Documentation updates for resourcegroupstaggingapi"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "AWS SDK for Java v2",
18+
"description": "Updated service endpoint metadata."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "AWS SDK for Java v2",
23+
"description": "A helpful error message is now raised when an obviously-invalid region name is given to the SDK, instead of the previous NullPointerException. Fixes [#1642](https://github.com/aws/aws-sdk-java-v2/issues/1642)."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon GuardDuty",
28+
"description": "Documentation updates for GuardDuty"
29+
}
30+
]
31+
}

‎CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# __2.13.13__ __2020-05-08__
2+
## __AWS Resource Groups Tagging API__
3+
- ### Features
4+
- Documentation updates for resourcegroupstaggingapi
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- A helpful error message is now raised when an obviously-invalid region name is given to the SDK, instead of the previous NullPointerException. Fixes [#1642](https://github.com/aws/aws-sdk-java-v2/issues/1642).
9+
- Updated service endpoint metadata.
10+
11+
## __Amazon GuardDuty__
12+
- ### Features
13+
- Documentation updates for GuardDuty
14+
15+
## __Amazon SageMaker Service__
16+
- ### Features
17+
- This release adds a new parameter (EnableInterContainerTrafficEncryption) to CreateProcessingJob API to allow for enabling inter-container traffic encryption on processing jobs.
18+
119
# __2.13.12__ __2020-05-07__
220
## __AWS CodeBuild__
321
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
4949
<dependency>
5050
<groupId>software.amazon.awssdk</groupId>
5151
<artifactId>bom</artifactId>
52-
<version>2.13.12</version>
52+
<version>2.13.13</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
@@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
8383
<dependency>
8484
<groupId>software.amazon.awssdk</groupId>
8585
<artifactId>ec2</artifactId>
86-
<version>2.13.12</version>
86+
<version>2.13.13</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.13.12</version>
91+
<version>2.13.13</version>
9292
</dependency>
9393
```
9494

@@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
100100
<dependency>
101101
<groupId>software.amazon.awssdk</groupId>
102102
<artifactId>aws-sdk-java</artifactId>
103-
<version>2.13.12</version>
103+
<version>2.13.13</version>
104104
</dependency>
105105
```
106106

‎archetypes/archetype-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.13.12</version>
20+
<version>2.13.13</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.13.12</version>
20+
<version>2.13.13</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<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.13.12</version>
24+
<version>2.13.13</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
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.13.12</version>
25+
<version>2.13.13</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/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.13.12</version>
24+
<version>2.13.13</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎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.13.12</version>
25+
<version>2.13.13</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.13.12</version>
24+
<version>2.13.13</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
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth/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.13.12</version>
25+
<version>2.13.13</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/aws-core/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.13.12</version>
25+
<version>2.13.13</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/DefaultServiceEndpointBuilder.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
import java.net.URI;
1919
import java.net.URISyntaxException;
20+
import java.util.List;
2021
import software.amazon.awssdk.annotations.NotThreadSafe;
2122
import software.amazon.awssdk.annotations.SdkProtectedApi;
23+
import software.amazon.awssdk.core.exception.SdkClientException;
2224
import software.amazon.awssdk.profiles.ProfileFile;
2325
import software.amazon.awssdk.regions.Region;
2426
import software.amazon.awssdk.regions.ServiceMetadata;
@@ -66,10 +68,23 @@ public URI getServiceEndpoint() {
6668
ServiceMetadata serviceMetadata = ServiceMetadata.of(serviceName)
6769
.reconfigure(c -> c.profileFile(() -> profileFile)
6870
.profileName(profileName));
69-
return withProtocol(serviceMetadata.endpointFor(region));
71+
URI endpoint = addProtocolToServiceEndpoint(serviceMetadata.endpointFor(region));
72+
73+
if (endpoint.getHost() == null) {
74+
String error = "Configured region (" + region + ") resulted in an invalid URI: " + endpoint;
75+
76+
List<Region> exampleRegions = serviceMetadata.regions();
77+
if (!exampleRegions.isEmpty()) {
78+
error += " Valid region examples: " + exampleRegions;
79+
}
80+
81+
throw SdkClientException.create(error);
82+
}
83+
84+
return endpoint;
7085
}
7186

72-
private URI withProtocol(URI endpointWithoutProtocol) throws IllegalArgumentException {
87+
private URI addProtocolToServiceEndpoint(URI endpointWithoutProtocol) throws IllegalArgumentException {
7388
try {
7489
return new URI(protocol + "://" + endpointWithoutProtocol);
7590
} catch (URISyntaxException e) {

‎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.13.12</version>
24+
<version>2.13.13</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.13.12</version>
25+
<version>2.13.13</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
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.13.12</version>
23+
<version>2.13.13</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.13.12</version>
25+
<version>2.13.13</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadata.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,16 @@ private static String envVarSetting() {
100100
return SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.getStringValue().orElse(null);
101101
}
102102

103-
private String profileFileSetting(Supplier<ProfileFile> profileFileSupplier, Supplier<String> profileName) {
103+
private String profileFileSetting(Supplier<ProfileFile> profileFileSupplier, Supplier<String> profileNameSupplier) {
104104
try {
105-
return profileFileSupplier.get()
106-
.profile(profileName.get())
107-
.flatMap(p -> p.property(ProfileProperty.S3_US_EAST_1_REGIONAL_ENDPOINT))
108-
.orElse(null);
105+
ProfileFile profileFile = profileFileSupplier.get();
106+
String profileName = profileNameSupplier.get();
107+
if (profileFile == null || profileName == null) {
108+
return null;
109+
}
110+
return profileFile.profile(profileName)
111+
.flatMap(p -> p.property(ProfileProperty.S3_US_EAST_1_REGIONAL_ENDPOINT))
112+
.orElse(null);
109113
} catch (Exception t) {
110114
log.warn(() -> "Unable to load config file", t);
111115
return null;

‎core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,7 @@
740740
},
741741
"cloud9" : {
742742
"endpoints" : {
743+
"ap-east-1" : { },
743744
"ap-northeast-1" : { },
744745
"ap-northeast-2" : { },
745746
"ap-south-1" : { },
@@ -750,8 +751,12 @@
750751
"eu-north-1" : { },
751752
"eu-west-1" : { },
752753
"eu-west-2" : { },
754+
"eu-west-3" : { },
755+
"me-south-1" : { },
756+
"sa-east-1" : { },
753757
"us-east-1" : { },
754758
"us-east-2" : { },
759+
"us-west-1" : { },
755760
"us-west-2" : { }
756761
}
757762
},
@@ -5079,6 +5084,7 @@
50795084
},
50805085
"storagegateway" : {
50815086
"endpoints" : {
5087+
"af-south-1" : { },
50825088
"ap-east-1" : { },
50835089
"ap-northeast-1" : { },
50845090
"ap-northeast-2" : { },
@@ -5088,6 +5094,7 @@
50885094
"ca-central-1" : { },
50895095
"eu-central-1" : { },
50905096
"eu-north-1" : { },
5097+
"eu-south-1" : { },
50915098
"eu-west-1" : { },
50925099
"eu-west-2" : { },
50935100
"eu-west-3" : { },

0 commit comments

Comments
 (0)