trying a new approach via retry_mode ad max_attempts

Author: Anirav Kareddy

.github/workflows/build.yml

@@ -46,7 +46,9 @@ jobs:
 
       - name: Test
         env:
-          AWS_DEFAULTS_MODE: mobile
+          AWS_DEFAULTS_MODE: standard
+          AWS_RETRY_MODE: adaptive
+          AWS_MAX_ATTEMPTS: '10'
           AWS_SDK_CLIENT_LOGGING: debug
         run: |
           export AWS_S3EC_TEST_ALT_KMS_KEY_ARN=arn:aws:kms:${{ vars.CI_AWS_REGION }}:${{ secrets.CI_AWS_ACCOUNT_ID }}:key/${{ vars.CI_ALT_KMS_KEY_ID }}

src/test/java/software/amazon/encryption/s3/S3EncryptionClientStreamTest.java

@@ -310,130 +310,126 @@ public void failsWhenBothBufferSizeAndDelayedAuthModeEnabled() {
 
     @Test
     public void customSetBufferSizeWithLargeObject() throws IOException {
-        for(int i=0; i < 10; i++) {
-            final String objectKey = appendTestSuffix("large-object-test-custom-buffer-size");
+        final String objectKey = appendTestSuffix("large-object-test-custom-buffer-size");
 
-            Security.addProvider(new BouncyCastleProvider());
-            Provider provider = Security.getProvider("BC");
+        Security.addProvider(new BouncyCastleProvider());
+        Provider provider = Security.getProvider("BC");
 
-            // V3 Client with custom max buffer size 32 MiB.
-            S3Client v3ClientWithBuffer32MiB = S3EncryptionClient.builder()
-              .aesKey(AES_KEY)
-              .cryptoProvider(provider)
-              .setBufferSize(32 * 1024 * 1024)
-              .build();
+        // V3 Client with custom max buffer size 32 MiB.
+        S3Client v3ClientWithBuffer32MiB = S3EncryptionClient.builder()
+          .aesKey(AES_KEY)
+          .cryptoProvider(provider)
+          .setBufferSize(32 * 1024 * 1024)
+          .build();
 
-            // V3 Client with default buffer size (i.e. 64MiB)
-            // When enableDelayedAuthenticationMode is set to true, delayed authentication mode always takes priority over buffered mode.
-            S3Client v3ClientWithDelayedAuth = S3EncryptionClient.builder()
-              .aesKey(AES_KEY)
-              .cryptoProvider(provider)
-              .enableDelayedAuthenticationMode(true)
-              .build();
+        // V3 Client with default buffer size (i.e. 64MiB)
+        // When enableDelayedAuthenticationMode is set to true, delayed authentication mode always takes priority over buffered mode.
+        S3Client v3ClientWithDelayedAuth = S3EncryptionClient.builder()
+          .aesKey(AES_KEY)
+          .cryptoProvider(provider)
+          .enableDelayedAuthenticationMode(true)
+          .build();
 
-            // Tight bound on the custom buffer size limit of 32MiB
-            final long fileSizeExceedingDefaultLimit = 1024 * 1024 * 32 + 1;
+        // Tight bound on the custom buffer size limit of 32MiB
+        final long fileSizeExceedingDefaultLimit = 1024 * 1024 * 32 + 1;
 
-            byte[] data = new byte[(int) fileSizeExceedingDefaultLimit];
-            for(int j=0; j < data.length; j++) {
-                data[i] = (byte) (j % 256);
-            }
-            final InputStream largeObjectStream = new ByteArrayInputStream(data);
-            v3ClientWithBuffer32MiB.putObject(PutObjectRequest.builder()
-              .bucket(BUCKET)
-              .key(objectKey)
-              .build(), RequestBody.fromInputStream(largeObjectStream, fileSizeExceedingDefaultLimit));
+        byte[] data = new byte[(int) fileSizeExceedingDefaultLimit];
+        for(int j=0; j < data.length; j++) {
+            data[i] = (byte) (j % 256);
+        }
+        final InputStream largeObjectStream = new ByteArrayInputStream(data);
+        v3ClientWithBuffer32MiB.putObject(PutObjectRequest.builder()
+          .bucket(BUCKET)
+          .key(objectKey)
+          .build(), RequestBody.fromInputStream(largeObjectStream, fileSizeExceedingDefaultLimit));
 
-            largeObjectStream.close();
+        largeObjectStream.close();
 
-            // Object is larger than Buffer, so getObject fails
-            assertThrows(S3EncryptionClientException.class, () -> v3ClientWithBuffer32MiB.getObjectAsBytes(builder -> builder
-              .bucket(BUCKET)
-              .key(objectKey)));
+        // Object is larger than Buffer, so getObject fails
+        assertThrows(S3EncryptionClientException.class, () -> v3ClientWithBuffer32MiB.getObjectAsBytes(builder -> builder
+          .bucket(BUCKET)
+          .key(objectKey)));
 
-            // You have to either enable the delayed auth mode or increase max buffer size (but in allowed bounds)
-            ResponseInputStream<GetObjectResponse> response = v3ClientWithDelayedAuth.getObject(builder -> builder
-              .bucket(BUCKET)
-              .key(objectKey));
+        // You have to either enable the delayed auth mode or increase max buffer size (but in allowed bounds)
+        ResponseInputStream<GetObjectResponse> response = v3ClientWithDelayedAuth.getObject(builder -> builder
+          .bucket(BUCKET)
+          .key(objectKey));
 
-            // Create a new ByteArrayInputStream for comparison
-            InputStream expectedStream = new ByteArrayInputStream(data);
-            assertTrue(IOUtils.contentEquals(expectedStream, response));
-            response.close();
+        // Create a new ByteArrayInputStream for comparison
+        InputStream expectedStream = new ByteArrayInputStream(data);
+        assertTrue(IOUtils.contentEquals(expectedStream, response));
+        response.close();
 
-            // Cleanup
-            deleteObject(BUCKET, objectKey, v3ClientWithBuffer32MiB);
-            v3ClientWithBuffer32MiB.close();
-            v3ClientWithDelayedAuth.close();
-        }
+        // Cleanup
+        deleteObject(BUCKET, objectKey, v3ClientWithBuffer32MiB);
+        v3ClientWithBuffer32MiB.close();
+        v3ClientWithDelayedAuth.close();
     }
 
     @Test
     public void customSetBufferSizeWithLargeObjectAsyncClient() throws IOException {
-        for(int i=0; i < 10;i++) {
-            final String objectKey = appendTestSuffix("large-object-test-custom-buffer-size-async");
+        final String objectKey = appendTestSuffix("large-object-test-custom-buffer-size-async");
 
-            Security.addProvider(new BouncyCastleProvider());
-            Provider provider = Security.getProvider("BC");
+        Security.addProvider(new BouncyCastleProvider());
+        Provider provider = Security.getProvider("BC");
 
-            // V3 Client with custom max buffer size 32 MiB.
-            S3AsyncClient v3ClientWithBuffer32MiB = S3AsyncEncryptionClient.builder()
-              .aesKey(AES_KEY)
-              .cryptoProvider(provider)
-              .setBufferSize(32 * 1024 * 1024)
-              .build();
-
-            // V3 Client with default buffer size (i.e. 64MiB)
-            // When enableDelayedAuthenticationMode is set to true, delayed authentication mode always takes priority over buffered mode.
-            S3AsyncClient v3ClientWithDelayedAuth = S3AsyncEncryptionClient.builder()
-              .aesKey(AES_KEY)
-              .cryptoProvider(provider)
-              .enableDelayedAuthenticationMode(true)
-              .build();
+        // V3 Client with custom max buffer size 32 MiB.
+        S3AsyncClient v3ClientWithBuffer32MiB = S3AsyncEncryptionClient.builder()
+          .aesKey(AES_KEY)
+          .cryptoProvider(provider)
+          .setBufferSize(32 * 1024 * 1024)
+          .build();
 
-            // Tight bound on the custom buffer size limit of 32MiB
-            final long fileSizeExceedingDefaultLimit = 1024 * 1024 * 32 + 1;
-            byte[] data = new byte[(int) fileSizeExceedingDefaultLimit];
-            for(int j=0; j < data.length; j++) {
-                data[i] = (byte) (j % 256);
-            }
-            final InputStream largeObjectStream = new ByteArrayInputStream(data);
-            ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
-            CompletableFuture<PutObjectResponse> futurePut = v3ClientWithBuffer32MiB.putObject(PutObjectRequest.builder()
-              .bucket(BUCKET)
-              .key(objectKey)
-              .build(), AsyncRequestBody.fromInputStream(largeObjectStream, fileSizeExceedingDefaultLimit, singleThreadExecutor));
+        // V3 Client with default buffer size (i.e. 64MiB)
+        // When enableDelayedAuthenticationMode is set to true, delayed authentication mode always takes priority over buffered mode.
+        S3AsyncClient v3ClientWithDelayedAuth = S3AsyncEncryptionClient.builder()
+          .aesKey(AES_KEY)
+          .cryptoProvider(provider)
+          .enableDelayedAuthenticationMode(true)
+          .build();
 
-            futurePut.join();
-            largeObjectStream.close();
-            singleThreadExecutor.shutdown();
+        // Tight bound on the custom buffer size limit of 32MiB
+        final long fileSizeExceedingDefaultLimit = 1024 * 1024 * 32 + 1;
+        byte[] data = new byte[(int) fileSizeExceedingDefaultLimit];
+        for(int j=0; j < data.length; j++) {
+            data[i] = (byte) (j % 256);
+        }
+        final InputStream largeObjectStream = new ByteArrayInputStream(data);
+        ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
+        CompletableFuture<PutObjectResponse> futurePut = v3ClientWithBuffer32MiB.putObject(PutObjectRequest.builder()
+          .bucket(BUCKET)
+          .key(objectKey)
+          .build(), AsyncRequestBody.fromInputStream(largeObjectStream, fileSizeExceedingDefaultLimit, singleThreadExecutor));
 
-            try {
-                // Object is larger than Buffer, so getObject fails
-                CompletableFuture<ResponseInputStream<GetObjectResponse>> futureResponse = v3ClientWithBuffer32MiB.getObject(builder -> builder
-                  .bucket(BUCKET)
-                  .key(objectKey), AsyncResponseTransformer.toBlockingInputStream());
-                futureResponse.join();
-            } catch (CompletionException e) {
-                assertEquals(S3EncryptionClientException.class, e.getCause().getClass());
-            }
+        futurePut.join();
+        largeObjectStream.close();
+        singleThreadExecutor.shutdown();
 
-            // You have to either enable the delayed auth mode or increase max buffer size (but in allowed bounds)
-            CompletableFuture<ResponseInputStream<GetObjectResponse>> futureGet = v3ClientWithDelayedAuth.getObject(builder -> builder
+        try {
+            // Object is larger than Buffer, so getObject fails
+            CompletableFuture<ResponseInputStream<GetObjectResponse>> futureResponse = v3ClientWithBuffer32MiB.getObject(builder -> builder
               .bucket(BUCKET)
               .key(objectKey), AsyncResponseTransformer.toBlockingInputStream());
-            ResponseInputStream<GetObjectResponse> output = futureGet.join();
+            futureResponse.join();
+        } catch (CompletionException e) {
+            assertEquals(S3EncryptionClientException.class, e.getCause().getClass());
+        }
+
+        // You have to either enable the delayed auth mode or increase max buffer size (but in allowed bounds)
+        CompletableFuture<ResponseInputStream<GetObjectResponse>> futureGet = v3ClientWithDelayedAuth.getObject(builder -> builder
+          .bucket(BUCKET)
+          .key(objectKey), AsyncResponseTransformer.toBlockingInputStream());
+        ResponseInputStream<GetObjectResponse> output = futureGet.join();
 
-            ByteArrayInputStream expectedStream = new ByteArrayInputStream(data);
-            assertTrue(IOUtils.contentEquals(expectedStream, output));
+        ByteArrayInputStream expectedStream = new ByteArrayInputStream(data);
+        assertTrue(IOUtils.contentEquals(expectedStream, output));
 
-            output.close();
+        output.close();
 
-            // Cleanup
-            deleteObject(BUCKET, objectKey, v3ClientWithBuffer32MiB);
-            v3ClientWithBuffer32MiB.close();
-            v3ClientWithDelayedAuth.close();
-        }
+        // Cleanup
+        deleteObject(BUCKET, objectKey, v3ClientWithBuffer32MiB);
+        v3ClientWithBuffer32MiB.close();
+        v3ClientWithDelayedAuth.close();
     }
 
     @Test