Merge pull request #2919 from aws/staging/54e47974-5da3-446b-bb86-fbd…

…8825b7213

Pull request: release <- staging/54e47974-5da3-446b-bb86-fbd8825b7213

.changes/2.25.5.json

@@ -0,0 +1,72 @@
+{
+    "version": "2.25.5",
+    "date": "2024-03-07",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS S3",
+            "contributor": "",
+            "description": "Fixed the issue in S3 multipart client where the list of parts could be out of order in CompleteMultipartRequest, causing `The list of parts was not in ascending order` error to be thrown."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "Madrigal",
+            "description": "Modify ARN toString to print a valid ARN when there's no region or acountId"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "contributor": "",
+            "description": "Documentation updates for AWS Lambda"
+        },
+        {
+            "type": "feature",
+            "category": "AWS WAFV2",
+            "contributor": "",
+            "description": "You can increase the max request body inspection size for some regional resources. The size setting is in the web ACL association config. Also, the AWSManagedRulesBotControlRuleSet EnableMachineLearning setting now takes a Boolean instead of a primitive boolean type, for languages like Java."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon AppConfig",
+            "contributor": "",
+            "description": "AWS AppConfig now supports dynamic parameters, which enhance the functionality of AppConfig Extensions by allowing you to provide parameter values to your Extensions at the time you deploy your configuration."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "This release adds an optional parameter to RegisterImage and CopyImage APIs to support tagging AMIs at the time of creation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Import/Export Snowball",
+            "contributor": "",
+            "description": "Doc-only update for change to EKS-Anywhere ordering."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Managed Grafana",
+            "contributor": "",
+            "description": "Adds support for the new GrafanaToken as part of the Amazon Managed Grafana Enterprise plugins upgrade to associate your AWS account with a Grafana Labs account."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "contributor": "",
+            "description": "Updates Amazon RDS documentation for io2 storage for Multi-AZ DB clusters"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "contributor": "",
+            "description": "Added note for user decoupling"
+        },
+        {
+            "type": "feature",
+            "category": "Payment Cryptography Data Plane",
+            "contributor": "",
+            "description": "AWS Payment Cryptography EMV Decrypt Feature Release"
+        }
+    ]
+}

CHANGELOG.md

@@ -1,4 +1,54 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.25.5__ __2024-03-07__
+## __AWS Lambda__
+  - ### Features
+    - Documentation updates for AWS Lambda
+
+## __AWS S3__
+  - ### Bugfixes
+    - Fixed the issue in S3 multipart client where the list of parts could be out of order in CompleteMultipartRequest, causing `The list of parts was not in ascending order` error to be thrown.
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Modify ARN toString to print a valid ARN when there's no region or acountId
+        - Contributed by: [@Madrigal](https://github.com/Madrigal)
+
+## __AWS WAFV2__
+  - ### Features
+    - You can increase the max request body inspection size for some regional resources. The size setting is in the web ACL association config. Also, the AWSManagedRulesBotControlRuleSet EnableMachineLearning setting now takes a Boolean instead of a primitive boolean type, for languages like Java.
+
+## __Amazon AppConfig__
+  - ### Features
+    - AWS AppConfig now supports dynamic parameters, which enhance the functionality of AppConfig Extensions by allowing you to provide parameter values to your Extensions at the time you deploy your configuration.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds an optional parameter to RegisterImage and CopyImage APIs to support tagging AMIs at the time of creation.
+
+## __Amazon Import/Export Snowball__
+  - ### Features
+    - Doc-only update for change to EKS-Anywhere ordering.
+
+## __Amazon Managed Grafana__
+  - ### Features
+    - Adds support for the new GrafanaToken as part of the Amazon Managed Grafana Enterprise plugins upgrade to associate your AWS account with a Grafana Labs account.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Updates Amazon RDS documentation for io2 storage for Multi-AZ DB clusters
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - Added note for user decoupling
+
+## __Payment Cryptography Data Plane__
+  - ### Features
+    - AWS Payment Cryptography EMV Decrypt Feature Release
+
+## __Contributors__
+Special thanks to the following contributors to this release: 
+
+[@Madrigal](https://github.com/Madrigal)
 # __2.25.4__ __2024-03-06__
 ## __Amazon DynamoDB__
   - ### 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.4</version>
+      <version>2.25.5</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.4</version>
+  <version>2.25.5</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.25.4</version>
+  <version>2.25.5</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.4</version>
+  <version>2.25.5</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

buildspecs/release-to-github.yml

@@ -18,15 +18,5 @@ phases:
     - cd release
     -
     - git clone -o staging -b release $STAGING_REPOSITORY_URL .
-    - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
-    -
     - git remote add --fetch public $PUBLIC_REPOSITORY_URL
-    - |
-      if [ `git ls-remote --tags public  | grep refs/tags/$RELEASE_VERSION | wc -l` -ge "1" ]; then
-        git push public :refs/tags/$RELEASE_VERSION
-        git tag --delete $RELEASE_VERSION
-      fi
-    - git tag -a $RELEASE_VERSION -m "AWS SDK for Java v2 ($RELEASE_VERSION)"
-    -
     - git push public HEAD:release
-    - git push public $RELEASE_VERSION

bundle-logging-bridge/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</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.4</version>
+        <version>2.25.5</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

core/annotations/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/arns/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java

@@ -198,9 +198,9 @@ public String toString() {
                + ":"
                + this.service
                + ":"
-               + region
+               + (region == null ? "" : region)
                + ":"
-               + this.accountId
+               + (this.accountId == null ? "" : this.accountId)
                + ":"
                + this.resource;
     }

core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java

@@ -57,6 +57,22 @@ public void arnWithQualifiedResource_ParsesBackToString() {
         assertThat(arn.resourceAsString()).isEqualTo("myresource:foobar:1");
     }
 
+    @Test
+    public void arnWithMinimalResources_ParsesBackToString() {
+        String arnString = "arn:aws:s3:::bucket";
+        Arn arn = Arn.fromString(arnString);
+        assertThat(arn.toString()).isEqualTo(arnString);
+        assertThat(arn.resourceAsString()).isEqualTo("bucket");
+    }
+
+    @Test
+    public void arnWithoutRegion_ParsesBackToString() {
+        String arnString = "arn:aws:iam::123456789012:root";
+        Arn arn = Arn.fromString(arnString);
+        assertThat(arn.toString()).isEqualTo(arnString);
+        assertThat(arn.resourceAsString()).isEqualTo("root");
+    }
+
     @Test
     public void arnWithResourceTypeAndResource_ParsesCorrectly() {
         String arnString = "arn:aws:s3:us-east-1:12345678910:bucket:foobar";

core/auth-crt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
     </parent>
 
     <artifactId>auth-crt</artifactId>

core/auth/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/checksums-spi/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
     </parent>
 
     <artifactId>checksums-spi</artifactId>