Skip to content

Commit b9e8da3

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1791 from aws/staging/29786892-ce38-458f-802a-8f19b39e6934
Pull request: release <- staging/29786892-ce38-458f-802a-8f19b39e6934
2 parents 821a0e0 + ce47a29 commit b9e8da3

File tree

367 files changed

+2186
-1061
lines changed

Some content is hidden

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

367 files changed

+2186
-1061
lines changed

‎.changes/2.17.67.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.17.67",
3+
"date": "2021-10-25",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Audit Manager",
8+
"contributor": "",
9+
"description": "This release introduces a new feature for Audit Manager: Custom framework sharing. You can now share your custom frameworks with another AWS account, or replicate them into another AWS Region under your own account."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Amazon Relational Database Service",
14+
"contributor": "",
15+
"description": "This release adds support for Amazon RDS Custom, which is a new RDS management type that gives you full access to your database and operating system. For more information, see https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-custom.html"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS SDK for Java v2",
20+
"contributor": "",
21+
"description": "Updated service endpoint metadata."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Route 53 Resolver",
26+
"contributor": "",
27+
"description": "New API for ResolverConfig, which allows autodefined rules for reverse DNS resolution to be disabled for a VPC"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Elastic Compute Cloud",
32+
"contributor": "",
33+
"description": "This release adds support to create a VPN Connection that is not attached to a Gateway at the time of creation. Use this to create VPNs associated with Core Networks, or modify your VPN and attach a gateway using the modify API after creation."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# __2.17.67__ __2021-10-25__
2+
## __AWS Audit Manager__
3+
- ### Features
4+
- This release introduces a new feature for Audit Manager: Custom framework sharing. You can now share your custom frameworks with another AWS account, or replicate them into another AWS Region under your own account.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated service endpoint metadata.
9+
10+
## __Amazon Elastic Compute Cloud__
11+
- ### Features
12+
- This release adds support to create a VPN Connection that is not attached to a Gateway at the time of creation. Use this to create VPNs associated with Core Networks, or modify your VPN and attach a gateway using the modify API after creation.
13+
14+
## __Amazon Relational Database Service__
15+
- ### Features
16+
- This release adds support for Amazon RDS Custom, which is a new RDS management type that gives you full access to your database and operating system. For more information, see https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-custom.html
17+
18+
## __Amazon Route 53 Resolver__
19+
- ### Features
20+
- New API for ResolverConfig, which allows autodefined rules for reverse DNS resolution to be disabled for a VPC
21+
122
# __2.17.66__ __2021-10-22__
223
## __AWS Audit Manager__
324
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
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.66</version>
55+
<version>2.17.67</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.66</version>
89+
<version>2.17.67</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.66</version>
94+
<version>2.17.67</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.66</version>
106+
<version>2.17.67</version>
107107
</dependency>
108108
```
109109

‎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.66</version>
23+
<version>2.17.67</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.66</version>
23+
<version>2.17.67</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.66</version>
23+
<version>2.17.67</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.66</version>
23+
<version>2.17.67</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.66</version>
20+
<version>2.17.67</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.66</version>
23+
<version>2.17.67</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.66</version>
20+
<version>2.17.67</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.66</version>
24+
<version>2.17.67</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.66</version>
25+
<version>2.17.67</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.66</version>
24+
<version>2.17.67</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.66</version>
25+
<version>2.17.67</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.66</version>
24+
<version>2.17.67</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.66</version>
23+
<version>2.17.67</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.66</version>
23+
<version>2.17.67</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.66</version>
25+
<version>2.17.67</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import software.amazon.awssdk.auth.credentials.CredentialUtils;
2424
import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
2525
import software.amazon.awssdk.auth.signer.S3SignerExecutionAttribute;
26-
import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsChunkedEncodingConfig;
27-
import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsChunkedEncodingInputStream;
26+
import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream;
2827
import software.amazon.awssdk.authcrt.signer.AwsCrtS3V4aSigner;
2928
import software.amazon.awssdk.authcrt.signer.internal.chunkedencoding.AwsS3V4aChunkSigner;
3029
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
30+
import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig;
3131
import software.amazon.awssdk.crt.auth.signing.AwsSigningConfig;
3232
import software.amazon.awssdk.http.ContentStreamProvider;
3333
import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -94,9 +94,9 @@ private void setHeaderContentLength(SdkHttpFullRequest.Builder mutableRequest) {
9494
long originalContentLength = calculateRequestContentLength(mutableRequest);
9595
mutableRequest.putHeader("x-amz-decoded-content-length", Long.toString(originalContentLength));
9696
mutableRequest.putHeader(CONTENT_LENGTH, Long.toString(
97-
AwsChunkedEncodingInputStream.calculateStreamContentLength(originalContentLength,
98-
AwsS3V4aChunkSigner.getSignatureLength(),
99-
AwsChunkedEncodingConfig.create())));
97+
AwsSignedChunkedEncodingInputStream.calculateStreamContentLength(originalContentLength,
98+
AwsS3V4aChunkSigner.getSignatureLength(),
99+
AwsChunkedEncodingConfig.create())));
100100
}
101101

102102
private SdkHttpFullRequest enablePayloadSigning(SdkSigningResult signingResult, AwsSigningConfig chunkConfig) {
@@ -105,11 +105,15 @@ private SdkHttpFullRequest enablePayloadSigning(SdkSigningResult signingResult,
105105
SdkHttpFullRequest.Builder mutableSignedRequest = signedRequest.toBuilder();
106106
ContentStreamProvider streamProvider = mutableSignedRequest.contentStreamProvider();
107107
AwsS3V4aChunkSigner chunkSigner = new AwsS3V4aChunkSigner(signerAdapter, chunkConfig);
108+
108109
mutableSignedRequest.contentStreamProvider(
109-
() -> new AwsChunkedEncodingInputStream(streamProvider.newStream(),
110-
new String(signature, StandardCharsets.UTF_8),
111-
chunkSigner,
112-
AwsChunkedEncodingConfig.create()));
110+
() -> AwsSignedChunkedEncodingInputStream.builder()
111+
.inputStream(streamProvider.newStream())
112+
.awsChunkSigner(chunkSigner)
113+
.headerSignature(new String(signature, StandardCharsets.UTF_8))
114+
.awsChunkedEncodingConfig(AwsChunkedEncodingConfig.create())
115+
.build());
116+
113117
return mutableSignedRequest.build();
114118
}
115119

‎core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/AwsCrtS3V4aSignerTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,11 @@
2424
import org.junit.Test;
2525
import org.junit.runner.RunWith;
2626
import org.mockito.runners.MockitoJUnitRunner;
27-
import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
28-
import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsChunkedEncodingInputStream;
29-
import software.amazon.awssdk.authcrt.signer.internal.DefaultAwsCrtV4aSigner;
27+
import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream;
3028
import software.amazon.awssdk.authcrt.signer.internal.SigningConfigProvider;
3129
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
32-
import software.amazon.awssdk.crt.auth.signing.AwsSigningConfig;
3330
import software.amazon.awssdk.http.SdkHttpFullRequest;
3431
import software.amazon.awssdk.regions.Region;
35-
import software.amazon.awssdk.regions.internal.util.RegionScope;
3632

3733
/**
3834
* Functional tests for the S3 specific Sigv4a signer. These tests call the CRT native signer code.
@@ -72,7 +68,7 @@ public void testS3ChunkedSigning() {
7268

7369
assertThat(signedRequest.firstMatchingHeader("Authorization")).isPresent();
7470
assertThat(signedRequest.contentStreamProvider()).isPresent();
75-
assertThat(signedRequest.contentStreamProvider().get().newStream()).isInstanceOf(AwsChunkedEncodingInputStream.class);
71+
assertThat(signedRequest.contentStreamProvider().get().newStream()).isInstanceOf(AwsSignedChunkedEncodingInputStream.class);
7672
}
7773

7874
@Test

0 commit comments

Comments
 (0)