Skip to content

Commit ead5531

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1704 from aws/staging/8d509537-d6d3-4fe7-bad0-8ad4778e3e96
Pull request: release <- staging/8d509537-d6d3-4fe7-bad0-8ad4778e3e96
2 parents 28f6561 + 2e5240a commit ead5531

File tree

372 files changed

+2717
-499
lines changed

Some content is hidden

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

372 files changed

+2717
-499
lines changed

‎.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,15 @@
670670
"contributions": [
671671
"doc"
672672
]
673+
},
674+
{
675+
"login": "guillepb10",
676+
"name": "guillepb10",
677+
"avatar_url": "https://avatars.githubusercontent.com/u/28654665?v=4",
678+
"profile": "https://github.com/guillepb10",
679+
"contributions": [
680+
"code"
681+
]
673682
}
674683
],
675684
"contributorsPerLine": 7,

‎.changes/2.17.43.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.17.43",
3+
"date": "2021-09-21",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "S3 Transfer Manager",
8+
"contributor": "",
9+
"description": "Fix the NPE thrown when calling `S3TransferManager.create()`"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS IoT",
14+
"contributor": "",
15+
"description": "This release adds support for verifying, viewing and filtering AWS IoT Device Defender detect violations with four verification states."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "DynamoDB Enhanced Client",
20+
"contributor": "",
21+
"description": "This commit introduces DynamoDbTable#deleteItemWithResponse() that allows customers to specify additional parameters on the request such as ReturnConsumedCapacity to get additional information the service response."
22+
},
23+
{
24+
"type": "bugfix",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "Update Sigv4a signer to include the port in the Host header, when the port does not match the standard port for the protocol. This allows requests to endpoints with non-standard ports to succeed."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Comprehend",
32+
"contributor": "",
33+
"description": "Amazon Comprehend now supports versioning of custom models, improved training with ONE_DOC_PER_FILE text documents for custom entity recognition, ability to provide specific test sets during training, and live migration to new model endpoints."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon EC2 Container Registry",
38+
"contributor": "",
39+
"description": "This release adds additional support for repository replication"
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Managed Streaming for Kafka",
44+
"contributor": "",
45+
"description": "Added StateInfo to ClusterInfo"
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Elastic Compute Cloud",
50+
"contributor": "",
51+
"description": "This update adds support for downloading configuration templates using new APIs (GetVpnConnectionDeviceTypes and GetVpnConnectionDeviceSampleConfiguration) and Internet Key Exchange version 2 (IKEv2) parameters for many popular CGW devices."
52+
}
53+
]
54+
}

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
# __2.17.43__ __2021-09-21__
2+
## __AWS IoT__
3+
- ### Features
4+
- This release adds support for verifying, viewing and filtering AWS IoT Device Defender detect violations with four verification states.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Bugfixes
8+
- Update Sigv4a signer to include the port in the Host header, when the port does not match the standard port for the protocol. This allows requests to endpoints with non-standard ports to succeed.
9+
10+
## __Amazon Comprehend__
11+
- ### Features
12+
- Amazon Comprehend now supports versioning of custom models, improved training with ONE_DOC_PER_FILE text documents for custom entity recognition, ability to provide specific test sets during training, and live migration to new model endpoints.
13+
14+
## __Amazon EC2 Container Registry__
15+
- ### Features
16+
- This release adds additional support for repository replication
17+
18+
## __Amazon Elastic Compute Cloud__
19+
- ### Features
20+
- This update adds support for downloading configuration templates using new APIs (GetVpnConnectionDeviceTypes and GetVpnConnectionDeviceSampleConfiguration) and Internet Key Exchange version 2 (IKEv2) parameters for many popular CGW devices.
21+
22+
## __DynamoDB Enhanced Client__
23+
- ### Features
24+
- This commit introduces DynamoDbTable#deleteItemWithResponse() that allows customers to specify additional parameters on the request such as ReturnConsumedCapacity to get additional information the service response.
25+
26+
## __Managed Streaming for Kafka__
27+
- ### Features
28+
- Added StateInfo to ClusterInfo
29+
30+
## __S3 Transfer Manager__
31+
- ### Bugfixes
32+
- Fix the NPE thrown when calling `S3TransferManager.create()`
33+
134
# __2.17.42__ __2021-09-17__
235
## __AWS Database Migration Service__
336
- ### Features

‎README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Gitter](https://badges.gitter.im/aws/aws-sdk-java-v2.svg)](https://gitter.im/aws/aws-sdk-java-v2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
55
[![codecov](https://codecov.io/gh/aws/aws-sdk-java-v2/branch/master/graph/badge.svg)](https://codecov.io/gh/aws/aws-sdk-java-v2)
66
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
7-
[![All Contributors](https://img.shields.io/badge/all_contributors-74-orange.svg?style=flat-square)](#contributors-)
7+
[![All Contributors](https://img.shields.io/badge/all_contributors-75-orange.svg?style=flat-square)](#contributors-)
88
<!-- ALL-CONTRIBUTORS-BADGE:END -->
99

1010
The **AWS SDK for Java 2.0** is a rewrite of 1.0 with some great new features. As with version 1.0,
@@ -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.42</version>
55+
<version>2.17.43</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.42</version>
89+
<version>2.17.43</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.42</version>
94+
<version>2.17.43</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.42</version>
106+
<version>2.17.43</version>
107107
</dependency>
108108
```
109109

@@ -276,6 +276,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
276276
<td align="center"><a href="https://github.com/Bennett-Lynch"><img src="https://avatars.githubusercontent.com/u/11811448?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bennett Lynch</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=Bennett-Lynch" title="Code">💻</a></td>
277277
<td align="center"><a href="https://bandism.net/"><img src="https://avatars.githubusercontent.com/u/22633385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ikko Ashimine</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=eltociear" title="Documentation">📖</a></td>
278278
<td align="center"><a href="https://jamieliu.me"><img src="https://avatars.githubusercontent.com/u/35614552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jamie Liu</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=jamieliu386" title="Documentation">📖</a></td>
279+
<td align="center"><a href="https://github.com/guillepb10"><img src="https://avatars.githubusercontent.com/u/28654665?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guillepb10</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=guillepb10" title="Code">💻</a></td>
279280
</tr>
280281
</table>
281282

‎archetypes/archetype-app-quickstart/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.17.42</version>
23+
<version>2.17.43</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.17.42</version>
23+
<version>2.17.43</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/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.17.42</version>
23+
<version>2.17.43</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.17.42</version>
23+
<version>2.17.43</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.17.42</version>
20+
<version>2.17.43</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.17.42</version>
23+
<version>2.17.43</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.17.42</version>
20+
<version>2.17.43</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.17.42</version>
24+
<version>2.17.43</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.17.42</version>
25+
<version>2.17.43</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.17.42</version>
24+
<version>2.17.43</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.17.42</version>
25+
<version>2.17.43</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.17.42</version>
24+
<version>2.17.43</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.17.42</version>
23+
<version>2.17.43</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.17.42</version>
23+
<version>2.17.43</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth-crt/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.17.42</version>
25+
<version>2.17.43</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

‎core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/AwsCrt4aSigningAdapter.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public SdkHttpFullRequest signRequest(SdkHttpFullRequest request, AwsSigningConf
4343
try {
4444
HttpRequest signedRequest = future.get();
4545
return requestConverter.crtRequestToHttp(request, signedRequest);
46+
} catch (InterruptedException e) {
47+
Thread.currentThread().interrupt();
48+
throw SdkClientException.create("The thread got interrupted while attempting to sign request: " + e.getMessage(), e);
4649
} catch (Exception e) {
47-
throw SdkClientException.builder()
48-
.message("Unable to sign request: " + e.getMessage())
49-
.cause(e)
50-
.build();
50+
throw SdkClientException.create("Unable to sign request: " + e.getMessage(), e);
5151
}
5252
}
5353

@@ -57,11 +57,11 @@ public SdkSigningResult sign(SdkHttpFullRequest request, AwsSigningConfig signin
5757
try {
5858
AwsSigningResult signingResult = future.get();
5959
return requestConverter.crtResultToAws(request, signingResult);
60+
} catch (InterruptedException e) {
61+
Thread.currentThread().interrupt();
62+
throw SdkClientException.create("The thread got interrupted while attempting to sign request: " + e.getMessage(), e);
6063
} catch (Exception e) {
61-
throw SdkClientException.builder()
62-
.message("Unable to sign request: " + e.getMessage())
63-
.cause(e)
64-
.build();
64+
throw SdkClientException.create("Unable to sign request: " + e.getMessage(), e);
6565
}
6666
}
6767

@@ -70,11 +70,11 @@ public byte[] signChunk(byte[] chunkBody, byte[] previousSignature, AwsSigningCo
7070
CompletableFuture<byte[]> future = AwsSigner.signChunk(crtBody, previousSignature, signingConfig);
7171
try {
7272
return future.get();
73+
} catch (InterruptedException e) {
74+
Thread.currentThread().interrupt();
75+
throw SdkClientException.create("The thread got interrupted while attempting to sign request: " + e.getMessage(), e);
7376
} catch (Exception e) {
74-
throw SdkClientException.builder()
75-
.message("Unable to sign chunk: " + e.getMessage())
76-
.cause(e)
77-
.build();
77+
throw SdkClientException.create("Unable to sign request: " + e.getMessage(), e);
7878
}
7979
}
8080

‎core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/SigningUtils.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
package software.amazon.awssdk.authcrt.signer.internal;
1717

18-
import static software.amazon.awssdk.utils.CollectionUtils.isNullOrEmpty;
19-
2018
import java.nio.charset.StandardCharsets;
2119
import java.time.Clock;
2220
import java.time.Duration;
@@ -35,6 +33,7 @@
3533
import software.amazon.awssdk.crt.auth.credentials.Credentials;
3634
import software.amazon.awssdk.http.SdkHttpFullRequest;
3735
import software.amazon.awssdk.utils.StringUtils;
36+
import software.amazon.awssdk.utils.http.SdkHttpUtils;
3837

3938
@SdkInternalApi
4039
public class SigningUtils {
@@ -116,19 +115,19 @@ public static SdkHttpFullRequest sanitizeSdkRequestForCrtSigning(SdkHttpFullRequ
116115

117116
builder.clearHeaders();
118117

119-
// Add host if missing
120-
Map<String, List<String>> headers = request.headers();
121-
if (isNullOrEmpty(headers.get(HOST_HEADER))) {
122-
builder.putHeader(HOST_HEADER, request.host());
123-
}
124-
125118
// Filter headers that will cause signing to fail
126-
for (Map.Entry<String, List<String>> header: headers.entrySet()) {
119+
for (Map.Entry<String, List<String>> header: request.headers().entrySet()) {
127120
if (!FORBIDDEN_HEADERS.contains(header.getKey())) {
128121
builder.putHeader(header.getKey(), header.getValue());
129122
}
130123
}
131124

125+
// Add host, which must be signed. We ignore any pre-existing Host header to match the behavior of the SigV4 signer.
126+
String hostHeader = SdkHttpUtils.isUsingStandardPort(request.protocol(), request.port())
127+
? request.host()
128+
: request.host() + ":" + request.port();
129+
builder.putHeader(HOST_HEADER, hostHeader);
130+
132131
builder.clearQueryParameters();
133132

134133
// Filter query parameters that will cause signing to fail

0 commit comments

Comments
 (0)