fix: unwrap completion exception in AbortMultipartUpload and inside multipart putObject (#174)

* fix: unwrap completion exception in AbortMultipartUpload and inside multipart putObject

---------

Co-authored-by: Darwin Chowdary <[email protected]>

Author: kessplas

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

@@ -461,7 +461,13 @@ public CompleteMultipartUploadResponse completeMultipartUpload(CompleteMultipart
     @Override
     public AbortMultipartUploadResponse abortMultipartUpload(AbortMultipartUploadRequest request)
             throws AwsServiceException, SdkClientException {
-        return _multipartPipeline.abortMultipartUpload(request);
+        try {
+            return _multipartPipeline.abortMultipartUpload(request);
+        } catch (CompletionException e) {
+            throw new S3EncryptionClientException(e.getCause().getMessage(), e.getCause());
+        } catch (Exception e) {
+            throw new S3EncryptionClientException("Unable to abort Multipart upload.", e);
+        }
     }
 
     /**

src/main/java/software/amazon/encryption/s3/internal/UploadObjectObserver.java

@@ -14,13 +14,15 @@
 import software.amazon.awssdk.services.s3.model.UploadPartRequest;
 import software.amazon.awssdk.services.s3.model.UploadPartResponse;
 import software.amazon.encryption.s3.S3EncryptionClient;
+import software.amazon.encryption.s3.S3EncryptionClientException;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
@@ -70,6 +72,9 @@ public Map<Integer, UploadPartResponse> call() {
                 try {
                     AsyncRequestBody noRetriesBody = new NoRetriesAsyncRequestBody(AsyncRequestBody.fromFile(part));
                     return uploadPart(reqUploadPart, noRetriesBody);
+                } catch (CompletionException e) {
+                    // Unwrap completion exception
+                    throw new S3EncryptionClientException(e.getCause().getMessage(), e.getCause());
                 } finally {
                     // clean up part already uploaded
                     if (!part.delete()) {

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

@@ -21,6 +21,7 @@
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
+import software.amazon.awssdk.services.s3.model.NoSuchUploadException;
 import software.amazon.awssdk.services.s3.model.ObjectIdentifier;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.S3Exception;
@@ -44,6 +45,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -618,7 +620,7 @@ public void createMultipartUploadFailure() {
             v3Client.createMultipartUpload(builder -> builder.bucket("NotMyBukkit").key("InvalidKey").build());
         } catch (S3EncryptionClientException exception) {
             // Verify inner exception
-            assertTrue(exception.getCause() instanceof NoSuchBucketException);
+            assertInstanceOf(NoSuchBucketException.class, exception.getCause());
         }
 
         v3Client.close();
@@ -642,15 +644,15 @@ public void uploadPartFailure() {
                     RequestBody.fromInputStream(new BoundedInputStream(16), 16));
         } catch (S3EncryptionClientException exception) {
             // Verify inner exception
-            assertTrue(exception.getCause() instanceof NoSuchBucketException);
+            assertInstanceOf(NoSuchBucketException.class, exception.getCause());
         }
 
-        // MPU was not completed, but delete to be safe
+        // MPU was not completed, but abort and delete to be safe
+        v3Client.abortMultipartUpload(builder -> builder.bucket(BUCKET).key(objectKey).uploadId(initiateResult.uploadId()).build());
         deleteObject(BUCKET, objectKey, v3Client);
         v3Client.close();
     }
 
-
     @Test
     public void completeMultipartUploadFailure() {
         // V3 Client
@@ -661,7 +663,26 @@ public void completeMultipartUploadFailure() {
             v3Client.completeMultipartUpload(builder -> builder.bucket("NotMyBukkit").key("InvalidKey").uploadId("Invalid").build());
         } catch (S3EncryptionClientException exception) {
             // Verify inner exception
-            assertTrue(exception.getCause() instanceof NoSuchBucketException);
+            assertInstanceOf(NoSuchBucketException.class, exception.getCause());
+        }
+
+        v3Client.close();
+    }
+
+    @Test
+    public void abortMultipartUploadFailure() {
+        final String objectKey = appendTestSuffix("abort-multipart-failure");
+
+        // V3 Client
+        S3Client v3Client = S3EncryptionClient.builder()
+                .aesKey(AES_KEY)
+                .build();
+
+        try {
+            v3Client.abortMultipartUpload(builder -> builder.bucket(BUCKET).key(objectKey).uploadId("invalid upload id").build());
+        } catch (S3EncryptionClientException exception) {
+            // Verify inner exception
+            assertInstanceOf(NoSuchUploadException.class, exception.getCause());
         }
 
         v3Client.close();