Skip to content

Commit c6ce76e

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1599 from aws/staging/6508ea7b-f4f8-44bf-afa3-97368d4d1fb0
Pull request: release <- staging/6508ea7b-f4f8-44bf-afa3-97368d4d1fb0
2 parents ec957b3 + e15ea61 commit c6ce76e

File tree

422 files changed

+8095
-487
lines changed

Some content is hidden

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

422 files changed

+8095
-487
lines changed

‎.changes/2.17.16.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "2.17.16",
3+
"date": "2021-08-10",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "Updated service endpoint metadata."
10+
},
11+
{
12+
"type": "bugfix",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Fix issue in `FileAsyncRequestBody` where the underlying file channel would only be closed when enough requests are sent to read *past* the end of the file; if just enough requests are sent to read to the end of the file, the file is not closed, leaving an open file descriptor around longer than it needs to be."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Chime",
20+
"contributor": "",
21+
"description": "Add support for \"auto\" in Region field of StartMeetingTranscription API request."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon S3 Transfer Manager [Preview]",
26+
"contributor": "",
27+
"description": "This release includes the preview release of the Amazon S3 Transfer Manager. Visit our [Developer Guide](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/transfer-manager.html) for more information."
28+
}
29+
]
30+
}

‎CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# __2.17.16__ __2021-08-10__
2+
## __AWS SDK for Java v2__
3+
- ### Features
4+
- Updated service endpoint metadata.
5+
6+
- ### Bugfixes
7+
- Fix issue in `FileAsyncRequestBody` where the underlying file channel would only be closed when enough requests are sent to read *past* the end of the file; if just enough requests are sent to read to the end of the file, the file is not closed, leaving an open file descriptor around longer than it needs to be.
8+
9+
## __Amazon Chime__
10+
- ### Features
11+
- Add support for "auto" in Region field of StartMeetingTranscription API request.
12+
13+
## __Amazon S3 Transfer Manager [Preview]__
14+
- ### Features
15+
- This release includes the preview release of the Amazon S3 Transfer Manager. Visit our [Developer Guide](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/transfer-manager.html) for more information.
16+
117
# __2.17.15__ __2021-08-09__
218
## __AWS WAFV2__
319
- ### Features

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.17.15</version>
55+
<version>2.17.16</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.17.15</version>
89+
<version>2.17.16</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.15</version>
94+
<version>2.17.16</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.17.15</version>
106+
<version>2.17.16</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

+1-1
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.17.15</version>
20+
<version>2.17.16</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

+1-1
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.17.15</version>
20+
<version>2.17.16</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎buildspecs/release-to-maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ phases:
2626
if ! curl -f --head $SONATYPE_URL; then
2727
mkdir -p $CREDENTIALS
2828
aws s3 cp s3://aws-java-sdk-release-credentials/ $CREDENTIALS/ --recursive
29-
mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-sts-testing -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
29+
mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-sts-testing,!:s3-benchmarks -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
3030
else
3131
echo "This version was already released."
3232
fi

‎bundle/pom.xml

+1-1
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.17.15</version>
24+
<version>2.17.16</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

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

+1-1
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.17.15</version>
25+
<version>2.17.16</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

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

‎codegen-maven-plugin/pom.xml

+1-1
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.17.15</version>
25+
<version>2.17.16</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

+1-1
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.17.15</version>
24+
<version>2.17.16</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth/pom.xml

+1-1
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.17.15</version>
25+
<version>2.17.16</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import software.amazon.awssdk.core.SdkSystemSetting;
2525
import software.amazon.awssdk.core.exception.SdkClientException;
2626
import software.amazon.awssdk.core.exception.SdkServiceException;
27-
import software.amazon.awssdk.core.internal.util.UserAgentUtils;
27+
import software.amazon.awssdk.core.util.SdkUserAgent;
2828
import software.amazon.awssdk.regions.util.HttpResourcesUtils;
2929
import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
3030
import software.amazon.awssdk.utils.ToString;
@@ -160,7 +160,7 @@ public URI endpoint() throws IOException {
160160
@Override
161161
public Map<String, String> headers() {
162162
Map<String, String> requestHeaders = new HashMap<>();
163-
requestHeaders.put("User-Agent", UserAgentUtils.getUserAgent());
163+
requestHeaders.put("User-Agent", SdkUserAgent.create().userAgent());
164164
requestHeaders.put("Accept", "*/*");
165165
requestHeaders.put("Connection", "keep-alive");
166166

@@ -195,7 +195,7 @@ public URI endpoint() {
195195
@Override
196196
public Map<String, String> headers() {
197197
Map<String, String> requestHeaders = new HashMap<>();
198-
requestHeaders.put("User-Agent", UserAgentUtils.getUserAgent());
198+
requestHeaders.put("User-Agent", SdkUserAgent.create().userAgent());
199199
requestHeaders.put("Accept", "*/*");
200200
requestHeaders.put("Connection", "keep-alive");
201201
requestHeaders.put(EC2_METADATA_TOKEN_TTL_HEADER, DEFAULT_TOKEN_TTL);

‎core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.junit.ClassRule;
3434
import org.junit.Test;
3535
import software.amazon.awssdk.core.exception.SdkClientException;
36-
import software.amazon.awssdk.core.internal.util.UserAgentUtils;
36+
import software.amazon.awssdk.core.util.SdkUserAgent;
3737
import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
3838
import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
3939

@@ -122,7 +122,7 @@ private void stubForCorruptedSuccessResponse() {
122122

123123
private void stubFor200Response(String body) {
124124
stubFor(get(urlPathEqualTo(CREDENTIALS_PATH))
125-
.withHeader("User-Agent", equalTo(UserAgentUtils.getUserAgent()))
125+
.withHeader("User-Agent", equalTo(SdkUserAgent.create().userAgent()))
126126
.willReturn(aResponse()
127127
.withStatus(200)
128128
.withHeader("Content-Type", "application/json")

‎core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.junit.ClassRule;
3636
import org.junit.Test;
3737
import software.amazon.awssdk.core.exception.SdkClientException;
38-
import software.amazon.awssdk.core.internal.util.UserAgentUtils;
38+
import software.amazon.awssdk.core.util.SdkUserAgent;
3939
import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
4040
import software.amazon.awssdk.utils.DateUtils;
4141
import software.amazon.awssdk.utils.IoUtils;
@@ -132,7 +132,7 @@ public void basicCachingFunctionalityWorks() {
132132
private void stubForSuccessResponseWithCustomBody(String body) {
133133
stubFor(
134134
get(urlPathEqualTo(CREDENTIALS_PATH))
135-
.withHeader("User-Agent", equalTo(UserAgentUtils.getUserAgent()))
135+
.withHeader("User-Agent", equalTo(SdkUserAgent.create().userAgent()))
136136
.willReturn(aResponse()
137137
.withStatus(200)
138138
.withHeader("Content-Type", "application/json")

‎core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,11 @@
2323
import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
2424
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
2525
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
26-
import static org.assertj.core.api.Assertions.assertThat;
27-
import static org.hamcrest.Matchers.instanceOf;
2826
import com.github.tomakehurst.wiremock.WireMockServer;
2927
import com.github.tomakehurst.wiremock.client.WireMock;
3028
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
3129
import com.github.tomakehurst.wiremock.junit.WireMockRule;
3230
import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
33-
import java.net.SocketTimeoutException;
3431
import java.time.Duration;
3532
import java.time.Instant;
3633
import org.junit.AfterClass;
@@ -40,8 +37,7 @@
4037
import org.junit.rules.ExpectedException;
4138
import software.amazon.awssdk.core.SdkSystemSetting;
4239
import software.amazon.awssdk.core.exception.SdkClientException;
43-
import software.amazon.awssdk.core.internal.util.UserAgentUtils;
44-
import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
40+
import software.amazon.awssdk.core.util.SdkUserAgent;
4541
import software.amazon.awssdk.utils.DateUtils;
4642

4743
public class InstanceProfileCredentialsProviderTest {
@@ -94,7 +90,7 @@ public void resolveCredentials_requestsIncludeUserAgent() {
9490
provider.resolveCredentials();
9591

9692
String userAgentHeader = "User-Agent";
97-
String userAgent = UserAgentUtils.getUserAgent();
93+
String userAgent = SdkUserAgent.create().userAgent();
9894
WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(userAgentHeader, equalTo(userAgent)));
9995
WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).withHeader(userAgentHeader, equalTo(userAgent)));
10096
WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).withHeader(userAgentHeader, equalTo(userAgent)));
@@ -235,7 +231,7 @@ public void resolveCredentials_customProfileFileAndName_usesCorrectEndpoint() {
235231
provider.resolveCredentials();
236232

237233
String userAgentHeader = "User-Agent";
238-
String userAgent = UserAgentUtils.getUserAgent();
234+
String userAgent = SdkUserAgent.create().userAgent();
239235
mockMetadataEndpoint_2.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(userAgentHeader, equalTo(userAgent)));
240236
mockMetadataEndpoint_2.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).withHeader(userAgentHeader, equalTo(userAgent)));
241237
mockMetadataEndpoint_2.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).withHeader(userAgentHeader, equalTo(userAgent)));

‎core/aws-core/pom.xml

+1-1
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.17.15</version>
25+
<version>2.17.16</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/json-utils/pom.xml

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/metrics-spi/pom.xml

+1-1
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.17.15</version>
8+
<version>2.17.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/pom.xml

+1-1
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.17.15</version>
24+
<version>2.17.16</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

+1-1
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.17.15</version>
25+
<version>2.17.16</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

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

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

+1-1
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.17.15</version>
23+
<version>2.17.16</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)