Merge branch 'master' into dongie/2.37-bump

Author: zoewangg

.changes/next-release/bugfix-AWSSDKforJavav2-f2b4df4.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Add support for payload signing of async streaming requests signed with SigV4 using default `AwsV4HttpSigner` (using `AwsV4HttpSigner.create()`). Note, requests using the `http` URI scheme will not be signed regardless of the value of `AwsV4FamilyHttpSigner.PAYLOAD_SIGNING_ENABLED` to remain consistent with existing behavior. This may change in a future release."
+}

.changes/next-release/feature-AWSSDKforJavav2-aa60cd3.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon S3",
+    "contributor": "",
+    "description": "Implemented business metrics tracking for S3_Express_Bucket (featureID \"J\") through User-Agent header."
+}

.changes/next-release/feature-AWSSDKforJavav2-c120920.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Adds business metrics for flexible checksum algorithms and configurations"
+}

.github/workflows/s3-regression-tests.yml

@@ -1,6 +1,7 @@
 name: S3 Regression Tests
 on:
   pull_request:
+    types: [ opened, synchronize, reopened, labeled, unlabeled ]
   merge_group:
   push:
     branches:
@@ -14,7 +15,7 @@ jobs:
     if: github.repository == 'aws/aws-sdk-java-v2'
     runs-on: ubuntu-latest
     outputs:
-      has_s3_related_changes: ${{ steps.check-changes.outputs.has_s3_related_changes }}
+      run_tests: ${{ contains(github.event.pull_request.labels.*.name, 'force-s3-regression-tests') || steps.check-changes.outputs.has_s3_related_changes }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -40,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: DownloadStreamingRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -61,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: ControlPlaneOperationRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -82,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadSyncRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -103,7 +104,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadAsyncRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -124,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadCrtRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -145,7 +146,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadTransferManagerRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

@@ -302,14 +302,12 @@
     </Match>
 
     <!-- Retrieves and updates crc value in update() -->
-     <Match>
-         <Or>
-             <Class name="software.amazon.awssdk.checksums.internal.SdkCrc32CChecksum"/>
-             <Class name="software.amazon.awssdk.checksums.internal.SdkCrc32Checksum"/>
-             <Class name="software.amazon.awssdk.core.internal.checksums.factory.SdkCrc32C"/>
-             <Class name="software.amazon.awssdk.core.internal.checksums.factory.SdkCrc32"/>
-         </Or>
-         <Bug pattern="SA_FIELD_SELF_ASSIGNMENT"/>
+    <Match>
+        <Or>
+            <Class name="software.amazon.awssdk.checksums.internal.SdkCrc32CChecksum"/>
+            <Class name="software.amazon.awssdk.checksums.internal.SdkCrc32Checksum"/>
+        </Or>
+        <Bug pattern="SA_FIELD_SELF_ASSIGNMENT"/>
     </Match>
 
     <!-- Suppress existing blocking call. -->

buildspecs/build.yml

@@ -16,6 +16,7 @@ phases:
       - echo $MAVEN_OPTIONS
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
+          set -e
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P mock-tests

buildspecs/integ-test.yml

@@ -12,6 +12,7 @@ phases:
     commands:
       - |
         if [ ! -z "$INTEGRATION_TEST_ROLE_ARN" ]; then
+          set -e
           ASSUME_ROLE_OUTPUT=`aws sts assume-role --role-arn "$INTEGRATION_TEST_ROLE_ARN" --role-session-name "integration-tests" --duration-seconds 7200 --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text`
           AWS_ACCESS_KEY_ID=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $1 }'`
           AWS_SECRET_ACCESS_KEY=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $2 }'`
@@ -24,6 +25,7 @@ phases:
       - echo $MAVEN_OPTIONS
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
+          set -e
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P integ-tests

buildspecs/on-demand-integ-test.yml

@@ -12,6 +12,7 @@ phases:
       - echo $JAVA_VERSION
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
+          set -e
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P integ-tests

buildspecs/release-to-maven-central.yml

@@ -24,6 +24,7 @@ phases:
       - ARTIFACT_URL="https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java/$RELEASE_VERSION/"
       - |
         if ! curl -f --head $ARTIFACT_URL; then
+          set -e
           SONATYPE_USERNAME=`aws secretsmanager get-secret-value --secret-id $SONATYPE_USERNAME_ARN --query SecretString --output text`
           SONATYPE_PASSWORD=`aws secretsmanager get-secret-value --secret-id $SONATYPE_PASSWORD_ARN --query SecretString --output text`
           SDK_SIGNING_GPG_KEYNAME=`aws secretsmanager get-secret-value --secret-id $SDK_SIGNING_GPG_KEYNAME_ARN --query SecretString --output text`

buildspecs/release-to-maven.yml

@@ -24,6 +24,7 @@ phases:
       - SONATYPE_URL="https://aws.oss.sonatype.org/service/local/repositories/releases/content/software/amazon/awssdk/aws-sdk-java/$RELEASE_VERSION/"
       - |
         if ! curl -f --head $SONATYPE_URL; then
+          set -e
           SONATYPE_USERNAME=`aws secretsmanager get-secret-value --secret-id $SONATYPE_USERNAME_ARN --query SecretString --output text`
           SONATYPE_PASSWORD=`aws secretsmanager get-secret-value --secret-id $SONATYPE_PASSWORD_ARN --query SecretString --output text`
           SDK_SIGNING_GPG_KEYNAME=`aws secretsmanager get-secret-value --secret-id $SDK_SIGNING_GPG_KEYNAME_ARN --query SecretString --output text`