fixup post reviews

Author: benzekrimaha

package.json

@@ -19,13 +19,12 @@
   },
   "homepage": "https://github.com/scality/S3#readme",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.705.0",
+    "@aws-sdk/client-s3": "^3.908.0",
     "@aws-sdk/credential-providers": "^3.864.0",
     "@azure/storage-blob": "^12.28.0",
     "@hapi/joi": "^17.1.1",
     "arsenal": "git+https://github.com/scality/Arsenal#8.2.41",
     "async": "2.6.4",
-    "aws-sdk": "^2.1692.0",
     "bucketclient": "scality/bucketclient#8.2.7",
     "bufferutil": "^4.0.8",
     "commander": "^12.1.0",

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

@@ -53,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) {
@@ -79,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) {
@@ -97,48 +90,46 @@ 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)
-                    )
-                    .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.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,
+                        ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
+                        }))
+                        .then(() => object)
                     )
+                )
             )
         );
     }
@@ -147,7 +138,6 @@ class BucketUtility {
         const promises = bucketNames.map(
             bucketName => this.empty(bucketName)
         );
-
         return Promise.all(promises);
     }
 
@@ -159,6 +149,7 @@ class BucketUtility {
             return undefined;
         });
     }
+
     emptyManyIfExists(bucketNames) {
         const promises = bucketNames.map(bucketName =>
             this.emptyIfExists(bucketName),

tests/sur/quota.js

@@ -104,7 +104,6 @@ function putObjectWithCustomHeader(bucket, key, size, vID, cb) {
         Body: Buffer.alloc(size),
     };
 
-    // Add custom header using middleware
     const command = new PutObjectCommand(params);
     command.middlewareStack.add(
         next => async args => {
@@ -323,14 +322,13 @@ function restoreObject(bucket, key, size, callback) {
         RestoreRequest: {
             Days: 1,
         },
-    }))
-        .then(data => {
-            if (!s3Config.isQuotaInflightEnabled()) {
-                mockScuba.incrementBytesForBucket(bucket, size);
-            }
-            return callback(null, data);
-        })
-        .catch(callback);
+    })).then(data => {
+        if (!s3Config.isQuotaInflightEnabled()) {
+            mockScuba.incrementBytesForBucket(bucket, size);
+        }
+        return callback(null, data);
+    })
+    .catch(callback);
 }
 
 function multiObjectDelete(bucket, keys, size, callback) {

tests/utapi/awsNodeSdk.js

@@ -33,7 +33,7 @@ function createBucket(bucket, cb) {
 
 function deleteBucket(bucket, cb) {
     s3Client.send(new DeleteBucketCommand({ Bucket: bucket }))
-        .then(() => cb())
+        .then(() => cb(null))
         .catch(cb);
 }
 
@@ -51,7 +51,7 @@ function putObject(bucket, key, size, cb) {
 
 function deleteObject(bucket, key, cb) {
     s3Client.send(new DeleteObjectCommand({ Bucket: bucket, Key: key }))
-        .then(() => cb())
+        .then(() => cb(null))
         .catch(cb);
 }
 
@@ -63,22 +63,22 @@ function deleteObjects(bucket, keys, cb) {
         Delete: deleteRequest,
     };
     s3Client.send(new DeleteObjectsCommand(params))
-        .then(() => cb())
+        .then(() => cb(null))
         .catch(cb);
 }
 
 function copyObject(bucket, key, cb) {
     const params = { Bucket: bucket, CopySource: `${bucket}/${key}`, Key: `${key}-copy` };
     s3Client.send(new CopyObjectCommand(params))
-        .then(() => cb())
+        .then(() => cb(null))
         .catch(cb);
 }
 
 function enableVersioning(bucket, enable, cb) {
     const versioningStatus = { Status: enable ? 'Enabled' : 'Disabled' };
     const params = { Bucket: bucket, VersioningConfiguration: versioningStatus };
     s3Client.send(new PutBucketVersioningCommand(params))
-        .then(() => cb())
+        .then(() => cb(null))
         .catch(cb);
 }