versionning utilities migration

Issue: CLDSRV-724

Author: benzekrimaha

tests/functional/aws-node-sdk/lib/utility/customS3Request.js

@@ -1,43 +1,59 @@
-const { S3 } = require('aws-sdk');
+const { S3Client } = require('@aws-sdk/client-s3');
+const { HttpRequest } = require('@smithy/protocol-http');
 const querystring = require('querystring');
 
 const getConfig = require('../../test/support/config');
 
-const config = getConfig('default', { signatureVersion: 'v4' });
-const s3 = new S3(config);
+const config = getConfig('default');
+
+
+// Custom middleware to modify requests without mutating args
+const customRequestMiddleware = buildParams => next => async args => {
 
-function customS3Request(action, params, buildParams, callback) {
-    const method = action.bind(s3);
-    const request = method(params);
     const { headers, query } = buildParams;
-    // modify underlying http request object created by aws sdk
-    request.on('build', () => {
-        Object.assign(request.httpRequest.headers, headers);
-        if (query) {
-            const qs = querystring.stringify(query);
-            // NOTE: that this relies on there not being a query string in the
-            // first place; if there is a qs then we have to search for ? and
-            // append &qs at the end of the string, if ? is not followed by ''
-            request.httpRequest.path = `${request.httpRequest.path}?${qs}`;
-        }
-    });
-    request.on('success', response => {
-        const resData = {
-            statusCode: response.httpResponse.statusCode,
-            headers: response.httpResponse.headers,
-            body: response.httpResponse.body.toString('utf8'),
-        };
-        callback(null, resData);
+
+    const prevReq = args.request;
+    const base = prevReq instanceof HttpRequest ? prevReq : new HttpRequest(prevReq);
+
+    let newHeaders = base.headers || {};
+    if (headers) {
+        newHeaders = { ...newHeaders, ...headers };
+    }
+
+    let newQuery = base.query || {};
+    if (query) {
+        const extra = querystring.parse(querystring.stringify(query));
+        newQuery = { ...newQuery, ...extra };
+    }
+
+    const newReq = new HttpRequest({
+        ...base,
+        headers: newHeaders,
+        query: newQuery,
     });
-    request.on('error', err => {
+
+    return next({ ...args, request: newReq });
+};
+
+async function customS3Request(CommandClass, params, buildParams) {
+        const customS3 = new S3Client({ ...config });
+
+        customS3.middlewareStack.add(
+            customRequestMiddleware(buildParams),
+            { step: 'build', name: 'customRequestMiddleware', tags: ['CUSTOM'] }
+        );
+
+        const command = new CommandClass(params);
+        const response = await customS3.send(command);
+
         const resData = {
-            statusCode: request.response.httpResponse.statusCode,
-            headers: request.response.httpResponse.headers,
-            body: request.response.httpResponse.body.toString('utf8'),
+            statusCode: 200,
+            headers: response.$metadata?.httpHeaders || {},
+            body: JSON.stringify(response),
         };
-        callback(err, resData);
-    });
-    request.send();
+
+        return resData;
+
 }
 
 module.exports = customS3Request;

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

@@ -28,15 +28,14 @@ function _deleteVersionList(versionList, bucket, callback) {
     return s3Client.send(new DeleteObjectsCommand(params)).then(() => callback()).catch(err => callback(err));
 }
 
-function checkOneVersion(s3, bucket, versionId, callback) {
+function checkOneVersion(s3, bucket, versionId) {
     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));
+            assert.strictEqual(data.DeleteMarkers?.length, undefined);
+        });
 }
 
 function removeAllVersions(params, callback) {