Update functional tests to use cloudserverclient extended commands

package.json

@@ -20,7 +20,7 @@
   "homepage": "https://github.com/scality/S3#readme",
   "dependencies": {
     "@aws-sdk/client-iam": "^3.930.0",
-    "@aws-sdk/client-s3": "^3.908.0",
+    "@aws-sdk/client-s3": "^3.1013.0",
     "@aws-sdk/client-sts": "^3.930.0",
     "@aws-sdk/credential-providers": "^3.864.0",
     "@aws-sdk/middleware-retry": "^3.374.0",
@@ -62,6 +62,7 @@
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.2",
+    "@scality/cloudserverclient": "1.0.7",
     "@scality/eslint-config-scality": "scality/Guidelines#8.3.0",
     "eslint": "^9.14.0",
     "eslint-plugin-import": "^2.31.0",
@@ -83,7 +84,8 @@
   },
   "resolutions": {
     "jsonwebtoken": "^9.0.0",
-    "nan": "v2.22.0"
+    "nan": "v2.22.0",
+    "fast-xml-parser": "^5.5.6"
   },
   "mocha": {
     "recursive": true,

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

@@ -6,7 +6,7 @@ const {
     ListObjectsV2Command,
     S3Client,
 } = require('@aws-sdk/client-s3');
-const { streamCollector } = require('@smithy/node-http-handler');
+const { ListObjectsV2ExtendedCommand } = require('@scality/cloudserverclient');
 const {
     IAMClient,
     CreatePolicyCommand,
@@ -17,8 +17,6 @@ const {
     DeletePolicyCommand,
     DeleteUserCommand,
 } = require('@aws-sdk/client-iam');
-const { parseStringPromise } = require('xml2js');
-
 const withV4 = require('../support/withV4');
 const BucketUtility = require('../../lib/utility/bucket-util');
 const bucketSchema = require('../../schema/bucket');
@@ -609,75 +607,6 @@ describe('GET Bucket - AWS.S3.listObjects', () => {
                 await iamClient.send(new DeleteUserCommand({ UserName: userWithoutPermission.UserName }));
             });
 
-            const listObjectsV2WithOptionalAttributes = async (s3, bucket, headerValue) => {
-                const localS3 = s3;
-                let rawXml = '';
-
-                const addHeaderMiddleware = next => async args => {
-                    const localArgs = args;
-                    localArgs.request.headers['x-amz-optional-object-attributes'] = headerValue;
-                    return next(localArgs);
-                };
-
-                const originalHandler = s3.config.requestHandler;
-                const wrappedHandler = {
-                    async handle(request, options) {
-                        const { response } = await originalHandler.handle(request, options);
-
-                        if (response && response.body) {
-                            const collected = await streamCollector(response.body);
-                            const buffer = Buffer.from(collected);
-                            rawXml = buffer.toString('utf-8');
-
-                            const { Readable } = require('stream');
-                            response.body = Readable.from([buffer]);
-                        }
-
-                        return { response };
-                    },
-                    destroy() {
-                        if (originalHandler.destroy) {
-                            originalHandler.destroy();
-                        }
-                    }
-                };
-
-                localS3.config.requestHandler = wrappedHandler;
-                localS3.middlewareStack.add(addHeaderMiddleware, {
-                    step: 'build',
-                    name: 'addOptionalAttributesHeader',
-                });
-
-                try {
-                    const result = await s3.send(new ListObjectsV2Command({ Bucket: bucket }));
-
-                    if (!rawXml) {
-                        return result;
-                    }
-
-                    const parsedXml = await parseStringPromise(rawXml);
-                    const contents = result.Contents;
-                    const parsedContents = parsedXml?.ListBucketResult?.Contents;
-
-                    if (!contents || !parsedContents) {
-                        return result;
-                    }
-
-                    if (parsedContents[0]?.['x-amz-meta-department']) {
-                        contents[0]['x-amz-meta-department'] = parsedContents[0]['x-amz-meta-department'][0];
-                    }
-
-                    if (parsedContents[0]?.['x-amz-meta-hr']) {
-                        contents[0]['x-amz-meta-hr'] = parsedContents[0]['x-amz-meta-hr'][0];
-                    }
-
-                    return result;
-                } finally {
-                    localS3.config.requestHandler = originalHandler;
-                    localS3.middlewareStack.remove('addOptionalAttributesHeader');
-                }
-            };
-
             it('should return an XML if the header is set', async () => {
                 const s3 = bucketUtil.s3;
                 const Bucket = bucketName;
@@ -690,11 +619,10 @@ describe('GET Bucket - AWS.S3.listObjects', () => {
                         hr: 'true',
                     },
                 }));
-                const result = await listObjectsV2WithOptionalAttributes(
-                    s3,
+                const result = await s3.send(new ListObjectsV2ExtendedCommand({
                     Bucket,
-                    'x-amz-meta-*,RestoreStatus,x-amz-meta-department',
-                );
+                    ObjectAttributes: ['x-amz-meta-*', 'RestoreStatus', 'x-amz-meta-department'],
+                }));
 
                 assert.strictEqual(result.Contents.length, 1);
                 assert.strictEqual(result.Contents[0].Key, 'super-power-object');
@@ -716,11 +644,10 @@ describe('GET Bucket - AWS.S3.listObjects', () => {
                 }));
 
                 try {
-                    await listObjectsV2WithOptionalAttributes(
-                        s3ClientWithoutPermission,
+                    await s3ClientWithoutPermission.send(new ListObjectsV2ExtendedCommand({
                         Bucket,
-                        'x-amz-meta-*,RestoreStatus,x-amz-meta-department',
-                    );
+                        ObjectAttributes: ['x-amz-meta-*', 'RestoreStatus', 'x-amz-meta-department'],
+                    }));
                     throw new Error('Request should have been rejected');
                 } catch (err) {
                     if (err.message === 'Request should have been rejected') {
@@ -743,11 +670,10 @@ describe('GET Bucket - AWS.S3.listObjects', () => {
                         hr: 'true',
                     },
                 }));
-                const result = await listObjectsV2WithOptionalAttributes(
-                    s3ClientWithoutPermission,
+                const result = await s3ClientWithoutPermission.send(new ListObjectsV2ExtendedCommand({
                     Bucket,
-                    'RestoreStatus',
-                );
+                    ObjectAttributes: ['RestoreStatus'],
+                }));
 
                 assert.strictEqual(result.Contents.length, 1);
                 assert.strictEqual(result.Contents[0].Key, 'super-power-object');

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

@@ -21,7 +21,8 @@ describe('HEAD bucket', () => {
                     await s3.send(new HeadBucketCommand({ Bucket: '' }));
                     assert.fail('Expected failure but got success');
                 } catch (err) {
-                    assert.strictEqual(err.message, 'Empty value provided for input HTTP label: Bucket.');
+                    assert.strictEqual(err.$metadata.httpStatusCode, 405);
+                    assert.strictEqual(err.name, 'Unknown');
                 }
             }); 
     });

tests/functional/aws-node-sdk/test/multipleBackend/unknownEndpoint.js

@@ -21,10 +21,7 @@ let s3;
 describe('Requests to ip endpoint not in config', () => {
     withV4(sigCfg => {
         before(() => {
-            bucketUtil = new BucketUtility('default', sigCfg);
-            // change endpoint to endpoint with ip address
-            // not in config
-            bucketUtil.s3.config.endpoint = specifiedEndpoint;
+            bucketUtil = new BucketUtility('default', { ...sigCfg, endpoint: specifiedEndpoint });
             s3 = bucketUtil.s3;
         });
 

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

@@ -103,7 +103,7 @@ describe('DELETE object', () => {
             const bucketName = 'testdeleteobjectlockbucket';
             let versionIdOne;
             let versionIdTwo;
-            const retainDate = moment().add(10, 'days');
+            const retainDate = moment().add(10, 'days').toDate();
 
             before(async () => {
                 try {

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

@@ -224,18 +224,6 @@ describe('GET object', () => {
                 await s3.send(new DeleteBucketCommand({ Bucket: bucketName }));
         });
 
-
-        it('should return an error to get request without a valid ' +
-        'bucket name',
-            done => {
-                s3.send(new GetObjectCommand({ Bucket: '', Key: 'somekey' })).then(() => {
-                    assert.fail('Expected failure but got success');
-                }).catch(err => {
-                    assert.strictEqual(err.message, 'Empty value provided for input HTTP label: Bucket.');
-                    return done();
-                });
-            });
-
         it('should return NoSuchKey error when no such object',
             done => {
                 s3.send(new GetObjectCommand({ Bucket: bucketName, Key: 'nope' })).then(() => {
@@ -1073,7 +1061,7 @@ describeSkipIfCeph('GET object with object lock', () => {
             const params = {
                 Bucket: bucket,
                 Key: key,
-                ObjectLockRetainUntilDate: mockDate,
+                ObjectLockRetainUntilDate: mockDate.toDate(),
                 ObjectLockMode: mockMode,
                 ObjectLockLegalHoldStatus: 'ON',
             };