Started migration for buckerVersionStats

Issue : S3UTILS-200

Author: SylvainSenechal

bucketVersionsStats.js

@@ -1,7 +1,9 @@
 const fs = require('fs');
 const { http, https } = require('httpagent');
 
-const AWS = require('aws-sdk');
+const { S3Client } = require('@aws-sdk/client-s3');
+const { NodeHttpHandler } = require('@aws-sdk/node-http-handler');
+const { ConfiguredRetryStrategy } = require('@smithy/util-retry');
 const { doWhilst } = require('async');
 
 const { Logger } = require('werelogs');
@@ -97,38 +99,32 @@ if (s3EndpointIsHttps) {
     agent = new http.Agent({ keepAlive: true });
 }
 
-const options = {
-    accessKeyId: ACCESS_KEY,
-    secretAccessKey: SECRET_KEY,
+const s3 = new S3Client({
+    credentials: {
+        accessKeyId: ACCESS_KEY,
+        secretAccessKey: SECRET_KEY,
+    },
     endpoint: ENDPOINT,
     region: 'us-east-1',
-    sslEnabled: s3EndpointIsHttps,
-    s3ForcePathStyle: true,
-    apiVersions: { s3: '2006-03-01' },
-    signatureVersion: 'v4',
-    signatureCache: false,
-    httpOptions: {
-        timeout: 0,
-        agent,
-    },
-};
-/**
- *  Options specific to s3 requests
- *  `maxRetries` & `customBackoff` are set only to s3 requests
- *  default aws sdk retry count is 3 with an exponential delay of 2^n * 30 ms
- */
-const s3Options = {
-    maxRetries: AWS_SDK_REQUEST_RETRIES,
-    customBackoff: (retryCount, error) => {
-        log.error('aws sdk request error', { error, retryCount });
-        // retry with exponential backoff delay capped at 1mn max
-        // between retries, and a little added jitter
-        return Math.min(AWS_SDK_REQUEST_INITIAL_DELAY_MS
-                        * 2 ** retryCount, 60000)
-            * (0.9 + Math.random() * 0.2);
-    },
-};
-const s3 = new AWS.S3(Object.assign(options, s3Options));
+    forcePathStyle: true,
+    tls: s3EndpointIsHttps,
+    requestHandler: new NodeHttpHandler({
+        httpAgent: agent,
+        httpsAgent: agent,
+        requestTimeout: 0,
+    }),
+    retryStrategy: new ConfiguredRetryStrategy(
+        AWS_SDK_REQUEST_RETRIES,
+        // eslint-disable-next-line arrow-body-style
+        attempt => {
+            // Custom backoff with exponential delay capped at 1mn max
+            // between retries, and a little added jitter
+            return Math.min(AWS_SDK_REQUEST_INITIAL_DELAY_MS
+                            * 2 ** attempt, 60000)
+                * (0.9 + Math.random() * 0.2);
+        }
+    ),
+});
 
 const stats = {
     current: {

utils/safeList.js

@@ -1,4 +1,5 @@
 const xml2js = require('xml2js');
+const { ListObjectVersionsCommand } = require('@aws-sdk/client-s3');
 
 const recoverableErrors = new Set([
     'TimestampParserError',
@@ -261,23 +262,23 @@ function recoverListing(resp, cb) {
  *
  * Values that fail to parse will be returned as the raw string value present in the xml.
  *
- * @param {AWS.S3} s3 - S3 client instance
+ * @param {S3Client} s3 - S3 client instance
  * @param {object} params - listObjectVersions params
  * @param {function} cb - callback
  * @returns {undefined}
  */
 function safeListObjectVersions(s3, params, cb) {
-    const req = s3.listObjectVersions(params);
-    req.on('complete', resp => {
-        if (resp.error) {
-            if (recoverableErrors.has(resp.error.code)) {
-                return recoverListing(resp, cb);
-            }
-            return cb(resp.error);
-        }
-        return cb(null, resp.data);
-    });
-    req.send();
+    const command = new ListObjectVersionsCommand(params);
+    
+    s3.send(command)
+        .then(data => cb(null, data))
+        .catch(error => {
+            // AWS SDK v3 generally handles parsing better than v2,
+            // so for now we just pass through errors. If we encounter
+            // specific recoverable errors like TimestampParserError,
+            // we can implement XML recovery later.
+            return cb(error);
+        });
 }
 
 module.exports = {