Merge branch 'master' into bugfix/XForwardedFor

Author: millems

.changes/next-release/bugfix-AWSSDKForJavav2-e6ec911.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK For Java v2",
+    "contributor": "",
+    "description": "Set default value for credentialProvider archetype parameter."
+}

archetypes/archetype-app-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -43,6 +43,7 @@
       <validationRegex>(true|false)</validationRegex>
     </requiredProperty>
     <requiredProperty key="credentialProvider">
+      <defaultValue>default</defaultValue>
       <validationRegex>(default|identity-center)</validationRegex>
     </requiredProperty>
   </requiredProperties>

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectRetryBehaviorWiremockTest.java

@@ -162,9 +162,9 @@ public void getObject_5xxErrorResponses_shouldNotReuseInitialErrorResponseWhenLo
             .isInstanceOf(CompletionException.class)
             .hasCauseInstanceOf(S3Exception.class)
             .hasMessageNotContaining(firstRequestId)
-            .hasMessageNotContaining(String.valueOf(firstErrorStatusCode))
+            .hasMessageNotContaining("Status Code: " + firstErrorStatusCode)
             .hasMessageContaining(secondRequestId)
-            .hasMessageContaining(String.valueOf(secondErrorStatusCode));
+            .hasMessageContaining("Status Code: " + secondErrorStatusCode);
 
         verify(MAX_ATTEMPTS, getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, KEY))));
         verify(0, getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=2", BUCKET, KEY))));

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java

@@ -20,7 +20,9 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.lessThanOrExactly;
 import static com.github.tomakehurst.wiremock.client.WireMock.matching;
+import static com.github.tomakehurst.wiremock.client.WireMock.moreThan;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
@@ -220,7 +222,8 @@ public void getObject_single500WithinMany200s_shouldNotRetryError(AsyncResponseT
             assertThat(e.getCause()).isInstanceOf(S3Exception.class);
         }
 
-        verify(1, getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, errorKey))));
+        verify(moreThan(0), getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, errorKey))));
+        verify(lessThanOrExactly(2), getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, errorKey))));
     }
 
     private static Stream<Arguments> partSizeAndTransformerParams() {

services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java

@@ -109,7 +109,7 @@ public static void setup() {
             Waiter.run(() -> iam.createRole(r -> r.roleName(ROLE_NAME)
                                                   .assumeRolePolicyDocument(rolePolicyDoc)))
                   .ignoringException(MalformedPolicyDocumentException.class)
-                  .orFailAfter(Duration.ofMinutes(2));
+                  .orFailAfter(Duration.ofMinutes(4));
         } catch (EntityAlreadyExistsException e) {
             // Role already exists - awesome.
         }
@@ -129,11 +129,17 @@ public static void setup() {
         StsClient userCredentialSts = StsClient.builder()
                                                .credentialsProvider(() -> userCredentials)
                                                .build();
+
+        // Ensure the new credentials have propagated and are valid.
+        Waiter.run(userCredentialSts::getCallerIdentity)
+              .ignoringException(StsException.class)
+              .orFailAfter(Duration.ofMinutes(2));
+
         Waiter.run(() -> userCredentialSts.assumeRole(r -> r.durationSeconds(SESSION_DURATION)
                                                             .roleArn(ROLE_ARN)
                                                             .roleSessionName("Test")))
               .ignoringException(StsException.class)
-              .orFailAfter(Duration.ofMinutes(5));
+              .orFailAfter(Duration.ofMinutes(8));
     }
 
     @AfterClass