Skip to content

Commit ca81dba

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2222 from aws/staging/68675c51-0991-4415-905c-f0dd8f72d583
Pull request: release <- staging/68675c51-0991-4415-905c-f0dd8f72d583
2 parents 4aa623c + 9c6cc2d commit ca81dba

File tree

397 files changed

+1796
-922
lines changed

Some content is hidden

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

397 files changed

+1796
-922
lines changed

‎.brazil.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"software.amazon:flow": { "packageName": "AwsFlowJava", "packageVersion": "1.0" },
121121
"org.junit.jupiter:junit-jupiter": { "packageName": "JUnit5", "packageVersion": "5.x" },
122122
"org.mockito:mockito-core": { "packageName": "Mockito", "packageVersion": "3.x" },
123-
"io.reactivex.rxjava3:rxjava": { "packageName": "RxJava", ",packageVersion": "3.x" },
124-
"org.assertj:assertj-core": { "packageName": "AssertJ", ",packageVersion": "3.22.x" }
123+
"io.reactivex.rxjava3:rxjava": { "packageName": "RxJava", "packageVersion": "3.x" },
124+
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" }
125125
}
126126
}

‎.changes/2.18.4.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.18.4",
3+
"date": "2022-10-26",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "HttpChecksumResolver.getResolvedChecksumSpecs() first attempts retrieval of checksum from ExecutionAttributes before resolving it"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Identity and Access Management",
14+
"contributor": "",
15+
"description": "Doc only update that corrects instances of CLI not using an entity."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS SDK for Java v2",
20+
"contributor": "L-Applin",
21+
"description": "Update EnhancedAttributeValue to accept Collection"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Neptune",
26+
"contributor": "",
27+
"description": "Added a new cluster-level attribute to set the capacity range for Neptune Serverless instances."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon SageMaker Service",
32+
"contributor": "",
33+
"description": "Amazon SageMaker Automatic Model Tuning now supports specifying Grid Search strategy for tuning jobs, which evaluates all hyperparameter combinations exhaustively based on the categorical hyperparameters provided."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Managed Streaming for Kafka",
38+
"contributor": "",
39+
"description": "This release adds support for Tiered Storage. UpdateStorage allows you to control the Storage Mode for supported storage tiers."
40+
}
41+
]
42+
}

‎CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
# __2.18.4__ __2022-10-26__
2+
## __AWS Identity and Access Management__
3+
- ### Features
4+
- Doc only update that corrects instances of CLI not using an entity.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Update EnhancedAttributeValue to accept Collection
9+
- Contributed by: [@L-Applin](https://github.com/L-Applin)
10+
11+
- ### Bugfixes
12+
- HttpChecksumResolver.getResolvedChecksumSpecs() first attempts retrieval of checksum from ExecutionAttributes before resolving it
13+
14+
## __Amazon Neptune__
15+
- ### Features
16+
- Added a new cluster-level attribute to set the capacity range for Neptune Serverless instances.
17+
18+
## __Amazon SageMaker Service__
19+
- ### Features
20+
- Amazon SageMaker Automatic Model Tuning now supports specifying Grid Search strategy for tuning jobs, which evaluates all hyperparameter combinations exhaustively based on the categorical hyperparameters provided.
21+
22+
## __Managed Streaming for Kafka__
23+
- ### Features
24+
- This release adds support for Tiered Storage. UpdateStorage allows you to control the Storage Mode for supported storage tiers.
25+
26+
## __Contributors__
27+
Special thanks to the following contributors to this release:
28+
29+
[@L-Applin](https://github.com/L-Applin)
130
# __2.18.3__ __2022-10-25__
231
## __AWS MediaTailor__
332
- ### 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.18.3</version>
55+
<version>2.18.4</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.18.3</version>
89+
<version>2.18.4</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.18.3</version>
94+
<version>2.18.4</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.18.3</version>
106+
<version>2.18.4</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.18.3</version>
23+
<version>2.18.4</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.18.3</version>
23+
<version>2.18.4</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.18.3</version>
23+
<version>2.18.4</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.18.3</version>
23+
<version>2.18.4</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.18.3</version>
20+
<version>2.18.4</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.18.3</version>
23+
<version>2.18.4</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.18.3</version>
20+
<version>2.18.4</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

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

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

2828
<artifactId>auth-crt</artifactId>

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

2828
<artifactId>auth</artifactId>

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

2828
<artifactId>aws-core</artifactId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsExecutionContextBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private AwsExecutionContextBuilder() {
9999
.putAttribute(SdkExecutionAttribute.SIGNER_OVERRIDDEN, clientConfig.option(SdkClientOption.SIGNER_OVERRIDDEN))
100100
.putAttribute(AwsExecutionAttribute.USE_GLOBAL_ENDPOINT,
101101
clientConfig.option(AwsClientOption.USE_GLOBAL_ENDPOINT))
102-
.putAttribute(RESOLVED_CHECKSUM_SPECS, HttpChecksumResolver.getResolvedChecksumSpecs(executionAttributes));
102+
.putAttribute(RESOLVED_CHECKSUM_SPECS, HttpChecksumResolver.resolveChecksumSpecs(executionAttributes));
103103

104104
ExecutionInterceptorChain executionInterceptorChain =
105105
new ExecutionInterceptorChain(clientConfig.option(SdkClientOption.EXECUTION_INTERCEPTORS));

‎core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/AwsExecutionContextBuilderTest.java

+61-3
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,22 @@
3131
import org.mockito.Mock;
3232
import org.mockito.junit.MockitoJUnitRunner;
3333
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
34-
import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
3534
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3635
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
37-
import software.amazon.awssdk.awscore.internal.AwsExecutionContextBuilder;
3836
import software.amazon.awssdk.core.SdkRequest;
3937
import software.amazon.awssdk.core.SdkResponse;
38+
import software.amazon.awssdk.core.checksums.ChecksumSpecs;
4039
import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
4140
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
4241
import software.amazon.awssdk.core.client.config.SdkClientOption;
4342
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
4443
import software.amazon.awssdk.core.http.ExecutionContext;
45-
import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
4644
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
4745
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
4846
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
47+
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
48+
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
49+
import software.amazon.awssdk.core.internal.util.HttpChecksumUtils;
4950
import software.amazon.awssdk.core.signer.Signer;
5051

5152
@RunWith(MockitoJUnitRunner.class)
@@ -120,6 +121,63 @@ public void signing_ifClientOverride_assignClientOverrideSigner() {
120121

121122
assertThat(executionContext.signer()).isEqualTo(clientOverrideSigner);
122123
}
124+
125+
@Test
126+
public void invokeInterceptorsAndCreateExecutionContext_noHttpChecksumTrait_resolvesChecksumSpecs() {
127+
ExecutionContext executionContext =
128+
AwsExecutionContextBuilder.invokeInterceptorsAndCreateExecutionContext(clientExecutionParams(),
129+
testClientConfiguration().build());
130+
131+
ExecutionAttributes executionAttributes = executionContext.executionAttributes();
132+
Optional<ChecksumSpecs> checksumSpecs1 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes);
133+
Optional<ChecksumSpecs> checksumSpecs2 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes);
134+
135+
assertThat(checksumSpecs1).isNotPresent();
136+
assertThat(checksumSpecs2).isNotPresent();
137+
assertThat(checksumSpecs1).isSameAs(checksumSpecs2);
138+
}
139+
140+
@Test
141+
public void invokeInterceptorsAndCreateExecutionContext_singleExecutionContext_resolvesChecksumSpecsOnce() {
142+
HttpChecksum httpCrc32Checksum =
143+
HttpChecksum.builder().requestAlgorithm("crc32").isRequestStreaming(true).build();
144+
ClientExecutionParams<SdkRequest, SdkResponse> executionParams = clientExecutionParams()
145+
.putExecutionAttribute(SdkInternalExecutionAttribute.HTTP_CHECKSUM, httpCrc32Checksum);
146+
147+
ExecutionContext executionContext =
148+
AwsExecutionContextBuilder.invokeInterceptorsAndCreateExecutionContext(executionParams,
149+
testClientConfiguration().build());
150+
151+
ExecutionAttributes executionAttributes = executionContext.executionAttributes();
152+
ChecksumSpecs checksumSpecs1 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes).get();
153+
ChecksumSpecs checksumSpecs2 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes).get();
154+
155+
assertThat(checksumSpecs1).isSameAs(checksumSpecs2);
156+
}
157+
158+
@Test
159+
public void invokeInterceptorsAndCreateExecutionContext_multipleExecutionContexts_resolvesChecksumSpecsOncePerContext() {
160+
HttpChecksum httpCrc32Checksum = HttpChecksum.builder().requestAlgorithm("crc32").isRequestStreaming(true).build();
161+
ClientExecutionParams<SdkRequest, SdkResponse> executionParams = clientExecutionParams()
162+
.putExecutionAttribute(SdkInternalExecutionAttribute.HTTP_CHECKSUM, httpCrc32Checksum);
163+
SdkClientConfiguration clientConfig = testClientConfiguration().build();
164+
165+
ExecutionContext executionContext1 =
166+
AwsExecutionContextBuilder.invokeInterceptorsAndCreateExecutionContext(executionParams,
167+
clientConfig);
168+
ExecutionAttributes executionAttributes1 = executionContext1.executionAttributes();
169+
ChecksumSpecs checksumSpecs1 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes1).get();
170+
171+
ExecutionContext executionContext2 =
172+
AwsExecutionContextBuilder.invokeInterceptorsAndCreateExecutionContext(executionParams,
173+
clientConfig);
174+
ExecutionAttributes executionAttributes2 = executionContext2.executionAttributes();
175+
ChecksumSpecs checksumSpecs2 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes2).get();
176+
ChecksumSpecs checksumSpecs3 = HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes2).get();
177+
178+
assertThat(checksumSpecs1).isNotSameAs(checksumSpecs2);
179+
assertThat(checksumSpecs2).isSameAs(checksumSpecs3);
180+
}
123181

124182
private ClientExecutionParams<SdkRequest, SdkResponse> clientExecutionParams() {
125183
return new ClientExecutionParams<SdkRequest, SdkResponse>()

‎core/endpoints-spi/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.18.3</version>
23+
<version>2.18.4</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.18.3</version>
23+
<version>2.18.4</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.18.3</version>
8+
<version>2.18.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)