Cleaning up integration tests

Author: spfink

services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAccelerateIntegrationTest.java

@@ -24,6 +24,9 @@
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.model.AccelerateConfiguration;
@@ -49,10 +52,6 @@
 /**
  * Integration tests for S3 bucket accelerate configuration.
  */
-// TODO: "These tests are a bit flaky. Looks like S3 returns 307 Temporary Redirect occasionally
-// for a newly accelerated bucket. Not sure what the right fix is without following redirects
-// which we don't want to do for other reasons.
-@Ignore
 public class BucketAccelerateIntegrationTest extends S3IntegrationTestBase {
 
     private static final String US_BUCKET_NAME = temporaryBucketName("s3-accelerate-us-east-1");
@@ -70,6 +69,7 @@ public static void setup() throws Exception {
                                    .serviceConfiguration(S3Configuration.builder()
                                                                         .accelerateModeEnabled(true)
                                                                         .build())
+                                   .overrideConfiguration(o -> o.addExecutionInterceptor(new AccelerateValidatingInterceptor()))
                                    .build();
 
         setUpBuckets();
@@ -84,47 +84,6 @@ private static void setUpBuckets() {
         createBucket(US_BUCKET_NAME);
     }
 
-    @Test
-    public void testControlPlaneOperationsUnderAccelerateMode() throws Exception {
-        enableAccelerateOnBucket();
-
-        Tagging tags = Tagging.builder()
-                              .tagSet(Tag.builder()
-                                         .key("foo")
-                                         .value("bar")
-                                         .build())
-                              .build();
-
-        accelerateClient.putBucketTagging(PutBucketTaggingRequest.builder().bucket(US_BUCKET_NAME).tagging(tags).build());
-        accelerateClient.putBucketVersioning(PutBucketVersioningRequest.builder()
-                                                                       .bucket(US_BUCKET_NAME)
-                                                                       .versioningConfiguration(
-                                                                           VersioningConfiguration.builder()
-                                                                                                  .status("Enabled")
-                                                                                                  .build())
-                                                                       .build());
-
-        // Retry a couple of times due to eventual consistency
-        RetryableAssertion.doRetryableAssert(new AssertCallable() {
-            @Override
-            public void doAssert() {
-                List<Tag> taggingConfiguration = accelerateClient
-                    .getBucketTagging(GetBucketTaggingRequest.builder().bucket(US_BUCKET_NAME).build()).tagSet();
-
-                assertEquals("foo", taggingConfiguration.get(0).key());
-                assertEquals("bar", taggingConfiguration.get(0).value());
-            }
-        }, new RetryableParams().withMaxAttempts(30).withDelayInMs(200));
-
-        assertEquals(BucketVersioningStatus.ENABLED,
-                     accelerateClient.getBucketVersioning(GetBucketVersioningRequest.builder()
-                                                                                    .bucket(US_BUCKET_NAME)
-                                                                                    .build())
-                                     .status());
-
-        accelerateClient.deleteBucketTagging(DeleteBucketTaggingRequest.builder().bucket(US_BUCKET_NAME).build());
-    }
-
     @Test
     public void testUpdateAccelerateConfiguration() throws InterruptedException {
 
@@ -166,11 +125,15 @@ public void testAccelerateEndpoint() throws Exception {
 
         // PutObject
         File uploadFile = new RandomTempFile(KEY_NAME, 1000);
-        accelerateClient.putObject(PutObjectRequest.builder()
-                                                   .bucket(US_BUCKET_NAME)
-                                                   .key(KEY_NAME)
-                                                   .build(),
-                                   RequestBody.fromFile(uploadFile));
+        try {
+            accelerateClient.putObject(PutObjectRequest.builder()
+                                                       .bucket(US_BUCKET_NAME)
+                                                       .key(KEY_NAME)
+                                                       .build(),
+                                       RequestBody.fromFile(uploadFile));
+        } catch (Exception e) {
+            // We really only need to verify the request is using the accelerate endpoint
+        }
     }
 
     private void enableAccelerateOnBucket() throws InterruptedException {
@@ -204,4 +167,14 @@ public void testUnsupportedOperationsUnderAccelerateMode() {
             //fail("Exception is not expected!");
         }
     }
+
+    private static final class AccelerateValidatingInterceptor implements ExecutionInterceptor {
+
+        @Override
+        public void beforeTransmission(Context.BeforeTransmission context, ExecutionAttributes executionAttributes) {
+        if (!(context.request() instanceof ListBucketsRequest)) {
+            assertEquals(context.httpRequest().host(), US_BUCKET_NAME + ".s3-accelerate.amazonaws.com");
+        }
+        }
+    }
 }

services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadLargeObjectIntegrationTest.java

@@ -28,7 +28,6 @@
 import software.amazon.awssdk.testutils.RandomTempFile;
 import software.amazon.awssdk.utils.IoUtils;
 
-@Ignore("The tests are intended to run manually as it can take a relatively long time")
 public class UploadLargeObjectIntegrationTest extends S3IntegrationTestBase {
 
     private static final String BUCKET = temporaryBucketName(UploadLargeObjectIntegrationTest.class);
@@ -51,13 +50,13 @@ public static void tearDownFixture() {
     }
 
     @Test
-    public void syncPutLargeObject() throws Exception {
+    public void syncPutLargeObject() {
         s3.putObject(b -> b.bucket(BUCKET).key(SYNC_KEY), file.toPath());
         verifyResponse(SYNC_KEY);
     }
 
     @Test
-    public void asyncPutLargeObject() throws Exception {
+    public void asyncPutLargeObject() {
         s3Async.putObject(b -> b.bucket(BUCKET).key(ASYNC_KEY), file.toPath()).join();
         verifyResponse(ASYNC_KEY);
     }