Fix failing s3 regression tests for MRAP (#6646)

* Fix failing s3 regression tests for MRAP

* Add retry on async putObject to handle flaky MRAP disconnects

Author: alextwoods

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/S3ChecksumsTestUtils.java

@@ -203,6 +203,11 @@ public static void assumeNotAccessPointWithPathStyle(UploadConfig config) {
                                 "Path style doesn't work with ARN type buckets");
     }
 
+    public static void assumeNotMRAP(UploadConfig config) {
+        Assumptions.assumeFalse(config.getBucketType().equals(BucketType.MRAP),
+                                "MRAP buckets are not supported by TransferManager.");
+    }
+
     public static String crc32(String s) {
         return crc32(s.getBytes(StandardCharsets.UTF_8));
     }

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadAsyncRegressionTesting.java

@@ -37,6 +37,7 @@
 import software.amazon.awssdk.services.s3.regression.BucketType;
 import software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils;
 import software.amazon.awssdk.services.s3.regression.TestCallable;
+import software.amazon.awssdk.testutils.retry.RetryableTest;
 import software.amazon.awssdk.utils.Logger;
 
 public class UploadAsyncRegressionTesting extends UploadStreamingRegressionTesting {
@@ -49,6 +50,7 @@ public static List<UploadConfig> testConfigs() {
     @ParameterizedTest
     @MethodSource("testConfigs")
     @Timeout(value = 120, unit = TimeUnit.SECONDS)
+    @RetryableTest(maxRetries = 3)
     void putObject(UploadConfig config) throws Exception {
         assumeNotAccessPointWithPathStyle(config);
 
@@ -79,7 +81,7 @@ void putObject(UploadConfig config) throws Exception {
         ClientOverrideConfiguration.Builder overrideConfiguration =
             ClientOverrideConfiguration.builder()
                                        .addExecutionInterceptor(recorder)
-                                       .apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
+                                       .apiCallTimeout(Duration.of(90, ChronoUnit.SECONDS));
 
         if (config.isPayloadSigning()) {
             overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());
@@ -137,5 +139,4 @@ void putObject(UploadConfig config) throws Exception {
             }
         }
     }
-
 }

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadTransferManagerRegressionTesting.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.services.s3.regression.upload;
 
 import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
+import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotMRAP;
 import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.MULTIPART_ENABLED;
 
 import java.time.Duration;
@@ -48,6 +49,7 @@ public static List<UploadConfig> testConfigs() {
     void putObject(UploadConfig config) throws Exception {
 
         assumeNotAccessPointWithPathStyle(config);
+        assumeNotMRAP(config);
 
         // For testing purposes, ContentProvider is Publisher<ByteBuffer> for async clients
         // There is no way to create AsyncRequestBody with a Publisher<ByteBuffer> and also provide the content length
@@ -99,6 +101,4 @@ void putObject(UploadConfig config) throws Exception {
             }
         }
     }
-
-
 }