fixup after merge all

Author: SylvainSenechal

package.json

@@ -22,6 +22,7 @@
     "@aws-sdk/client-iam": "^3.930.0",
     "@aws-sdk/client-s3": "^3.908.0",
     "@aws-sdk/client-sts": "^3.930.0",
+    "aws-sdk": "^2.1692.0",
     "@aws-sdk/credential-providers": "^3.864.0",
     "@aws-sdk/middleware-retry": "^3.374.0",
     "@aws-sdk/protocol-http": "^3.374.0",
@@ -30,7 +31,7 @@
     "@azure/storage-blob": "^12.28.0",
     "@hapi/joi": "^17.1.1",
     "@smithy/node-http-handler": "^3.0.0",
-    "arsenal": "git+https://github.com/scality/Arsenal#d1de8c4ac819ee7363323fa8ab14fcdba37a5e65",
+    "arsenal": "git+https://github.com/scality/Arsenal#5bb6a3128b9d416023fc32c88a17a8822bc1c6d3",
     "async": "2.6.4",
     "bucketclient": "scality/bucketclient#8.2.7",
     "bufferutil": "^4.0.8",

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

@@ -28,15 +28,13 @@ function _deleteVersionList(versionList, bucket, callback) {
     return s3Client.send(new DeleteObjectsCommand(params)).then(() => callback()).catch(err => callback(err));
 }
 
-function checkOneVersion(s3, bucket, versionId, callback) {
-    return s3Client.send(new ListObjectVersionsCommand({ Bucket: bucket })).then(data => {
-            assert.strictEqual(data.Versions.length, 1);
-            if (versionId) {
-                assert.strictEqual(data.Versions[0].VersionId, versionId);
-            }
-            assert.strictEqual(data.DeleteMarkers.length, 0);
-            callback();
-        }).catch(err => callback(err));
+async function checkOneVersion(s3, bucket, versionId) {
+    const data = await s3.send(new ListObjectVersionsCommand({ Bucket: bucket }));
+    assert.strictEqual(data.Versions.length, 1);
+    if (versionId) {
+        assert.strictEqual(data.Versions[0].VersionId, versionId);
+    }
+    assert.strictEqual((data.DeleteMarkers || []).length, 0);
 }
 
 function removeAllVersions(params, callback) {
@@ -106,7 +104,11 @@ function enableVersioningThenPutObject(bucket, object, callback) {
 function createDualNullVersion(s3, bucketName, keyName, cb) {
     async.waterfall([
         // put null version
-        next => s3Client.send(new PutObjectCommand({ Bucket: bucketName, Key: keyName, Body: null })).then(() => 
+        next => s3Client.send(new PutObjectCommand({
+            Bucket: bucketName,
+            Key: keyName,
+            Body: Buffer.from(''),
+        })).then(() =>
             next()).catch(err => next(err)),
         next => enableVersioning(bucketName, err => next(err)),
         // should store null version as separate version before

tests/functional/aws-node-sdk/test/bucket/getBucketLogging.js

@@ -21,12 +21,12 @@ const validLoggingConfig = {
 function cleanUp(bucketUtil, cb) {
     Promise.all([
         bucketUtil.deleteOne(bucketName).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),
         bucketUtil.deleteOne(targetBucket).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),

tests/functional/aws-node-sdk/test/bucket/putBucketLogging.js

@@ -46,12 +46,12 @@ const itSkipIfAWS = process.env.AWS_ON_AIR ? it.skip : it;
 function cleanUp(bucketUtil, cb) {
     Promise.all([
         bucketUtil.deleteOne(bucketName).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),
         bucketUtil.deleteOne(targetBucket).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),

tests/functional/aws-node-sdk/test/object/bigMpu.js

@@ -103,15 +103,12 @@ describe('large mpu', function tester() {
                     })
                     .catch(err => next(err));
             },
-            next => {
-                return timesLimit(partCount, 20, (n, cb) =>
-                    uploadPart(n, uploadId, s3, cb), err => {
-                        if (err) {
-                            process.stdout.write(`Error in timesLimit: ${err}\n`);
-                        }
-                        return next(err);
-                    });
-            },
+            next => timesLimit(partCount, 20, (n, cb) => uploadPart(n, uploadId, s3, cb), err => {
+                if (err) {
+                    process.stdout.write(`Error in timesLimit: ${err}\n`);
+                }
+                return next(err);
+            }),
             next => {
                 const parts = [];
                 for (let i = 0; i < partCount; i++) {

tests/functional/aws-node-sdk/test/serverAccessLogs/testServerAccessLogFile.js

@@ -2,9 +2,10 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 const tv4 = require('tv4');
+const { S3 } = require('aws-sdk');
 
 const withV4 = require('../support/withV4');
-const BucketUtility = require('../../lib/utility/bucket-util');
+const { getCredentials } = require('../support/credentials');
 const { config, serverAccessLogsModes } = require('../../../../../lib/Config');
 
 const TEST_CONFIG = {
@@ -67,6 +68,37 @@ function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+async function emptyBucket(s3, bucketName, BypassGovernanceRetention = false) {
+    const data = await s3.listObjectVersions({ Bucket: bucketName }).promise();
+    const versions = data.Versions || [];
+    const deleteMarkers = data.DeleteMarkers || [];
+
+    for (const obj of versions.filter(o => !o.Key.endsWith('/'))) {
+        await s3.deleteObject({
+            Bucket: bucketName,
+            Key: obj.Key,
+            VersionId: obj.VersionId,
+            ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
+        }).promise();
+    }
+    for (const obj of versions.filter(o => o.Key.endsWith('/'))) {
+        await s3.deleteObject({
+            Bucket: bucketName,
+            Key: obj.Key,
+            VersionId: obj.VersionId,
+            ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
+        }).promise();
+    }
+    for (const obj of deleteMarkers) {
+        await s3.deleteObject({
+            Bucket: bucketName,
+            Key: obj.Key,
+            VersionId: obj.VersionId,
+            ...(BypassGovernanceRetention && { BypassGovernanceRetention }),
+        }).promise();
+    }
+}
+
 async function cleanupBuckets(s3) {
     let lastAction = 'ListBuckets';
     const bucketsResponse = await s3.listBuckets().promise();
@@ -82,15 +114,13 @@ async function cleanupBuckets(s3) {
             ));
         }
 
-        await bu.empty(bucket.Name, true);
+        await emptyBucket(s3, bucket.Name, true);
         await s3.deleteBucket({ Bucket: bucket.Name }).promise();
         lastAction = 'DeleteBucket';
     }
     return lastAction;
 }
 
-var bu;
-
 // TODO:
 // - [ ] We skip websiteGet and websiteHead because they need to be tested with HTTP requests to the website endpoint.
 //   Cannot delete the locked objects in the bucket, so we cannot delete the bucket.
@@ -99,9 +129,13 @@ var bu;
 // - We skip objectRestore because it is not supported in CloudServer.
 describe('Server Access Logs - File Output', async () => {
     withV4(async sigCfg => {
-        const bucketUtil = new BucketUtility('default', sigCfg);
-        bu = bucketUtil;
-        const s3 = bucketUtil.s3;
+        const s3 = new S3({
+            endpoint: 'http://127.0.0.1:8000',
+            s3ForcePathStyle: true,
+            credentials: getCredentials('default', sigCfg),
+            region: 'us-east-1',
+            maxRetries: 0,
+        });
         const logFilePath = config.serverAccessLogs.outputFile;
         const bucketName = 'test-server-access-log-bucket';
         const objectKey = 'test-object-key';