bucket util fixup

Author: benzekrimaha

tests/functional/aws-node-sdk/lib/utility/bucket-util.js

@@ -16,6 +16,7 @@ class BucketUtility {
         if (unauthenticated) {
             this.s3 = new S3Client({
                 ...s3Config,
+                maxAttempts: 0,
                 credentials: { accessKeyId: '', secretAccessKey: '' },
                 forcePathStyle: true,
                 signer: { sign: async request => request },
@@ -52,11 +53,7 @@ class BucketUtility {
         return this.s3.send(new CreateBucketCommand({
             Bucket: bucketName,
             ObjectLockEnabledForBucket: true,
-        }))
-            .then(() => bucketName)
-            .catch(err => {
-                throw err;
-            });
+        })).then(() => bucketName);
     }
 
     createMany(bucketNames) {
@@ -78,10 +75,7 @@ class BucketUtility {
     }
 
     deleteOne(bucketName) {
-        return this.s3.send(new DeleteBucketCommand({ Bucket: bucketName }))
-            .catch(err => {
-                throw err;
-            });
+        return this.s3.send(new DeleteBucketCommand({ Bucket: bucketName }));
     }
 
     deleteMany(bucketNames) {
@@ -96,53 +90,57 @@ class BucketUtility {
      * @param bucketName
      * @returns {Promise.<T>}
      */
-
-    async empty(bucketName, BypassGovernanceRetention = false) {
+    empty(bucketName, BypassGovernanceRetention = false) {
         const param = {
             Bucket: bucketName,
         };
 
         return this.s3.send(new ListObjectVersionsCommand(param))
             .then(data => Promise.all(
                 (data.Versions || [])
-                    .filter(object => !object.Key.endsWith('/'))
+                .filter(object => !object.Key.endsWith('/'))
+                .map(object =>
+                    this.s3.send(new DeleteObjectCommand({
+                        Bucket: bucketName,
+                        Key: object.Key,
+                        VersionId: object.VersionId,
+                        ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
+                    })).then(() => object)
+                )
+                .concat((data.Versions || [])
+                    .filter(object => object.Key.endsWith('/'))
                     .map(object =>
                         this.s3.send(new DeleteObjectCommand({
                             Bucket: bucketName,
                             Key: object.Key,
                             VersionId: object.VersionId,
+                            ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
                         }))
-                            .then(() => object)
+                        .then(() => object)
                     )
-                    .concat((data.Versions || [])
-                        .filter(object => object.Key.endsWith('/'))
-                        .map(object =>
-                            this.s3.send(new DeleteObjectCommand({
-                                Bucket: bucketName,
-                                Key: object.Key,
-                            }))
-                            .then(() => object)
-                        )
+                )
+                .concat((data.DeleteMarkers || [])
+                    .map(object =>
+                    this.s3.send(new DeleteObjectCommand({
+                        Bucket: bucketName,
+                        Key: object.Key,
+                        VersionId: object.VersionId,
+                        ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
+                        }))
+                        .then(() => object)
                     )
-                    .concat((data.DeleteMarkers || [])
-                        .map(object =>
-                        this.s3.send(new DeleteObjectCommand({
-                            Bucket: bucketName,
-                            Key: object.Key,
-                            VersionId: object.VersionId,
-                            }))
-                            .then(() => object)
-                        ))
-            ));
+                )
+            )
+        );
     }
 
     emptyMany(bucketNames) {
-            const promises = bucketNames.map(
-                bucketName => this.empty(bucketName)
+        const promises = bucketNames.map(
+            bucketName => this.empty(bucketName)
         );
-
         return Promise.all(promises);
     }
+    
     emptyIfExists(bucketName) {
         return this.bucketExists(bucketName).then(exists => {
             if (exists) {
@@ -151,6 +149,7 @@ class BucketUtility {
             return undefined;
         });
     }
+
     emptyManyIfExists(bucketNames) {
         const promises = bucketNames.map(bucketName =>
             this.emptyIfExists(bucketName),