post reviews fixups

benzekrimaha · benzekrimaha · commit a4437577275f · 2026-02-02T12:45:18.000+01:00
diff --git a/tests/functional/raw-node/test/GCP/bucket/head.js b/tests/functional/raw-node/test/GCP/bucket/head.js
@@ -16,7 +16,7 @@ describe('GCP: HEAD Bucket', () => {
     const gcpClient = new GCP(config);
 
     describe('without existing bucket', () => {
-        beforeEach(function beforeFn() {
+        beforeEach(async function beforeFn() {
             this.currentTest.bucketName = `somebucket-${genUniqID()}`;
         });
 
@@ -49,10 +49,12 @@ describe('GCP: HEAD Bucket', () => {
         });
 
         afterEach(async function afterFn() {
-            const cmd = new DeleteBucketCommand({
-                Bucket: this.currentTest.bucketName,
-            });
-            await gcpClient.send(cmd);
+            await gcpRetry(
+                gcpClient,
+                new DeleteBucketCommand({
+                    Bucket: this.currentTest.bucketName,
+                }),
+            );
         });
 
         it('should get bucket information', async function testFn() {
diff --git a/tests/functional/raw-node/test/GCP/object/completeMpu.js b/tests/functional/raw-node/test/GCP/object/completeMpu.js
@@ -7,13 +7,13 @@ const {
     gcpMpuSetup,
     genUniqID,
     gcpRetry,
+    waitForBucketReady,
 } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
     CreateBucketCommand,
     DeleteBucketCommand,
-    HeadBucketCommand,
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
@@ -95,21 +95,6 @@ function emptyBucket(gcpClient, bucketName, cb) {
     });
 }
 
-function waitForBucketReady(gcpClient, bucketName) {
-    const cmd = new HeadBucketCommand({ Bucket: bucketName });
-    return gcpRetry(gcpClient, cmd, {
-        maxAttempts: 6,
-        shouldRetry: err => err && (
-            err.name === 'NoSuchBucket'
-            || err.name === 'NotFound'
-            || err.$metadata?.httpStatusCode === 404
-            || err.name === 'SlowDown'
-            || err.$metadata?.httpStatusCode === 429
-        ),
-        getDelayMs: attempt => (attempt + 1) * 1000,
-    });
-}
-
 describe('GCP: Complete MPU', function testSuite() {
     this.timeout(600000);
     let config;
@@ -123,13 +108,8 @@ describe('GCP: Complete MPU', function testSuite() {
             buckets,
             async bucket => {
                 const cmd = new CreateBucketCommand({ Bucket: bucket.Name });
-                try {
-                    await gcpRetry(gcpClient, cmd);
-                    await waitForBucketReady(gcpClient, bucket.Name);
-                } catch (err) {
-                    process.stdout.write(`err in creating bucket ${err}\n`);
-                    throw err;
-                }
+                await gcpRetry(gcpClient, cmd);
+                await waitForBucketReady(gcpClient, bucket.Name);
             },
         );
     });
@@ -149,12 +129,7 @@ describe('GCP: Complete MPU', function testSuite() {
                     });
                 });
                 const cmd = new DeleteBucketCommand({ Bucket: bucket.Name });
-                try {
-                    await gcpRetry(gcpClient, cmd);
-                } catch (err) {
-                    process.stdout.write(`err in deleting bucket ${err}\n`);
-                    throw err;
-                }
+                await gcpRetry(gcpClient, cmd);
             },
         );
     });
diff --git a/tests/functional/raw-node/test/GCP/object/copy.js b/tests/functional/raw-node/test/GCP/object/copy.js
@@ -51,7 +51,7 @@ describe('GCP: COPY Object', function testSuite() {
     });
 
     describe('with existing object in bucket', () => {
-        beforeEach(function beforeFn(done) {
+        beforeEach(async function beforeFn() {
             this.currentTest.key = `somekey-${genUniqID()}`;
             this.currentTest.copyKey = `copykey-${genUniqID()}`;
             this.currentTest.initValue = `${genUniqID()}`;
@@ -62,15 +62,8 @@ describe('GCP: COPY Object', function testSuite() {
                     value: this.currentTest.initValue,
                 },
             });
-            gcpClient.send(cmd)
-                .then(res => {
-                    this.currentTest.ETag = res.ETag;
-                    return done();
-                })
-                .catch(err => {
-                    process.stdout.write(`err in creating object ${err}\n`);
-                    return done(err);
-                });
+            const res = await gcpClient.send(cmd);
+            this.currentTest.ETag = res.ETag;
         });
 
         afterEach(function afterFn(done) {
diff --git a/tests/functional/raw-node/test/GCP/object/deleteMpu.js b/tests/functional/raw-node/test/GCP/object/deleteMpu.js
@@ -2,15 +2,14 @@ const assert = require('assert');
 const async = require('async');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { gcpMpuSetup, genUniqID, gcpRetry } =
+const { gcpMpuSetup, genUniqID, gcpRetry, waitForBucketReady } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
     CreateBucketCommand,
     DeleteBucketCommand,
     ListObjectsCommand,
-    HeadBucketCommand,
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
@@ -41,21 +40,6 @@ describe('GCP: Abort MPU', function testSuite() {
     let config;
     let gcpClient;
 
-    function waitForBucketReady(bucketName) {
-        const cmd = new HeadBucketCommand({ Bucket: bucketName });
-        return gcpRetry(gcpClient, cmd, {
-            maxAttempts: 6,
-            shouldRetry: err => err && (
-                err.name === 'NoSuchBucket'
-                || err.name === 'NotFound'
-                || err.$metadata?.httpStatusCode === 404
-                || err.name === 'SlowDown'
-                || err.$metadata?.httpStatusCode === 429
-            ),
-            getDelayMs: attempt => (attempt + 1) * 1000,
-        });
-    }
-
     before(async () => {
         config = getRealAwsConfig(credentialOne);
         gcpClient = new GCP(config);
@@ -68,7 +52,7 @@ describe('GCP: Abort MPU', function testSuite() {
                     gcpClient,
                     new CreateBucketCommand({ Bucket: bucket.Name }),
                 );
-                await waitForBucketReady(bucket.Name);
+                await waitForBucketReady(gcpClient, bucket.Name);
             },
         );
     });
diff --git a/tests/functional/raw-node/test/GCP/object/initiateMpu.js b/tests/functional/raw-node/test/GCP/object/initiateMpu.js
@@ -2,14 +2,17 @@ const assert = require('assert');
 const async = require('async');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } =
-    require('../../../utils/gcpUtils');
+const {
+    genUniqID,
+    gcpRetry,
+    gcpCreateMultipartUploadWithRetry,
+    waitForBucketReady,
+} = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
     CreateBucketCommand,
     DeleteBucketCommand,
-    HeadBucketCommand,
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
@@ -26,54 +29,6 @@ describe('GCP: Initiate MPU', function testSuite() {
     this.timeout(180000);
     let config;
     let gcpClient;
-    const maxCreateAttempts = 6;
-    const retryDelayMs = attempt => (attempt + 1) * 1000;
-    const isRetryableCreateError = err => err && (
-        err.name === 'NoSuchBucket'
-        || err.name === 'NotFound'
-        || err.$metadata?.httpStatusCode === 404
-        || err.name === 'SlowDown'
-        || err.$metadata?.httpStatusCode === 429
-    );
-
-    function waitForBucketReady(bucketName) {
-        const cmd = new HeadBucketCommand({ Bucket: bucketName });
-        return gcpRetry(gcpClient, cmd, {
-            maxAttempts: 6,
-            shouldRetry: err => err && (
-                err.name === 'NoSuchBucket'
-                || err.name === 'NotFound'
-                || err.$metadata?.httpStatusCode === 404
-                || err.name === 'SlowDown'
-                || err.$metadata?.httpStatusCode === 429
-            ),
-            getDelayMs: attempt => (attempt + 1) * 1000,
-        });
-    }
-
-    function createMultipartUploadWithRetry(bucket, key, metadata) {
-        return new Promise((resolve, reject) => {
-            const attemptCreate = attempt => {
-                gcpClient.createMultipartUpload({
-                    Bucket: bucket,
-                    Key: key,
-                    Metadata: metadata,
-                }, (err, res) => {
-                    if (!err) {
-                        resolve(res);
-                        return;
-                    }
-                    if (isRetryableCreateError(err) && attempt < maxCreateAttempts - 1) {
-                        const delay = retryDelayMs(attempt);
-                        setTimeout(() => attemptCreate(attempt + 1), delay);
-                        return;
-                    }
-                    reject(err);
-                });
-            };
-            attemptCreate(0);
-        });
-    }
 
     before(async () => {
         config = getRealAwsConfig(credentialOne);
@@ -86,7 +41,7 @@ describe('GCP: Initiate MPU', function testSuite() {
                     gcpClient,
                     new CreateBucketCommand({ Bucket: bucket.Name }),
                 );
-                await waitForBucketReady(bucket.Name);
+                await waitForBucketReady(gcpClient, bucket.Name);
             },
         );
     });
@@ -108,11 +63,11 @@ describe('GCP: Initiate MPU', function testSuite() {
         const keyName = `somekey-${genUniqID()}`;
         const specialKey = `special-${genUniqID()}`;
 
-        const createRes = await createMultipartUploadWithRetry(
-            bucketNames.mpu.Name,
-            keyName,
-            { special: specialKey },
-        );
+        const createRes = await gcpCreateMultipartUploadWithRetry(gcpClient, {
+            Bucket: bucketNames.mpu.Name,
+            Key: keyName,
+            Metadata: { special: specialKey },
+        });
 
         const mpuInitKey = `${keyName}-${createRes.UploadId}/init`;
         const headRes = await new Promise((resolve, reject) => {
diff --git a/tests/functional/raw-node/test/GCP/object/upload.js b/tests/functional/raw-node/test/GCP/object/upload.js
@@ -2,15 +2,14 @@ const assert = require('assert');
 const async = require('async');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry, gcpUploadWithRetry } =
+const { genUniqID, gcpRetry, gcpUploadWithRetry, waitForBucketReady } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
     CreateBucketCommand,
     DeleteBucketCommand,
     ListObjectsCommand,
-    HeadBucketCommand,
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
@@ -33,21 +32,6 @@ describe('GCP: Upload Object', function testSuite() {
     let config;
     let gcpClient;
 
-    function waitForBucketReady(bucketName) {
-        const cmd = new HeadBucketCommand({ Bucket: bucketName });
-        return gcpRetry(gcpClient, cmd, {
-            maxAttempts: 6,
-            shouldRetry: err => err && (
-                err.name === 'NoSuchBucket'
-                || err.name === 'NotFound'
-                || err.$metadata?.httpStatusCode === 404
-                || err.name === 'SlowDown'
-                || err.$metadata?.httpStatusCode === 429
-            ),
-            getDelayMs: attempt => (attempt + 1) * 1000,
-        });
-    }
-
     before(async () => {
         config = getRealAwsConfig(credentialOne);
         gcpClient = new GCP(config);
@@ -59,7 +43,7 @@ describe('GCP: Upload Object', function testSuite() {
                     gcpClient,
                     new CreateBucketCommand({ Bucket: bucket.Name }),
                 );
-                await waitForBucketReady(bucket.Name);
+                await waitForBucketReady(gcpClient, bucket.Name);
             },
         );
     });
diff --git a/tests/functional/raw-node/utils/gcpUtils.js b/tests/functional/raw-node/utils/gcpUtils.js
