Skip to content

Commit 54b35d3

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2907 from aws/staging/d13c4c80-18cd-4379-9d90-a1708d78b610
Pull request: release <- staging/d13c4c80-18cd-4379-9d90-a1708d78b610
2 parents 71b70eb + 14ef682 commit 54b35d3

File tree

480 files changed

+990
-632
lines changed

Some content is hidden

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

480 files changed

+990
-632
lines changed

‎.brazil.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
"test-utils": { "skipImport": true },
102102
"tests-coverage-reporting": { "skipImport": true },
103103
"third-party": { "skipImport": true },
104-
"third-party-slf4j-api": { "skipImport": true }
104+
"third-party-slf4j-api": { "skipImport": true },
105+
"crt-unavailable-tests": { "skipImport": true }
105106
},
106107

107108
"dependencies": {

‎.changes/2.24.10.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.24.10",
3+
"date": "2024-02-23",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS AppSync",
8+
"contributor": "",
9+
"description": "Documentation only updates for AppSync"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "S3 Transfer Manager",
14+
"contributor": "",
15+
"description": "Make Transfer Manager work by default with S3AsyncClient when multipart configuration is enabled."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon QLDB",
20+
"contributor": "",
21+
"description": "Clarify possible values for KmsKeyArn and EncryptionDescription."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Relational Database Service",
26+
"contributor": "",
27+
"description": "Add pattern and length based validations for DBShardGroupIdentifier"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "CloudWatch RUM",
32+
"contributor": "",
33+
"description": "Doc-only update for new RUM metrics that were added"
34+
},
35+
{
36+
"type": "feature",
37+
"category": "S3 Transfer Manager",
38+
"contributor": "",
39+
"description": "Enable multipart configuration by default when creating a new S3TranferManager instance using the .create() method"
40+
}
41+
]
42+
}

‎CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.24.10__ __2024-02-23__
3+
## __AWS AppSync__
4+
- ### Features
5+
- Documentation only updates for AppSync
6+
7+
## __Amazon QLDB__
8+
- ### Features
9+
- Clarify possible values for KmsKeyArn and EncryptionDescription.
10+
11+
## __Amazon Relational Database Service__
12+
- ### Features
13+
- Add pattern and length based validations for DBShardGroupIdentifier
14+
15+
## __CloudWatch RUM__
16+
- ### Features
17+
- Doc-only update for new RUM metrics that were added
18+
19+
## __S3 Transfer Manager__
20+
- ### Features
21+
- Enable multipart configuration by default when creating a new S3TranferManager instance using the .create() method
22+
- Make Transfer Manager work by default with S3AsyncClient when multipart configuration is enabled.
23+
224
# __2.24.9__ __2024-02-22__
325
## __AWS CRT-based S3 client__
426
- ### Bugfixes

‎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.24.9</version>
55+
<version>2.24.10</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.24.9</version>
89+
<version>2.24.10</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.24.9</version>
94+
<version>2.24.10</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.24.9</version>
106+
<version>2.24.10</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.24.9</version>
23+
<version>2.24.10</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.24.9</version>
23+
<version>2.24.10</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.24.9</version>
23+
<version>2.24.10</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.24.9</version>
23+
<version>2.24.10</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.24.9</version>
20+
<version>2.24.10</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.24.9</version>
23+
<version>2.24.10</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.24.9</version>
20+
<version>2.24.10</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎buildspecs/release-javadoc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ phases:
1818
commands:
1919
- python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
2020
- mvn install -P quick -T1C
21-
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test'
21+
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:crt-unavailable-tests'
2222
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
2323
-
2424
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/ --acl="public-read"

‎buildspecs/release-to-maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ phases:
3434
awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
3535
$SETTINGS_XML
3636
37-
mvn clean deploy -B -s $SETTINGS_XML -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-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
37+
mvn clean deploy -B -s $SETTINGS_XML -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-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test,!:crt-unavailable-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
3838
else
3939
echo "This version was already released."
4040
fi

‎bundle-logging-bridge/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.24.9</version>
24+
<version>2.24.10</version>
2525
</parent>
2626
<artifactId>bundle-logging-bridge</artifactId>
2727
<packaging>jar</packaging>

‎bundle-sdk/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.24.9</version>
24+
<version>2.24.10</version>
2525
</parent>
2626
<artifactId>bundle-sdk</artifactId>
2727
<packaging>jar</packaging>

‎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.24.9</version>
24+
<version>2.24.10</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.24.9</version>
25+
<version>2.24.10</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.24.9</version>
24+
<version>2.24.10</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.24.9</version>
25+
<version>2.24.10</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.24.9</version>
24+
<version>2.24.10</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeInterceptorSpec.java

+15-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import software.amazon.awssdk.endpoints.EndpointProvider;
5353
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
5454
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
55+
import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
5556
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
5657
import software.amazon.awssdk.identity.spi.Identity;
5758
import software.amazon.awssdk.identity.spi.IdentityProvider;
@@ -274,6 +275,19 @@ private MethodSpec generateTrySelectAuthScheme() {
274275
.endControlFlow();
275276
}
276277

278+
builder.addStatement("$T signer",
279+
ParameterizedTypeName.get(ClassName.get(HttpSigner.class), TypeVariableName.get("T")));
280+
builder.beginControlFlow("try");
281+
{
282+
builder.addStatement("signer = authScheme.signer()");
283+
builder.nextControlFlow("catch (RuntimeException e)");
284+
builder.addStatement("discardedReasons.add(() -> String.format($S, authOption.schemeId(), e.getMessage()))",
285+
"'%s' signer could not be retrieved: %s")
286+
.addStatement("return null")
287+
.endControlFlow();
288+
}
289+
290+
277291
builder.addStatement("$T.Builder identityRequestBuilder = $T.builder()",
278292
ResolveIdentityRequest.class,
279293
ResolveIdentityRequest.class);
@@ -294,7 +308,7 @@ private MethodSpec generateTrySelectAuthScheme() {
294308
MetricUtils.class)
295309
.endControlFlow();
296310

297-
builder.addStatement("return new $T<>(identity, authScheme.signer(), authOption)", SelectedAuthScheme.class);
311+
builder.addStatement("return new $T<>(identity, signer, authOption)", SelectedAuthScheme.class);
298312
return builder.build();
299313
}
300314

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-auth-scheme-interceptor.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import software.amazon.awssdk.core.metrics.CoreMetric;
2323
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
2424
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
25+
import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
2526
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
2627
import software.amazon.awssdk.identity.spi.Identity;
2728
import software.amazon.awssdk.identity.spi.IdentityProvider;
@@ -100,6 +101,14 @@ private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchem
100101
.add(() -> String.format("'%s' does not have an identity provider configured.", authOption.schemeId()));
101102
return null;
102103
}
104+
HttpSigner<T> signer;
105+
try {
106+
signer = authScheme.signer();
107+
} catch (RuntimeException e) {
108+
discardedReasons.add(() -> String.format("'%s' signer could not be retrieved: %s", authOption.schemeId(),
109+
e.getMessage()));
110+
return null;
111+
}
103112
ResolveIdentityRequest.Builder identityRequestBuilder = ResolveIdentityRequest.builder();
104113
authOption.forEachIdentityProperty(identityRequestBuilder::putProperty);
105114
CompletableFuture<? extends T> identity;
@@ -110,7 +119,7 @@ private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchem
110119
identity = MetricUtils.reportDuration(() -> identityProvider.resolveIdentity(identityRequestBuilder.build()),
111120
metricCollector, metric);
112121
}
113-
return new SelectedAuthScheme<>(identity, authScheme.signer(), authOption);
122+
return new SelectedAuthScheme<>(identity, signer, authOption);
114123
}
115124

116125
private SdkMetric<Duration> getIdentityMetric(IdentityProvider<?> identityProvider) {

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-with-allowlist-auth-scheme-interceptor.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import software.amazon.awssdk.endpoints.EndpointProvider;
2323
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
2424
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
25+
import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
2526
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
2627
import software.amazon.awssdk.identity.spi.Identity;
2728
import software.amazon.awssdk.identity.spi.IdentityProvider;
@@ -117,6 +118,14 @@ private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchem
117118
.add(() -> String.format("'%s' does not have an identity provider configured.", authOption.schemeId()));
118119
return null;
119120
}
121+
HttpSigner<T> signer;
122+
try {
123+
signer = authScheme.signer();
124+
} catch (RuntimeException e) {
125+
discardedReasons.add(() -> String.format("'%s' signer could not be retrieved: %s", authOption.schemeId(),
126+
e.getMessage()));
127+
return null;
128+
}
120129
ResolveIdentityRequest.Builder identityRequestBuilder = ResolveIdentityRequest.builder();
121130
authOption.forEachIdentityProperty(identityRequestBuilder::putProperty);
122131
CompletableFuture<? extends T> identity;
@@ -127,7 +136,7 @@ private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchem
127136
identity = MetricUtils.reportDuration(() -> identityProvider.resolveIdentity(identityRequestBuilder.build()),
128137
metricCollector, metric);
129138
}
130-
return new SelectedAuthScheme<>(identity, authScheme.signer(), authOption);
139+
return new SelectedAuthScheme<>(identity, signer, authOption);
131140
}
132141

133142
private SdkMetric<Duration> getIdentityMetric(IdentityProvider<?> identityProvider) {

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-without-allowlist-auth-scheme-interceptor.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import software.amazon.awssdk.endpoints.EndpointProvider;
2323
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
2424
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
25+
import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
2526
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
2627
import software.amazon.awssdk.identity.spi.Identity;
2728
import software.amazon.awssdk.identity.spi.IdentityProvider;
@@ -120,6 +121,14 @@ private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchem
120121
.add(() -> String.format("'%s' does not have an identity provider configured.", authOption.schemeId()));
121122
return null;
122123
}
124+
HttpSigner<T> signer;
125+
try {
126+
signer = authScheme.signer();
127+
} catch (RuntimeException e) {
128+
discardedReasons.add(() -> String.format("'%s' signer could not be retrieved: %s", authOption.schemeId(),
129+
e.getMessage()));
130+
return null;
131+
}
123132
ResolveIdentityRequest.Builder identityRequestBuilder = ResolveIdentityRequest.builder();
124133
authOption.forEachIdentityProperty(identityRequestBuilder::putProperty);
125134
CompletableFuture<? extends T> identity;
@@ -130,7 +139,7 @@ private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchem
130139
identity = MetricUtils.reportDuration(() -> identityProvider.resolveIdentity(identityRequestBuilder.build()),
131140
metricCollector, metric);
132141
}
133-
return new SelectedAuthScheme<>(identity, authScheme.signer(), authOption);
142+
return new SelectedAuthScheme<>(identity, signer, authOption);
134143
}
135144

136145
private SdkMetric<Duration> getIdentityMetric(IdentityProvider<?> identityProvider) {

‎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.24.9</version>
23+
<version>2.24.10</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)