Skip to content

Commit 83ec481

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #4011 from aws/staging/ccc1550e-e33a-4000-b787-7b7c3349e3e8
Pull request: release <- staging/ccc1550e-e33a-4000-b787-7b7c3349e3e8
2 parents 59bb67c + e6b00a0 commit 83ec481

File tree

539 files changed

+2550
-1075
lines changed

Some content is hidden

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

539 files changed

+2550
-1075
lines changed

‎.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,15 @@
10661066
"contributions": [
10671067
"code"
10681068
]
1069+
},
1070+
{
1071+
"login": "reifiedbeans",
1072+
"name": "Drew Davis",
1073+
"avatar_url": "https://avatars.githubusercontent.com/u/9686215?v=4",
1074+
"profile": "https://github.com/reifiedbeans",
1075+
"contributions": [
1076+
"code"
1077+
]
10691078
}
10701079
],
10711080
"contributorsPerLine": 7,

‎.changes/2.31.58.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"version": "2.31.58",
3+
"date": "2025-06-05",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon DynamoDB Enhanced Client",
8+
"contributor": "",
9+
"description": "Fixed DynamoDbEnhancedClient DefaultDynamoDbAsyncTable::createTable() to create secondary indices that are defined on annotations of the POJO class, similar to DefaultDynamoDbTable::createTable()."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Billing and Cost Management Pricing Calculator",
14+
"contributor": "",
15+
"description": "Updating the minimum for List APIs to be 1 (instead of 0)"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS CloudFormation",
20+
"contributor": "",
21+
"description": "Add new warning type 'EXCLUDED_PROPERTIES'"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Key Management Service",
26+
"contributor": "",
27+
"description": "AWS KMS announces the support for on-demand rotation of symmetric-encryption KMS keys with imported key material (EXTERNAL origin)."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Added ability to configure preferred authentication schemes when multiple auth options are available."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS WAFV2",
38+
"contributor": "",
39+
"description": "AWS WAF adds support for ASN-based traffic filtering and support for ASN-based rate limiting."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "AWS SDK for Java v2",
44+
"contributor": "",
45+
"description": "Updated endpoint and partition metadata."
46+
}
47+
]
48+
}

‎CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.31.58__ __2025-06-05__
3+
## __AWS Billing and Cost Management Pricing Calculator__
4+
- ### Features
5+
- Updating the minimum for List APIs to be 1 (instead of 0)
6+
7+
## __AWS CloudFormation__
8+
- ### Features
9+
- Add new warning type 'EXCLUDED_PROPERTIES'
10+
11+
## __AWS Key Management Service__
12+
- ### Features
13+
- AWS KMS announces the support for on-demand rotation of symmetric-encryption KMS keys with imported key material (EXTERNAL origin).
14+
15+
## __AWS SDK for Java v2__
16+
- ### Features
17+
- Added ability to configure preferred authentication schemes when multiple auth options are available.
18+
- Updated endpoint and partition metadata.
19+
20+
## __AWS WAFV2__
21+
- ### Features
22+
- AWS WAF adds support for ASN-based traffic filtering and support for ASN-based rate limiting.
23+
24+
## __Amazon DynamoDB Enhanced Client__
25+
- ### Bugfixes
26+
- Fixed DynamoDbEnhancedClient DefaultDynamoDbAsyncTable::createTable() to create secondary indices that are defined on annotations of the POJO class, similar to DefaultDynamoDbTable::createTable().
27+
228
# __2.31.57__ __2025-06-04__
329
## __AWS Amplify__
430
- ### Features

‎README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Maven](https://img.shields.io/maven-central/v/software.amazon.awssdk/s3.svg?label=Maven)](https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22s3%22)
44
[![codecov](https://codecov.io/gh/aws/aws-sdk-java-v2/branch/master/graph/badge.svg)](https://codecov.io/gh/aws/aws-sdk-java-v2)
55
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6-
[![All Contributors](https://img.shields.io/badge/all_contributors-118-orange.svg?style=flat-square)](#contributors-)
6+
[![All Contributors](https://img.shields.io/badge/all_contributors-119-orange.svg?style=flat-square)](#contributors-)
77
<!-- ALL-CONTRIBUTORS-BADGE:END -->
88

99
The **AWS SDK for Java 2.0** is a rewrite of 1.0 with some great new features. As with version 1.0,
@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
5151
<dependency>
5252
<groupId>software.amazon.awssdk</groupId>
5353
<artifactId>bom</artifactId>
54-
<version>2.31.57</version>
54+
<version>2.31.58</version>
5555
<type>pom</type>
5656
<scope>import</scope>
5757
</dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
8585
<dependency>
8686
<groupId>software.amazon.awssdk</groupId>
8787
<artifactId>ec2</artifactId>
88-
<version>2.31.57</version>
88+
<version>2.31.58</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>s3</artifactId>
93-
<version>2.31.57</version>
93+
<version>2.31.58</version>
9494
</dependency>
9595
```
9696

@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
102102
<dependency>
103103
<groupId>software.amazon.awssdk</groupId>
104104
<artifactId>aws-sdk-java</artifactId>
105-
<version>2.31.57</version>
105+
<version>2.31.58</version>
106106
</dependency>
107107
```
108108

@@ -340,6 +340,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
340340
<td align="center" valign="top" width="14.28%"><a href="https://github.com/RanVaknin"><img src="https://avatars.githubusercontent.com/u/50976344?v=4?s=100" width="100px;" alt="Ran Vaknin"/><br /><sub><b>Ran Vaknin</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=RanVaknin" title="Code">💻</a></td>
341341
<td align="center" valign="top" width="14.28%"><a href="https://github.com/greg-at-moderne"><img src="https://avatars.githubusercontent.com/u/192309513?v=4?s=100" width="100px;" alt="Greg Oledzki"/><br /><sub><b>Greg Oledzki</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=greg-at-moderne" title="Code">💻</a></td>
342342
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kstich"><img src="https://avatars.githubusercontent.com/u/26905335?v=4?s=100" width="100px;" alt="Kevin Stich"/><br /><sub><b>Kevin Stich</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=kstich" title="Code">💻</a></td>
343+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jencymaryjoseph"><img src="https://avatars.githubusercontent.com/u/35571282?v=4?s=100" width="100px;" alt="Jency Joseph"/><br /><sub><b>Jency Joseph</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=jencymaryjoseph" title="Code">💻</a></td>
344+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/reifiedbeans"><img src="https://avatars.githubusercontent.com/u/9686215?v=4?s=100" width="100px;" alt="Drew Davis"/><br /><sub><b>Drew Davis</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=reifiedbeans" title="Code">💻</a></td>
343345
</tr>
344346
</tbody>
345347
</table>

‎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.31.57</version>
23+
<version>2.31.58</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.31.57</version>
23+
<version>2.31.58</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.31.57</version>
23+
<version>2.31.58</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.31.57</version>
23+
<version>2.31.58</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.31.57</version>
20+
<version>2.31.58</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.31.57</version>
23+
<version>2.31.58</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.31.57</version>
20+
<version>2.31.58</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

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

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

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

‎codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import software.amazon.awssdk.codegen.poet.auth.scheme.EndpointAwareAuthSchemeParamsSpec;
2929
import software.amazon.awssdk.codegen.poet.auth.scheme.EndpointBasedAuthSchemeProviderSpec;
3030
import software.amazon.awssdk.codegen.poet.auth.scheme.ModelBasedAuthSchemeProviderSpec;
31+
import software.amazon.awssdk.codegen.poet.auth.scheme.PreferredAuthSchemeProviderSpec;
3132

3233
public final class AuthSchemeGeneratorTasks extends BaseGeneratorTasks {
3334
private final GeneratorTaskParams generatorTaskParams;
@@ -45,6 +46,7 @@ protected List<GeneratorTask> createTasks() {
4546
tasks.add(generateProviderInterface());
4647
tasks.add(generateDefaultParamsImpl());
4748
tasks.add(generateModelBasedProvider());
49+
tasks.add(generatePreferenceProvider());
4850
tasks.add(generateAuthSchemeInterceptor());
4951
if (authSchemeSpecUtils.useEndpointBasedAuthProvider()) {
5052
tasks.add(generateEndpointBasedProvider());
@@ -69,6 +71,10 @@ private GeneratorTask generateModelBasedProvider() {
6971
return new PoetGeneratorTask(authSchemeInternalDir(), model.getFileHeader(), new ModelBasedAuthSchemeProviderSpec(model));
7072
}
7173

74+
private GeneratorTask generatePreferenceProvider() {
75+
return new PoetGeneratorTask(authSchemeInternalDir(), model.getFileHeader(), new PreferredAuthSchemeProviderSpec(model));
76+
}
77+
7278
private GeneratorTask generateEndpointBasedProvider() {
7379
return new PoetGeneratorTask(authSchemeInternalDir(), model.getFileHeader(),
7480
new EndpointBasedAuthSchemeProviderSpec(model));

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.squareup.javapoet.ParameterizedTypeName;
2222
import com.squareup.javapoet.TypeName;
2323
import com.squareup.javapoet.TypeSpec;
24+
import java.util.List;
2425
import java.util.function.Consumer;
2526
import javax.lang.model.element.Modifier;
2627
import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -54,6 +55,7 @@ public TypeSpec poetSpec() {
5455
.addMethod(resolveAuthSchemeMethod())
5556
.addMethod(resolveAuthSchemeConsumerBuilderMethod())
5657
.addMethod(defaultProviderMethod())
58+
.addMethod(defaultPreferredProviderMethod())
5759
.build();
5860
}
5961

@@ -93,6 +95,17 @@ private MethodSpec defaultProviderMethod() {
9395
.build();
9496
}
9597

98+
private MethodSpec defaultPreferredProviderMethod() {
99+
return MethodSpec.methodBuilder("defaultProvider")
100+
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
101+
.addParameter(ParameterizedTypeName.get(List.class, String.class), "authSchemePreference")
102+
.returns(className())
103+
.addJavadoc("Get the default auth scheme provider the preferred auth schemes in order of preference.")
104+
.addStatement("return new $T(defaultProvider(), authSchemePreference)",
105+
authSchemeSpecUtils.preferredAuthSchemeProviderName())
106+
.build();
107+
}
108+
96109
private CodeBlock interfaceJavadoc() {
97110
CodeBlock.Builder b = CodeBlock.builder();
98111

@@ -105,3 +118,4 @@ private CodeBlock interfaceJavadoc() {
105118
return b.build();
106119
}
107120
}
121+

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,15 @@ public ClassName modeledAuthSchemeProviderName() {
9797
return ClassName.get(internalPackage(), "Modeled" + providerInterfaceName().simpleName());
9898
}
9999

100+
public ClassName preferredAuthSchemeProviderName() {
101+
return ClassName.get(internalPackage(), "Preferred" + providerInterfaceName().simpleName());
102+
}
103+
104+
public ClassName authSchemeProviderBuilderName() {
105+
return ClassName.get(basePackage(),
106+
intermediateModel.getMetadata().getServiceName() + "AuthSchemeProviderBuilder");
107+
}
108+
100109
public ClassName authSchemeInterceptor() {
101110
return ClassName.get(internalPackage(), intermediateModel.getMetadata().getServiceName() + "AuthSchemeInterceptor");
102111
}

0 commit comments

Comments
 (0)