Merge pull request #3050 from aws/staging/a801662b-81c4-4e38-a626-c01…

…f6f8acfeb

Pull request: release <- staging/a801662b-81c4-4e38-a626-c01f6f8acfeb

.changes/2.25.61.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.25.61",
+    "date": "2024-05-28",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "Fixed NullPointerException in S3 thrown when null metadata value is provided."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB",
+            "contributor": "",
+            "description": "Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based policy."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "Providing support to accept BgpAsnExtended attribute"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Workflow Service",
+            "contributor": "",
+            "description": "This release adds new APIs for deleting activity type and workflow type resources."
+        },
+        {
+            "type": "feature",
+            "category": "Managed Streaming for Kafka",
+            "contributor": "",
+            "description": "Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,4 +1,29 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.25.61__ __2024-05-28__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon DynamoDB__
+  - ### Features
+    - Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based policy.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Providing support to accept BgpAsnExtended attribute
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixed NullPointerException in S3 thrown when null metadata value is provided.
+
+## __Amazon Simple Workflow Service__
+  - ### Features
+    - This release adds new APIs for deleting activity type and workflow type resources.
+
+## __Managed Streaming for Kafka__
+  - ### Features
+    - Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK
+
 # __2.25.60__ __2024-05-24__
 ## __AWS IoT FleetWise__
   - ### Features

README.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.25.60</version>
+      <version>2.25.61</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.25.60</version>
+  <version>2.25.61</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.25.60</version>
+  <version>2.25.61</version>
 </dependency>
 ```
 
@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.25.60</version>
+  <version>2.25.61</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle-logging-bridge/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

bundle-sdk/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.60</version>
+        <version>2.25.61</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

@@ -307,7 +307,7 @@ private MethodSpec ruleParams() {
                                    setter, SdkInternalExecutionAttribute.class);
                     break;
                 case AWS_AUTH_ACCOUNT_ID_ENDPOINT_MODE:
-                    b.addStatement("builder.$N(executionAttributes.getAttribute($T.$N).name())",
+                    b.addStatement("builder.$N(executionAttributes.getAttribute($T.$N).name().toLowerCase())",
                                    setter, AwsExecutionAttribute.class,
                                    model.getNamingStrategy().getEnumValueName(m.getBuiltInEnum().name()));
                     break;

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

@@ -44,6 +44,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
+import software.amazon.awssdk.awscore.endpoints.AccountIdEndpointMode;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
 import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -275,7 +276,7 @@ private CodeBlock syncOperationCallLambda(OperationModel opModel, Map<String, Tr
 
         b.beginControlFlow("() -> ");
         b.addStatement("$T builder = $T.builder()", syncClientBuilder(), syncClientClass());
-        b.addStatement("builder.credentialsProvider($T.CREDENTIALS_PROVIDER)", BaseRuleSetClientTest.class);
+        configureCredentialsProvider(b, params);
         if (AuthUtils.usesBearerAuth(model)) {
             b.addStatement("builder.tokenProvider($T.TOKEN_PROVIDER)", BaseRuleSetClientTest.class);
         }
@@ -302,7 +303,7 @@ private CodeBlock asyncOperationCallLambda(OperationModel opModel, Map<String, T
 
         b.beginControlFlow("() -> ");
         b.addStatement("$T builder = $T.builder()", asyncClientBuilder(), asyncClientClass());
-        b.addStatement("builder.credentialsProvider($T.CREDENTIALS_PROVIDER)", BaseRuleSetClientTest.class);
+        configureCredentialsProvider(b, params);
         if (AuthUtils.usesBearerAuth(model)) {
             b.addStatement("builder.tokenProvider($T.TOKEN_PROVIDER)", BaseRuleSetClientTest.class);
         }
@@ -324,6 +325,16 @@ private CodeBlock asyncOperationCallLambda(OperationModel opModel, Map<String, T
         return b.build();
     }
 
+    private void configureCredentialsProvider(CodeBlock.Builder b, Map<String, TreeNode> params) {
+        if (params != null && params.containsKey("AccountId")) {
+            CodeBlock valueLiteral = endpointRulesSpecUtils.treeNodeToLiteral(params.get("AccountId"));
+            b.addStatement("builder.credentialsProvider($T.credentialsProviderWithAccountId($L))", BaseRuleSetClientTest.class,
+                           valueLiteral);
+        } else {
+            b.addStatement("builder.credentialsProvider($T.CREDENTIALS_PROVIDER)", BaseRuleSetClientTest.class);
+        }
+    }
+
     private CodeBlock syncOperationInvocation(OperationModel opModel) {
         CodeBlock.Builder b = CodeBlock.builder();
 
@@ -598,6 +609,10 @@ private CodeBlock setClientParams(String builderName, Map<String, TreeNode> para
                         b.addStatement("$T.setProperty($L, $L ? \"global\" : \"regional\")", System.class,
                                        s3RegionalEndpointSystemPropertyCode(), valueLiteral);
                         break;
+                    case AWS_AUTH_ACCOUNT_ID_ENDPOINT_MODE:
+                        b.addStatement("$N.accountIdEndpointMode($T.fromValue($L))", builderName, AccountIdEndpointMode.class,
+                                       valueLiteral);
+                        break;
                     default:
                         break;
                 }

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

@@ -1,18 +1,3 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
 package software.amazon.awssdk.services.query.auth.scheme.internal;
 
 import java.util.Arrays;
@@ -35,10 +20,9 @@ public final class DefaultQueryAuthSchemeParams implements QueryAuthSchemeParams
 
     private final Boolean useFIPSEndpoint;
 
-    private final String awsAccountId;
-
+    private final String accountId;
 
-    private final String awsAccountIdEndpointMode;
+    private final String accountIdEndpointMode;
 
     private final List<String> listOfStrings;
 
@@ -65,8 +49,8 @@ private DefaultQueryAuthSchemeParams(Builder builder) {
         this.region = builder.region;
         this.useDualStackEndpoint = builder.useDualStackEndpoint;
         this.useFIPSEndpoint = builder.useFIPSEndpoint;
-        this.awsAccountId = builder.awsAccountId;
-        this.awsAccountIdEndpointMode = builder.awsAccountIdEndpointMode;
+        this.accountId = builder.accountId;
+        this.accountIdEndpointMode = builder.accountIdEndpointMode;
         this.listOfStrings = builder.listOfStrings;
         this.defaultListOfStrings = Validate.paramNotNull(builder.defaultListOfStrings, "defaultListOfStrings");
         this.endpointId = builder.endpointId;
@@ -104,13 +88,13 @@ public Boolean useFipsEndpoint() {
     }
 
     @Override
-    public String awsAccountId() {
-        return awsAccountId;
+    public String accountId() {
+        return accountId;
     }
 
     @Override
-    public String awsAccountIdEndpointMode() {
-        return awsAccountIdEndpointMode;
+    public String accountIdEndpointMode() {
+        return accountIdEndpointMode;
     }
 
     @Override
@@ -178,9 +162,9 @@ private static final class Builder implements QueryAuthSchemeParams.Builder, Que
 
         private Boolean useFIPSEndpoint;
 
-        private String awsAccountId;
+        private String accountId;
 
-        private String awsAccountIdEndpointMode;
+        private String accountIdEndpointMode;
 
         private List<String> listOfStrings;
 
@@ -210,8 +194,8 @@ private static final class Builder implements QueryAuthSchemeParams.Builder, Que
             this.region = params.region;
             this.useDualStackEndpoint = params.useDualStackEndpoint;
             this.useFIPSEndpoint = params.useFIPSEndpoint;
-            this.awsAccountId = params.awsAccountId;
-            this.awsAccountIdEndpointMode = params.awsAccountIdEndpointMode;
+            this.accountId = params.accountId;
+            this.accountIdEndpointMode = params.accountIdEndpointMode;
             this.listOfStrings = params.listOfStrings;
             this.defaultListOfStrings = params.defaultListOfStrings;
             this.endpointId = params.endpointId;
@@ -249,14 +233,14 @@ public Builder useFipsEndpoint(Boolean useFIPSEndpoint) {
         }
 
         @Override
-        public Builder awsAccountId(String awsAccountId) {
-            this.awsAccountId = awsAccountId;
+        public Builder accountId(String accountId) {
+            this.accountId = accountId;
             return this;
         }
 
         @Override
-        public Builder awsAccountIdEndpointMode(String awsAccountIdEndpointMode) {
-            this.awsAccountIdEndpointMode = awsAccountIdEndpointMode;
+        public Builder accountIdEndpointMode(String accountIdEndpointMode) {
+            this.accountIdEndpointMode = accountIdEndpointMode;
             return this;
         }