post reviews fixups

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 },
@@ -111,6 +112,7 @@ class BucketUtility {
                             Bucket: bucketName,
                             Key: object.Key,
                             VersionId: object.VersionId,
+                            ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
                         }))
                             .then(() => object)
                     )
@@ -120,6 +122,8 @@ class BucketUtility {
                             this.s3.send(new DeleteObjectCommand({
                                 Bucket: bucketName,
                                 Key: object.Key,
+                                VersionId: object.VersionId,
+                                ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
                             }))
                             .then(() => object)
                         )
@@ -130,19 +134,23 @@ class BucketUtility {
                             Bucket: bucketName,
                             Key: object.Key,
                             VersionId: object.VersionId,
+                            ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
                             }))
                             .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) {