fixup! bucket test async functions introduction

benzekrimaha · benzekrimaha · commit c92fd346550a · 2026-01-29T15:20:59.000+01:00
introducing the retry helper function
diff --git a/tests/functional/raw-node/test/GCP/object/completeMpu.js b/tests/functional/raw-node/test/GCP/object/completeMpu.js
@@ -49,29 +49,28 @@ function listObjectsPaginated(gcpClient, bucketName, cb) {
             params.Marker = marker;
         }
 
-        return gcpClient.listObjects(params, (err, res) => {
-            if (err) {
-                return cb(err);
-            }
-
-            const contents = (res && res.Contents) || [];
-            objects.push(...contents);
-
-            const isTruncated = Boolean(res && res.IsTruncated);
-            if (!isTruncated) {
-                return cb(null, objects);
-            }
-
-            // AWS listObjects(V1) pagination: prefer NextMarker, fallback to last key.
-            marker = (res && res.NextMarker) ||
-                (contents.length ? contents[contents.length - 1].Key : undefined);
-
-            if (!marker) {
-                return cb(null, objects);
-            }
-
-            return _list();
-        });
+        const command = new ListObjectsCommand(params);
+        return gcpClient.send(command)
+            .then(res => {
+                const contents = (res && res.Contents) || [];
+                objects.push(...contents);
+
+                const isTruncated = Boolean(res && res.IsTruncated);
+                if (!isTruncated) {
+                    return cb(null, objects);
+                }
+
+                // AWS listObjects(V1) pagination: prefer NextMarker, fallback to last key.
+                marker = (res && res.NextMarker) ||
+                    (contents.length ? contents[contents.length - 1].Key : undefined);
+
+                if (!marker) {
+                    return cb(null, objects);
+                }
+
+                return _list();
+            })
+            .catch(err => cb(err));
     }
 
     return _list();
@@ -100,19 +99,6 @@ describe('GCP: Complete MPU', function testSuite() {
     before(done => {
         config = getRealAwsConfig(credentialOne);
         gcpClient = new GCP(config);
-        gcpClient.listObjects = (params, callback) => {
-            const command = new ListObjectsCommand(params);
-            return gcpClient.send(command)
-                .then(data => callback(null, data))
-                .catch(err => {
-                    if (err && err.$metadata && err.$metadata.httpStatusCode &&
-                        err.statusCode === undefined) {
-                        // eslint-disable-next-line no-param-reassign
-                        err.statusCode = err.$metadata.httpStatusCode;
-                    }
-                    return callback(err);
-                });
-        };
         async.eachSeries(Object.values(bucketNames),
             (bucket, next) => {
                 const cmd = new CreateBucketCommand({ Bucket: bucket.Name });
diff --git a/tests/functional/raw-node/test/GCP/object/deleteMpu.js b/tests/functional/raw-node/test/GCP/object/deleteMpu.js
@@ -3,7 +3,7 @@ const async = require('async');
 const arsenal = require('arsenal');
 const { ListObjectsCommand } = require('@aws-sdk/client-s3');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { gcpMpuSetup, genUniqID } =
+const { gcpMpuSetup, genUniqID, gcpRetry } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -57,32 +57,17 @@ describe('GCP: Abort MPU', function testSuite() {
                 });
         };
 
-        const maxAttempts = 3;
         const buckets = Object.values(bucketNames);
-        const createBuckets = attempt => {
-            async.eachSeries(buckets,
-                (bucket, next) => {
-                    const cmd = new CreateBucketCommand({ Bucket: bucket.Name });
-                    gcpClient.send(cmd)
-                        .then(() => next())
-                        .catch(err => {
-                            process.stdout.write(
-                                `err in creating bucket (attempt ${attempt + 1}) ${err}\n`);
-                            return next(err);
-                        });
-                },
-            err => {
-                if (err && (err.name === 'SlowDown'
-                    || err.$metadata?.httpStatusCode === 429)
-                    && attempt < maxAttempts - 1) {
-                    const delay = Math.pow(2, attempt) * 1000;
-                    return setTimeout(() => createBuckets(attempt + 1), delay);
-                }
-                return done(err);
-            });
-        };
-
-        createBuckets(0);
+        async.eachSeries(
+            buckets,
+            (bucket, next) => gcpRetry(
+                gcpClient,
+                () => new CreateBucketCommand({ Bucket: bucket.Name }),
+                null,
+                next,
+            ),
+            done,
+        );
     });
 
     after(done => {
diff --git a/tests/functional/raw-node/test/GCP/object/getTagging.js b/tests/functional/raw-node/test/GCP/object/getTagging.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genGetTagObj, genUniqID } =
+const { genGetTagObj, genUniqID, gcpRetry } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -21,33 +21,14 @@ describe('GCP: GET Object Tagging', () => {
     let gcpClient;
     let bucketCreated = false;
 
-    before(done => {
+    before(async () => {
         config = getRealAwsConfig(credentialOne);
         gcpClient = new GCP(config);
-        const maxAttempts = 3;
-
-        function createBucket(attempt) {
-            const cmd = new CreateBucketCommand({ Bucket: bucketName });
-            gcpClient.send(cmd)
-                .then(() => {
-                    bucketCreated = true;
-                    return done();
-                })
-                .catch(err => {
-                    if ((err.name === 'SlowDown'
-                        || err.$metadata?.httpStatusCode === 429)
-                        && attempt < maxAttempts - 1) {
-                        const delay = Math.pow(2, attempt) * 1000;
-                        process.stdout.write(
-                            `SlowDown creating bucket, retrying in ${delay}ms (attempt ${attempt + 1})\n`);
-                        return setTimeout(() => createBucket(attempt + 1), delay);
-                    }
-                    process.stdout.write(`err in creating bucket ${err}`);
-                    return done(err);
-                });
-        }
-
-        createBucket(0);
+        await gcpRetry(
+            gcpClient,
+            () => new CreateBucketCommand({ Bucket: bucketName }),
+        );
+        bucketCreated = true;
     });
 
     beforeEach(function beforeFn(done) {
diff --git a/tests/functional/raw-node/test/GCP/object/putTagging.js b/tests/functional/raw-node/test/GCP/object/putTagging.js
@@ -2,7 +2,7 @@ const assert = require('assert');
 const async = require('async');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genPutTagObj, genUniqID } =
+const { genPutTagObj, genUniqID, gcpRetry } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -20,16 +20,13 @@ describe('GCP: PUT Object Tagging', () => {
     let config;
     let gcpClient;
 
-    before(done => {
+    before(async () => {
         config = getRealAwsConfig(credentialOne);
         gcpClient = new GCP(config);
-        const cmd = new CreateBucketCommand({ Bucket: bucketName });
-        gcpClient.send(cmd)
-            .then(() => done())
-            .catch(err => {
-                process.stdout.write(`err in creating bucket ${err}`);
-                return done(err);
-            });
+        await gcpRetry(
+            gcpClient,
+            () => new CreateBucketCommand({ Bucket: bucketName }),
+        );
     });
 
     beforeEach(function beforeFn(done) {
diff --git a/tests/functional/raw-node/utils/gcpUtils.js b/tests/functional/raw-node/utils/gcpUtils.js
@@ -1,9 +1,50 @@
 const async = require('async');
 const assert = require('assert');
+const { callbackify } = require('util');
 const { v4: uuidv4 } = require('uuid');
 
 const genUniqID = () => uuidv4().replace(/-/g, '');
 
+const defaultShouldRetry = err =>
+    err && (err.name === 'SlowDown'|| err.$metadata?.httpStatusCode === 429);
+
+async function gcpRetry(gcpClient, makeCommand, retryOptions, cb) {
+    if (cb) {
+        return callbackify(() => gcpRetry(gcpClient, makeCommand,
+            retryOptions))(cb);
+    }
+
+    const {
+        maxAttempts = 3,
+        shouldRetry = defaultShouldRetry,
+        getDelayMs = attempt => Math.pow(2, attempt) * 1000,
+    } = retryOptions || {};
+
+    let lastError;
+
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            const cmd = typeof makeCommand === 'function' ?
+                makeCommand() : makeCommand;
+             
+            return await gcpClient.send(cmd);
+        } catch (err) {
+            lastError = err;
+            if (!shouldRetry(err, attempt) || attempt === maxAttempts - 1) {
+                throw err;
+            }
+            const delay = getDelayMs(attempt);
+            process.stdout.write(
+                'Retryable error from GCP, retrying in ' +
+                `${delay}ms (attempt ${attempt + 1}): ${err}\n`);
+             
+            await new Promise(resolve => setTimeout(resolve, delay));
+        }
+    }
+
+    throw lastError;
+}
+
 // mpu test helpers
 function gcpMpuSetup(params, callback) {
     const { gcpClient, bucketNames, key, partCount, partSize } = params;
@@ -118,4 +159,5 @@ module.exports = {
     genGetTagObj,
     genDelTagObj,
     genUniqID,
+    gcpRetry,
 };
