Skip to content

Commit c43f7af

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #3050 from aws/staging/a801662b-81c4-4e38-a626-c01f6f8acfeb
Pull request: release <- staging/a801662b-81c4-4e38-a626-c01f6f8acfeb
2 parents fc87f39 + 2ac4b76 commit c43f7af

File tree

491 files changed

+1312
-1095
lines changed

Some content is hidden

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

491 files changed

+1312
-1095
lines changed

‎.changes/2.25.61.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.25.61",
3+
"date": "2024-05-28",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon S3",
8+
"contributor": "",
9+
"description": "Fixed NullPointerException in S3 thrown when null metadata value is provided."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Amazon DynamoDB",
14+
"contributor": "",
15+
"description": "Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based policy."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Elastic Compute Cloud",
20+
"contributor": "",
21+
"description": "Providing support to accept BgpAsnExtended attribute"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Simple Workflow Service",
26+
"contributor": "",
27+
"description": "This release adds new APIs for deleting activity type and workflow type resources."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Managed Streaming for Kafka",
32+
"contributor": "",
33+
"description": "Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK"
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS SDK for Java v2",
38+
"contributor": "",
39+
"description": "Updated endpoint and partition metadata."
40+
}
41+
]
42+
}

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.25.61__ __2024-05-28__
3+
## __AWS SDK for Java v2__
4+
- ### Features
5+
- Updated endpoint and partition metadata.
6+
7+
## __Amazon DynamoDB__
8+
- ### Features
9+
- Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based policy.
10+
11+
## __Amazon Elastic Compute Cloud__
12+
- ### Features
13+
- Providing support to accept BgpAsnExtended attribute
14+
15+
## __Amazon S3__
16+
- ### Bugfixes
17+
- Fixed NullPointerException in S3 thrown when null metadata value is provided.
18+
19+
## __Amazon Simple Workflow Service__
20+
- ### Features
21+
- This release adds new APIs for deleting activity type and workflow type resources.
22+
23+
## __Managed Streaming for Kafka__
24+
- ### Features
25+
- Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK
26+
227
# __2.25.60__ __2024-05-24__
328
## __AWS IoT FleetWise__
429
- ### 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.25.60</version>
55+
<version>2.25.61</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.25.60</version>
89+
<version>2.25.61</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.25.60</version>
94+
<version>2.25.61</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.25.60</version>
106+
<version>2.25.61</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.25.60</version>
23+
<version>2.25.61</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.25.60</version>
23+
<version>2.25.61</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.25.60</version>
23+
<version>2.25.61</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.25.60</version>
23+
<version>2.25.61</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.25.60</version>
20+
<version>2.25.61</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.25.60</version>
23+
<version>2.25.61</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.25.60</version>
20+
<version>2.25.61</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.25.60</version>
24+
<version>2.25.61</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.25.60</version>
24+
<version>2.25.61</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.25.60</version>
24+
<version>2.25.61</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.25.60</version>
25+
<version>2.25.61</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.25.60</version>
24+
<version>2.25.61</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.25.60</version>
25+
<version>2.25.61</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.25.60</version>
24+
<version>2.25.61</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private MethodSpec ruleParams() {
307307
setter, SdkInternalExecutionAttribute.class);
308308
break;
309309
case AWS_AUTH_ACCOUNT_ID_ENDPOINT_MODE:
310-
b.addStatement("builder.$N(executionAttributes.getAttribute($T.$N).name())",
310+
b.addStatement("builder.$N(executionAttributes.getAttribute($T.$N).name().toLowerCase())",
311311
setter, AwsExecutionAttribute.class,
312312
model.getNamingStrategy().getEnumValueName(m.getBuiltInEnum().name()));
313313
break;

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointRulesClientTestSpec.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.junit.jupiter.params.ParameterizedTest;
4545
import org.junit.jupiter.params.provider.MethodSource;
4646
import org.mockito.Mockito;
47+
import software.amazon.awssdk.awscore.endpoints.AccountIdEndpointMode;
4748
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
4849
import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
4950
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -275,7 +276,7 @@ private CodeBlock syncOperationCallLambda(OperationModel opModel, Map<String, Tr
275276

276277
b.beginControlFlow("() -> ");
277278
b.addStatement("$T builder = $T.builder()", syncClientBuilder(), syncClientClass());
278-
b.addStatement("builder.credentialsProvider($T.CREDENTIALS_PROVIDER)", BaseRuleSetClientTest.class);
279+
configureCredentialsProvider(b, params);
279280
if (AuthUtils.usesBearerAuth(model)) {
280281
b.addStatement("builder.tokenProvider($T.TOKEN_PROVIDER)", BaseRuleSetClientTest.class);
281282
}
@@ -302,7 +303,7 @@ private CodeBlock asyncOperationCallLambda(OperationModel opModel, Map<String, T
302303

303304
b.beginControlFlow("() -> ");
304305
b.addStatement("$T builder = $T.builder()", asyncClientBuilder(), asyncClientClass());
305-
b.addStatement("builder.credentialsProvider($T.CREDENTIALS_PROVIDER)", BaseRuleSetClientTest.class);
306+
configureCredentialsProvider(b, params);
306307
if (AuthUtils.usesBearerAuth(model)) {
307308
b.addStatement("builder.tokenProvider($T.TOKEN_PROVIDER)", BaseRuleSetClientTest.class);
308309
}
@@ -324,6 +325,16 @@ private CodeBlock asyncOperationCallLambda(OperationModel opModel, Map<String, T
324325
return b.build();
325326
}
326327

328+
private void configureCredentialsProvider(CodeBlock.Builder b, Map<String, TreeNode> params) {
329+
if (params != null && params.containsKey("AccountId")) {
330+
CodeBlock valueLiteral = endpointRulesSpecUtils.treeNodeToLiteral(params.get("AccountId"));
331+
b.addStatement("builder.credentialsProvider($T.credentialsProviderWithAccountId($L))", BaseRuleSetClientTest.class,
332+
valueLiteral);
333+
} else {
334+
b.addStatement("builder.credentialsProvider($T.CREDENTIALS_PROVIDER)", BaseRuleSetClientTest.class);
335+
}
336+
}
337+
327338
private CodeBlock syncOperationInvocation(OperationModel opModel) {
328339
CodeBlock.Builder b = CodeBlock.builder();
329340

@@ -598,6 +609,10 @@ private CodeBlock setClientParams(String builderName, Map<String, TreeNode> para
598609
b.addStatement("$T.setProperty($L, $L ? \"global\" : \"regional\")", System.class,
599610
s3RegionalEndpointSystemPropertyCode(), valueLiteral);
600611
break;
612+
case AWS_AUTH_ACCOUNT_ID_ENDPOINT_MODE:
613+
b.addStatement("$N.accountIdEndpointMode($T.fromValue($L))", builderName, AccountIdEndpointMode.class,
614+
valueLiteral);
615+
break;
601616
default:
602617
break;
603618
}

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

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/*
2-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License").
5-
* You may not use this file except in compliance with the License.
6-
* A copy of the License is located at
7-
*
8-
* http://aws.amazon.com/apache2.0
9-
*
10-
* or in the "license" file accompanying this file. This file is distributed
11-
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12-
* express or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
14-
*/
15-
161
package software.amazon.awssdk.services.query.auth.scheme.internal;
172

183
import java.util.Arrays;
@@ -35,10 +20,9 @@ public final class DefaultQueryAuthSchemeParams implements QueryAuthSchemeParams
3520

3621
private final Boolean useFIPSEndpoint;
3722

38-
private final String awsAccountId;
39-
23+
private final String accountId;
4024

41-
private final String awsAccountIdEndpointMode;
25+
private final String accountIdEndpointMode;
4226

4327
private final List<String> listOfStrings;
4428

@@ -65,8 +49,8 @@ private DefaultQueryAuthSchemeParams(Builder builder) {
6549
this.region = builder.region;
6650
this.useDualStackEndpoint = builder.useDualStackEndpoint;
6751
this.useFIPSEndpoint = builder.useFIPSEndpoint;
68-
this.awsAccountId = builder.awsAccountId;
69-
this.awsAccountIdEndpointMode = builder.awsAccountIdEndpointMode;
52+
this.accountId = builder.accountId;
53+
this.accountIdEndpointMode = builder.accountIdEndpointMode;
7054
this.listOfStrings = builder.listOfStrings;
7155
this.defaultListOfStrings = Validate.paramNotNull(builder.defaultListOfStrings, "defaultListOfStrings");
7256
this.endpointId = builder.endpointId;
@@ -104,13 +88,13 @@ public Boolean useFipsEndpoint() {
10488
}
10589

10690
@Override
107-
public String awsAccountId() {
108-
return awsAccountId;
91+
public String accountId() {
92+
return accountId;
10993
}
11094

11195
@Override
112-
public String awsAccountIdEndpointMode() {
113-
return awsAccountIdEndpointMode;
96+
public String accountIdEndpointMode() {
97+
return accountIdEndpointMode;
11498
}
11599

116100
@Override
@@ -178,9 +162,9 @@ private static final class Builder implements QueryAuthSchemeParams.Builder, Que
178162

179163
private Boolean useFIPSEndpoint;
180164

181-
private String awsAccountId;
165+
private String accountId;
182166

183-
private String awsAccountIdEndpointMode;
167+
private String accountIdEndpointMode;
184168

185169
private List<String> listOfStrings;
186170

@@ -210,8 +194,8 @@ private static final class Builder implements QueryAuthSchemeParams.Builder, Que
210194
this.region = params.region;
211195
this.useDualStackEndpoint = params.useDualStackEndpoint;
212196
this.useFIPSEndpoint = params.useFIPSEndpoint;
213-
this.awsAccountId = params.awsAccountId;
214-
this.awsAccountIdEndpointMode = params.awsAccountIdEndpointMode;
197+
this.accountId = params.accountId;
198+
this.accountIdEndpointMode = params.accountIdEndpointMode;
215199
this.listOfStrings = params.listOfStrings;
216200
this.defaultListOfStrings = params.defaultListOfStrings;
217201
this.endpointId = params.endpointId;
@@ -249,14 +233,14 @@ public Builder useFipsEndpoint(Boolean useFIPSEndpoint) {
249233
}
250234

251235
@Override
252-
public Builder awsAccountId(String awsAccountId) {
253-
this.awsAccountId = awsAccountId;
236+
public Builder accountId(String accountId) {
237+
this.accountId = accountId;
254238
return this;
255239
}
256240

257241
@Override
258-
public Builder awsAccountIdEndpointMode(String awsAccountIdEndpointMode) {
259-
this.awsAccountIdEndpointMode = awsAccountIdEndpointMode;
242+
public Builder accountIdEndpointMode(String accountIdEndpointMode) {
243+
this.accountIdEndpointMode = accountIdEndpointMode;
260244
return this;
261245
}
262246

0 commit comments

Comments
 (0)