remove bucket accelerate config

Author: L-Applin

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

@@ -34,7 +34,6 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.BucketAccelerateStatus;
 import software.amazon.awssdk.services.s3.model.BucketLocationConstraint;
 import software.amazon.awssdk.services.s3.model.CreateBucketConfiguration;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
@@ -62,8 +61,6 @@ private S3ChecksumsTestUtils() {
     public static String createBucket(S3Client s3, String name, Logger log) {
         log.debug(() -> "Creating bucket: " + name);
         createBucket(s3, name, 3, log);
-        s3.putBucketAccelerateConfiguration(r -> r.bucket(name)
-                                                  .accelerateConfiguration(c -> c.status(BucketAccelerateStatus.ENABLED)));
         return name;
     }
 
@@ -193,22 +190,6 @@ public static void assumeNotAccessPointWithPathStyle(TestConfig config) {
                                 "Path style doesn't work with ARN type buckets");
     }
 
-    public static void assumeNotAccelerateWithPathStyle(TestConfig config) {
-        Assumptions.assumeFalse(config.isForcePathStyle() && config.isAccelerateEnabled(),
-                                "Path style doesn't work with Accelerate");
-    }
-
-    public static void assumeNotAccelerateWithArnType(TestConfig config) {
-        Assumptions.assumeFalse(config.isAccelerateEnabled() && config.getBucketType().isArnType(),
-                                "Accelerate doesn't work with ARN buckets");
-    }
-
-    public static void assumeNotAccelerateWithEoz(TestConfig config) {
-        Assumptions.assumeFalse(config.isAccelerateEnabled() && config.getBucketType() == BucketType.EOZ,
-                                "Accelerate is not supported with Express One Zone");
-    }
-
-
     public static String crc32(String s) {
         return crc32(s.getBytes(StandardCharsets.UTF_8));
     }
@@ -245,7 +226,6 @@ public static S3Client makeSyncClient(TestConfig config, Region region, AwsCrede
                                .requestChecksumCalculation(config.getRequestChecksumValidation())
                                .region(region)
                                .credentialsProvider(provider)
-                               .accelerate(config.isAccelerateEnabled())
                                .build();
             default:
                 throw new RuntimeException("Unsupported sync flavor: " + config.getFlavor());
@@ -260,15 +240,13 @@ public static S3AsyncClient makeAsyncClient(TestConfig config, Region region, Aw
                                     .requestChecksumCalculation(config.getRequestChecksumValidation())
                                     .region(region)
                                     .credentialsProvider(provider)
-                                    .accelerate(config.isAccelerateEnabled())
                                     .build();
             case MULTIPART_ENABLED:
                 return S3AsyncClient.builder()
                                     .forcePathStyle(config.isForcePathStyle())
                                     .requestChecksumCalculation(config.getRequestChecksumValidation())
                                     .region(region)
                                     .credentialsProvider(provider)
-                                    .accelerate(config.isAccelerateEnabled())
                                     .multipartEnabled(true)
                                     .build();
             case CRT_BASED: {
@@ -277,7 +255,6 @@ public static S3AsyncClient makeAsyncClient(TestConfig config, Region region, Aw
                                     .requestChecksumCalculation(config.getRequestChecksumValidation())
                                     .region(region)
                                     .credentialsProvider(provider)
-                                    .accelerate(config.isAccelerateEnabled())
                                     .build();
             }
             default:
@@ -295,7 +272,6 @@ public static S3Client makeSyncClient(TestConfig config, ClientOverrideConfigura
                                .requestChecksumCalculation(config.getRequestChecksumValidation())
                                .region(region)
                                .credentialsProvider(provider)
-                               .accelerate(config.isAccelerateEnabled())
                                .build();
             default:
                 throw new RuntimeException("Unsupported sync flavor: " + config.getFlavor());
@@ -312,7 +288,6 @@ public static S3AsyncClient makeAsyncClient(TestConfig config, ClientOverrideCon
                                     .requestChecksumCalculation(config.getRequestChecksumValidation())
                                     .region(region)
                                     .credentialsProvider(provider)
-                                    .accelerate(config.isAccelerateEnabled())
                                     .build();
             case MULTIPART_ENABLED:
                 return S3AsyncClient.builder()
@@ -321,7 +296,6 @@ public static S3AsyncClient makeAsyncClient(TestConfig config, ClientOverrideCon
                                     .requestChecksumCalculation(config.getRequestChecksumValidation())
                                     .region(region)
                                     .credentialsProvider(provider)
-                                    .accelerate(config.isAccelerateEnabled())
                                     .multipartEnabled(true)
                                     .build();
             case CRT_BASED: {
@@ -330,7 +304,6 @@ public static S3AsyncClient makeAsyncClient(TestConfig config, ClientOverrideCon
                                     .requestChecksumCalculation(config.getRequestChecksumValidation())
                                     .region(region)
                                     .credentialsProvider(provider)
-                                    .accelerate(config.isAccelerateEnabled())
                                     .build();
             }
             default:

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

@@ -24,7 +24,6 @@ public class TestConfig {
     private BucketType bucketType;
     private boolean forcePathStyle;
     private RequestChecksumCalculation requestChecksumValidation;
-    private boolean accelerateEnabled;
 
     public S3ClientFlavor getFlavor() {
         return flavor;
@@ -58,22 +57,13 @@ public void setRequestChecksumValidation(RequestChecksumCalculation requestCheck
         this.requestChecksumValidation = requestChecksumValidation;
     }
 
-    public boolean isAccelerateEnabled() {
-        return accelerateEnabled;
-    }
-
-    public void setAccelerateEnabled(boolean accelerateEnabled) {
-        this.accelerateEnabled = accelerateEnabled;
-    }
-
     @Override
     public String toString() {
         return "[" +
                "flavor=" + flavor +
                ", bucketType=" + bucketType +
                ", forcePathStyle=" + forcePathStyle +
                ", requestChecksumValidation=" + requestChecksumValidation +
-               ", accelerateEnabled=" + accelerateEnabled +
                ']';
     }
 
@@ -83,20 +73,16 @@ public static List<TestConfig> testConfigs() {
         boolean[] forcePathStyle = {true, false};
         RequestChecksumCalculation[] checksumValidations = {RequestChecksumCalculation.WHEN_REQUIRED,
                                                             RequestChecksumCalculation.WHEN_SUPPORTED};
-        boolean[] accelerateEnabled = {true, false};
         for (boolean pathStyle : forcePathStyle) {
             for (RequestChecksumCalculation checksumValidation : checksumValidations) {
                 for (S3ClientFlavor flavor : S3ClientFlavor.values()) {
                     for (BucketType bucketType : BucketType.values()) {
-                        for (boolean accelerate : accelerateEnabled) {
-                            TestConfig testConfig = new TestConfig();
-                            testConfig.setFlavor(flavor);
-                            testConfig.setBucketType(bucketType);
-                            testConfig.setForcePathStyle(pathStyle);
-                            testConfig.setRequestChecksumValidation(checksumValidation);
-                            testConfig.setAccelerateEnabled(accelerate);
-                            configs.add(testConfig);
-                        }
+                        TestConfig testConfig = new TestConfig();
+                        testConfig.setFlavor(flavor);
+                        testConfig.setBucketType(bucketType);
+                        testConfig.setForcePathStyle(pathStyle);
+                        testConfig.setRequestChecksumValidation(checksumValidation);
+                        configs.add(testConfig);
                     }
                 }
             }