retry

Author: rishav-karanjit

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

@@ -65,7 +65,7 @@ public static void setUp() throws NoSuchAlgorithmException {
      * Test AES keyring with null additionalDecryptionKeyMaterial map.
      * This tests the default behavior when no additional key material is provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testAesKeyringWithNullAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("aes-null-additional-key-material");
         final String input = "AES with null additional key material";
@@ -129,7 +129,7 @@ public void testAesKeyringWithNullAdditionalKeyMaterial() {
      * Test AES keyring with empty additionalDecryptionKeyMaterial map.
      * This tests the behavior when an empty map is provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testAesKeyringWithEmptyAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("aes-empty-additional-key-material");
         final String input = "AES with empty additional key material";
@@ -194,7 +194,7 @@ public void testAesKeyringWithEmptyAdditionalKeyMaterial() {
      * Test AES keyring with a singleton additionalDecryptionKeyMaterial map.
      * This tests the behavior when a single additional key material is provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testAesKeyringWithSingletonAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("aes-singleton-additional-key-material");
         final String input = "AES with singleton additional key material";
@@ -265,7 +265,7 @@ public void testAesKeyringWithSingletonAdditionalKeyMaterial() {
      * Test AES keyring with multiple entries in the additionalDecryptionKeyMaterial map.
      * This tests the behavior when multiple additional key materials are provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testAesKeyringWithMultipleAdditionalKeyMaterials() {
         final String objectKey = appendTestSuffix("aes-multiple-additional-key-materials");
         final String input = "AES with multiple additional key materials";
@@ -348,7 +348,7 @@ public void testAesKeyringWithMultipleAdditionalKeyMaterials() {
      * Test AES keyring with additionalDecryptionKeyMaterial that doesn't match.
      * This tests the behavior when no matching key material is found and it should fall back to the default key.
      */
-    @Test
+    @RetryingTest(3)
     public void testAesKeyringWithNonMatchingAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("aes-non-matching-additional-key-material");
         final String input = "AES with non-matching additional key material";
@@ -423,7 +423,7 @@ public void testAesKeyringWithNonMatchingAdditionalKeyMaterial() {
      * Test AES keyring with additionalDecryptionKeyMaterial that doesn't match and a wrong default key.
      * This tests the behavior when no matching key material is found and the default key is also wrong.
      */
-    @Test
+    @RetryingTest(3)
     public void testAesKeyringWithNonMatchingAdditionalKeyMaterialAndWrongDefaultKey() {
         final String objectKey = appendTestSuffix("aes-non-matching-additional-key-material-wrong-default");
         final String input = "AES with non-matching additional key material and wrong default key";
@@ -494,7 +494,7 @@ public void testAesKeyringWithNonMatchingAdditionalKeyMaterialAndWrongDefaultKey
      * Test RSA keyring with null additionalDecryptionKeyMaterial map.
      * This tests the default behavior when no additional key material is provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testRsaKeyringWithNullAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("rsa-null-additional-key-material");
         final String input = "RSA with null additional key material";
@@ -564,7 +564,7 @@ public void testRsaKeyringWithNullAdditionalKeyMaterial() {
      * Test RSA keyring with empty additionalDecryptionKeyMaterial map.
      * This tests the behavior when an empty map is provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testRsaKeyringWithEmptyAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("rsa-empty-additional-key-material");
         final String input = "RSA with empty additional key material";
@@ -635,7 +635,7 @@ public void testRsaKeyringWithEmptyAdditionalKeyMaterial() {
      * Test RSA keyring with a singleton additionalDecryptionKeyMaterial map.
      * This tests the behavior when a single additional key material is provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testRsaKeyringWithSingletonAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("rsa-singleton-additional-key-material");
         final String input = "RSA with singleton additional key material";
@@ -715,7 +715,7 @@ public void testRsaKeyringWithSingletonAdditionalKeyMaterial() {
      * Test RSA keyring with multiple entries in the additionalDecryptionKeyMaterial map.
      * This tests the behavior when multiple additional key materials are provided.
      */
-    @Test
+    @RetryingTest(3)
     public void testRsaKeyringWithMultipleAdditionalKeyMaterials() {
         final String objectKey = appendTestSuffix("rsa-multiple-additional-key-materials");
         final String input = "RSA with multiple additional key materials";
@@ -810,7 +810,7 @@ public void testRsaKeyringWithMultipleAdditionalKeyMaterials() {
      * Test RSA keyring with additionalDecryptionKeyMaterial that doesn't match.
      * This tests the behavior when no matching key material is found and it should fall back to the default key.
      */
-    @Test
+    @RetryingTest(3)
     public void testRsaKeyringWithNonMatchingAdditionalKeyMaterial() {
         final String objectKey = appendTestSuffix("rsa-non-matching-additional-key-material");
         final String input = "RSA with non-matching additional key material";
@@ -894,7 +894,7 @@ public void testRsaKeyringWithNonMatchingAdditionalKeyMaterial() {
      * Test RSA keyring with additionalDecryptionKeyMaterial that doesn't match and a wrong default key.
      * This tests the behavior when no matching key material is found and the default key is also wrong.
      */
-    @Test
+    @RetryingTest(3)
     public void testRsaKeyringWithNonMatchingAdditionalKeyMaterialAndWrongDefaultKey() {
         final String objectKey = appendTestSuffix("rsa-non-matching-additional-key-material-wrong-default");
         final String input = "RSA with non-matching additional key material and wrong default key";

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

@@ -30,7 +30,7 @@ public static void setUp() throws NoSuchAlgorithmException {
         AES_KEY = keyGen.generateKey();
     }
 
-    @Test
+    @RetryingTest(3)
     public void contentEncryptionDowngradeAttackFails() {
         final String objectKey = appendTestSuffix("content-downgrade-attack-fails");
         S3Client s3Client = S3EncryptionClient.builderV4()
@@ -74,7 +74,7 @@ public void contentEncryptionDowngradeAttackFails() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void keyWrapRemovalAttackFails() {
         final String objectKey = appendTestSuffix("keywrap-removal-attack-fails");
         S3Client s3Client = S3EncryptionClient.builderV4()
@@ -116,7 +116,7 @@ public void keyWrapRemovalAttackFails() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void keyWrapDowngradeAesWrapAttackFails() {
         final String objectKey = appendTestSuffix("keywrap-downgrade-aeswrap-attack-fails");
         S3Client s3Client = S3EncryptionClient.builderV4()
@@ -159,7 +159,7 @@ public void keyWrapDowngradeAesWrapAttackFails() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void keyWrapDowngradeAesAttackFails() {
         final String objectKey = appendTestSuffix("keywrap-downgrade-aes-attack-fails");
         S3Client s3Client = S3EncryptionClient.builderV4()

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

@@ -96,7 +96,7 @@ public static void setUp() throws NoSuchAlgorithmException {
         PROVIDER = Security.getProvider("BC");
     }
 
-    @Test
+    @RetryingTest(3)
     public void asyncCustomConfiguration() {
         final String objectKey = appendTestSuffix("wrapped-s3-client-with-custom-credentials-async");
 
@@ -145,7 +145,7 @@ public void asyncCustomConfiguration() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void asyncTopLevelConfigurationAllOptions() {
         final String objectKey = appendTestSuffix("async-top-level-all-options");
         AwsCredentialsProvider creds = DefaultCredentialsProvider.create();
@@ -192,7 +192,7 @@ public void asyncTopLevelConfigurationAllOptions() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void asyncTopLevelConfiguration() {
         final String objectKey = appendTestSuffix("wrapped-s3-client-with-top-level-credentials-async");
 
@@ -225,7 +225,7 @@ public void asyncTopLevelConfiguration() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncEncryptionClientTopLevelAlternateCredentials() {
         final String objectKey = appendTestSuffix("wrapped-s3-async-client-with-top-level-alternate-credentials");
         final String input = "S3EncryptionClientTopLevelAlternateCredsTest";
@@ -279,7 +279,7 @@ public void s3AsyncEncryptionClientTopLevelAlternateCredentials() {
         s3ClientAltCreds.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncEncryptionClientMixedCredentials() {
         final String objectKey = appendTestSuffix("wrapped-s3-client-with-mixed-credentials");
         final String input = "S3EncryptionClientTopLevelAlternateCredsTest";
@@ -321,7 +321,7 @@ public void s3AsyncEncryptionClientMixedCredentials() {
         kmsClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void asyncTopLevelConfigurationWrongRegion() {
         final String objectKey = appendTestSuffix("wrapped-s3-client-with-wrong-region-credentials-async");
 
@@ -349,7 +349,7 @@ public void asyncTopLevelConfigurationWrongRegion() {
         }
     }
 
-    @Test
+    @RetryingTest(3)
     public void asyncTopLevelConfigurationNullCreds() {
         final String objectKey = appendTestSuffix("wrapped-s3-client-with-null-credentials-async");
 
@@ -377,7 +377,7 @@ public void asyncTopLevelConfigurationNullCreds() {
         }
     }
 
-    @Test
+    @RetryingTest(3)
     public void putAsyncGetDefault() {
         final String objectKey = appendTestSuffix("put-async-get-default");
 
@@ -410,7 +410,7 @@ public void putAsyncGetDefault() {
         s3AsyncClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void putDefaultGetAsync() {
         final String objectKey = appendTestSuffix("put-default-get-async");
 
@@ -443,7 +443,7 @@ public void putDefaultGetAsync() {
         s3AsyncClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void putAsyncGetAsync() {
         final String objectKey = appendTestSuffix("put-async-get-async");
 
@@ -473,7 +473,7 @@ public void putAsyncGetAsync() {
         s3AsyncClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void aesCbcV1toV3Async() {
         final String objectKey = appendTestSuffix("aes-cbc-v1-to-v3-async");
 
@@ -512,7 +512,7 @@ public void aesCbcV1toV3Async() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void failAesCbcV1toV3AsyncWhenDisabled() {
         final String objectKey = appendTestSuffix("fail-aes-cbc-v1-to-v3-async-when-disabled");
 
@@ -549,7 +549,7 @@ public void failAesCbcV1toV3AsyncWhenDisabled() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void AsyncAesGcmV2toV3WithInstructionFile() {
         final String objectKey = appendTestSuffix("async-aes-gcm-v2-to-v3-with-instruction-file");
 
@@ -588,7 +588,7 @@ public void AsyncAesGcmV2toV3WithInstructionFile() {
         s3AsyncClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void deleteObjectWithInstructionFileSuccessAsync() {
         final String objectKey = appendTestSuffix("async-delete-object-with-instruction-file");
 
@@ -631,7 +631,7 @@ public void deleteObjectWithInstructionFileSuccessAsync() {
         defaultClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void deleteObjectsWithInstructionFilesSuccessAsync() {
         final String[] objectKeys = {appendTestSuffix("async-delete-object-with-instruction-file-1"),
                 appendTestSuffix("async-delete-object-with-instruction-file-2"),
@@ -680,7 +680,7 @@ public void deleteObjectsWithInstructionFilesSuccessAsync() {
         defaultClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void deleteObjectWithWrongObjectKeySuccessAsync() {
         // V3 Client
         S3AsyncClient s3Client = S3AsyncEncryptionClient.builderV4()
@@ -692,7 +692,7 @@ public void deleteObjectWithWrongObjectKeySuccessAsync() {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void copyObjectTransparentlyAsync() {
         final String objectKey = appendTestSuffix("copy-object-from-here-async");
         final String newObjectKey = appendTestSuffix("copy-object-to-here-async");
@@ -741,7 +741,7 @@ public void copyObjectTransparentlyAsync() {
      * to be logged when debug logging is enabled.
      * @throws IOException
      */
-    @Test
+    @RetryingTest(3)
     public void tinyBufferTest() throws IOException {
         // BouncyCastle actually returns null buffers, unlike ACCP and SunJCE, which return empty buffers
         Security.addProvider(new BouncyCastleProvider());
@@ -781,7 +781,7 @@ public void tinyBufferTest() throws IOException {
         exec.shutdown();
     }
 
-    @Test
+    @RetryingTest(3)
     public void testAsyncInstructionFileConfig() {
         final String objectKey = appendTestSuffix("async-instruction-file-config");
         final String input = "SimpleTestOfV3EncryptionClient";
@@ -841,7 +841,7 @@ public void testAsyncInstructionFileConfig() {
         s3ClientDisabledInstructionFile.close();
         s3Client.close();
     }
-    @Test
+    @RetryingTest(3)
     public void testAsyncInstructionFileConfigMultipart() {
         final String objectKey = appendTestSuffix("test-multipart-async-instruction-file-config");
         final String input = "SimpleTestOfV3EncryptionClient";
@@ -885,7 +885,7 @@ public void testAsyncInstructionFileConfigMultipart() {
 
         s3Client.close();
     }
-    @Test
+    @RetryingTest(3)
     public void testAsyncInstructionFileConfigMultipartWithOptions() {
         final String objectKey = appendTestSuffix("test-multipart-async-instruction-file-config-options");
         final String input = "SimpleTestOfV3EncryptionClient";
@@ -934,7 +934,7 @@ public void testAsyncInstructionFileConfigMultipartWithOptions() {
 
     }
 
-    @Test
+    @RetryingTest(3)
     public void wrappedClientMultipartUploadThrowsException() throws IOException {
         final String objectKey = appendTestSuffix("multipart-put-object-async-wrapped-client");
 
@@ -1013,21 +1013,21 @@ public void wrappedClientMultipartUploadThrowsException() throws IOException {
         s3Client.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncClientBuilderForbidsMultipartEnabled() {
         assertThrows(
             UnsupportedOperationException.class,
             () -> S3AsyncEncryptionClient.builderV4().multipartEnabled(Boolean.TRUE));
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncClientBuilderForbidsMultipartConfiguration() {
         assertThrows(
             UnsupportedOperationException.class,
             () -> S3AsyncEncryptionClient.builderV4().multipartConfiguration(MultipartConfiguration.builder().build()));
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncClientForbidsCreateMultipartUpload() {
         S3AsyncClient s3AsyncClient = S3AsyncEncryptionClient.builderV4()
                 .kmsKeyId("fails")
@@ -1037,7 +1037,7 @@ public void s3AsyncClientForbidsCreateMultipartUpload() {
         s3AsyncClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncClientForbidsUploadPart() {
         S3AsyncClient s3AsyncClient = S3AsyncEncryptionClient.builderV4()
                 .kmsKeyId("fails")
@@ -1047,7 +1047,7 @@ public void s3AsyncClientForbidsUploadPart() {
         s3AsyncClient.close();
     }
 
-    @Test
+    @RetryingTest(3)
     public void s3AsyncClientForbidsCompleteMultipartUpload() {
         S3AsyncClient s3AsyncClient = S3AsyncEncryptionClient.builderV4()
                 .kmsKeyId("fails")