✅ add Github ACTION id in the bucket name

DarkIsDude · DarkIsDude · commit e7418879ab46 · 2026-03-17T11:29:24.000+01:00
Issue: CLDSRV-867
diff --git a/package.json b/package.json
@@ -105,6 +105,7 @@
     "ft_node_routes": "cd tests/functional/raw-node && yarn run test-routes",
     "ft_route_backbeat": "cd tests/multipleBackend/routes && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 routeBackbeat.js routeBackbeatForReplication.js --exit",
     "ft_gcp": "cd tests/functional/raw-node && yarn run test-gcp",
+    "cleanup_gcp_buckets": "node scripts/cleanupOldGCPBuckets.js",
     "ft_healthchecks": "cd tests/functional/healthchecks && yarn test",
     "ft_s3cmd": "cd tests/functional/s3cmd && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 *.js --exit",
     "ft_s3curl": "cd tests/functional/s3curl && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 *.js --exit",
diff --git a/tests/functional/raw-node/test/GCP/bucket/get.js b/tests/functional/raw-node/test/GCP/bucket/get.js
@@ -10,13 +10,13 @@ const {
     DeleteObjectCommand,
 } = require('@aws-sdk/client-s3');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genUniqID, genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const { listingHardLimit } = require('../../../../../../constants');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-get-${genUniqID()}`;
+const bucketName = genBucketName('get');
 const smallSize = 20;
 const bigSize = listingHardLimit + 1;
 const config = getRealAwsConfig(credentialOne);
diff --git a/tests/functional/raw-node/test/GCP/bucket/getVersioning.js b/tests/functional/raw-node/test/GCP/bucket/getVersioning.js
@@ -7,7 +7,7 @@ const {
     DeleteBucketCommand,
 } = require('@aws-sdk/client-s3');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 
@@ -20,7 +20,7 @@ describe('GCP: GET Bucket Versioning', () => {
     const gcpClient = new GCP(config);
 
     beforeEach(async function beforeFn() {
-        this.currentTest.bucketName = `cldsrvci-getversioning-${genUniqID()}`;
+        this.currentTest.bucketName = genBucketName('getversioning');
         await gcpRetry(
             gcpClient,
             new CreateBucketCommand({
diff --git a/tests/functional/raw-node/test/GCP/bucket/head.js b/tests/functional/raw-node/test/GCP/bucket/head.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
@@ -17,7 +17,7 @@ describe('GCP: HEAD Bucket', () => {
 
     describe('without existing bucket', () => {
         beforeEach(async function beforeFn() {
-            this.currentTest.bucketName = `cldsrvci-head-${genUniqID()}`;
+            this.currentTest.bucketName = genBucketName('head');
         });
 
         it('should return 404', async function testFn() {
@@ -37,7 +37,7 @@ describe('GCP: HEAD Bucket', () => {
 
     describe('with existing bucket', () => {
         beforeEach(async function beforeFn() {
-            this.currentTest.bucketName = `cldsrvci-head-${genUniqID()}`;
+            this.currentTest.bucketName = genBucketName('head');
             process.stdout
                 .write(`Creating test bucket ${this.currentTest.bucketName}\n`);
             await gcpRetry(
diff --git a/tests/functional/raw-node/test/GCP/bucket/putVersioning.js b/tests/functional/raw-node/test/GCP/bucket/putVersioning.js
@@ -7,14 +7,14 @@ const {
     DeleteBucketCommand,
 } = require('@aws-sdk/client-s3');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 
 const credentialOne = 'gcpbackend';
 const verEnabledStatus = 'Enabled';
 const verDisabledStatus = 'Suspended';
-const bucketName = `cldsrvci-putversioning-${genUniqID()}`;
+const bucketName = genBucketName('putversioning');
 
 describe('GCP: PUT Bucket Versioning', () => {
     const config = getRealAwsConfig(credentialOne);
diff --git a/tests/functional/raw-node/test/GCP/object/completeMpu.js b/tests/functional/raw-node/test/GCP/object/completeMpu.js
@@ -7,6 +7,7 @@ const { GCP, GcpUtils } = arsenal.storage.data.external.GCP;
 const {
     gcpMpuSetup,
     genUniqID,
+    genBucketName,
     gcpRetry,
     waitForBucketReady,
 } = require('../../../utils/gcpUtils');
@@ -20,11 +21,11 @@ const {
 const credentialOne = 'gcpbackend';
 const bucketNames = {
     main: {
-        Name: `cldsrvci-completempu-${genUniqID()}`,
+        Name: genBucketName('completempu'),
         Type: 'MULTI_REGIONAL',
     },
     mpu: {
-        Name: `cldsrvci-mpu-completempu-${genUniqID()}`,
+        Name: genBucketName('mpu-completempu'),
         Type: 'MULTI_REGIONAL',
     },
 };
diff --git a/tests/functional/raw-node/test/GCP/object/copy.js b/tests/functional/raw-node/test/GCP/object/copy.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 { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genUniqID, genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
@@ -12,7 +12,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-copy-${genUniqID()}`;
+const bucketName = genBucketName('copy');
 
 describe('GCP: COPY Object', function testSuite() {
     this.timeout(180000);
diff --git a/tests/functional/raw-node/test/GCP/object/delete.js b/tests/functional/raw-node/test/GCP/object/delete.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 { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genUniqID, genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
@@ -13,7 +13,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-deleteobj-${genUniqID()}`;
+const bucketName = genBucketName('deleteobj');
 const objectKey = `somekey-${genUniqID()}`;
 const badObjectKey = `nonexistingkey-${genUniqID()}`;
 
diff --git a/tests/functional/raw-node/test/GCP/object/deleteMpu.js b/tests/functional/raw-node/test/GCP/object/deleteMpu.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 { gcpMpuSetup, genUniqID, gcpRetry, waitForBucketReady } =
+const { gcpMpuSetup, genUniqID, genBucketName, gcpRetry, waitForBucketReady } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -15,10 +15,10 @@ const {
 const credentialOne = 'gcpbackend';
 const bucketNames = {
     main: {
-        Name: `cldsrvci-deletempu-${genUniqID()}`,
+        Name: genBucketName('deletempu'),
     },
     mpu: {
-        Name: `cldsrvci-mpu-deletempu-${genUniqID()}`,
+        Name: genBucketName('mpu-deletempu'),
     },
 };
 const numParts = 10;
diff --git a/tests/functional/raw-node/test/GCP/object/deleteTagging.js b/tests/functional/raw-node/test/GCP/object/deleteTagging.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 { genDelTagObj, genUniqID, gcpRetry } =
+const { genDelTagObj, genUniqID, genBucketName, gcpRetry } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -14,7 +14,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-deletetagging-${genUniqID()}`;
+const bucketName = genBucketName('deletetagging');
 let config;
 let gcpClient;
 
diff --git a/tests/functional/raw-node/test/GCP/object/get.js b/tests/functional/raw-node/test/GCP/object/get.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genUniqID, genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
@@ -13,7 +13,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-get-${genUniqID()}`;
+const bucketName = genBucketName('get');
 
 describe('GCP: GET Object', function testSuite() {
     this.timeout(30000);
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, gcpRetry } =
+const { genGetTagObj, genUniqID, genBucketName, gcpRetry } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -13,7 +13,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-gettagging-${genUniqID()}`;
+const bucketName = genBucketName('gettagging');
 const tagSize = 10;
 
 describe('GCP: GET Object Tagging', () => {
diff --git a/tests/functional/raw-node/test/GCP/object/head.js b/tests/functional/raw-node/test/GCP/object/head.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genUniqID, genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
@@ -12,7 +12,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-head-${genUniqID()}`;
+const bucketName = genBucketName('head');
 
 describe('GCP: HEAD Object', function testSuite() {
     this.timeout(30000);
diff --git a/tests/functional/raw-node/test/GCP/object/initiateMpu.js b/tests/functional/raw-node/test/GCP/object/initiateMpu.js
@@ -4,6 +4,7 @@ const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
 const {
     genUniqID,
+    genBucketName,
     gcpRetry,
     gcpCreateMultipartUploadWithRetry,
     waitForBucketReady,
@@ -18,10 +19,10 @@ const {
 const credentialOne = 'gcpbackend';
 const bucketNames = {
     main: {
-        Name: `cldsrvci-initiatempu-${genUniqID()}`,
+        Name: genBucketName('initiatempu'),
     },
     mpu: {
-        Name: `cldsrvci-mpu-initiatempu-${genUniqID()}`,
+        Name: genBucketName('mpu-initiatempu'),
     },
 };
 
diff --git a/tests/functional/raw-node/test/GCP/object/put.js b/tests/functional/raw-node/test/GCP/object/put.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
 const arsenal = require('arsenal');
 const { GCP } = arsenal.storage.data.external.GCP;
-const { genUniqID, gcpRetry } = require('../../../utils/gcpUtils');
+const { genUniqID, genBucketName, gcpRetry } = require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
 const {
@@ -11,7 +11,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-put-${genUniqID()}`;
+const bucketName = genBucketName('put');
 
 describe('GCP: PUT Object', function testSuite() {
     this.timeout(30000);
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, gcpRetry } =
+const { genPutTagObj, genUniqID, genBucketName, gcpRetry } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -14,7 +14,7 @@ const {
 } = require('@aws-sdk/client-s3');
 
 const credentialOne = 'gcpbackend';
-const bucketName = `cldsrvci-puttagging-${genUniqID()}`;
+const bucketName = genBucketName('puttagging');
 
 describe('GCP: PUT Object Tagging', () => {
     let config;
diff --git a/tests/functional/raw-node/test/GCP/object/upload.js b/tests/functional/raw-node/test/GCP/object/upload.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 { genUniqID, gcpRetry, gcpUploadWithRetry, waitForBucketReady } =
+const { genUniqID, genBucketName, gcpRetry, gcpUploadWithRetry, waitForBucketReady } =
     require('../../../utils/gcpUtils');
 const { getRealAwsConfig } =
     require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -15,10 +15,10 @@ const {
 const credentialOne = 'gcpbackend';
 const bucketNames = {
     main: {
-        Name: `cldsrvci-upload-${genUniqID()}`,
+        Name: genBucketName('upload'),
     },
     mpu: {
-        Name: `cldsrvci-mpu-upload-${genUniqID()}`,
+        Name: genBucketName('mpu-upload'),
     },
 };
 
diff --git a/tests/functional/raw-node/utils/gcpUtils.js b/tests/functional/raw-node/utils/gcpUtils.js
@@ -3,7 +3,13 @@ const { callbackify } = require('util');
 const { v4: uuidv4 } = require('uuid');
 const { HeadBucketCommand } = require('@aws-sdk/client-s3');
 
-const genUniqID = () => uuidv4().replace(/-/g, '');
+const genUniqID = () => {
+    const runId = process.env.GITHUB_RUN_ID;
+    const suffix = uuidv4().replace(/-/g, '').slice(0, 8);
+    return runId ? `${runId}-${suffix}` : uuidv4().replace(/-/g, '');
+};
+
+const genBucketName = testName => `cldsrvci-${testName}-${genUniqID()}`;
 
 const defaultShouldRetry = err =>
     err && (err.name === 'SlowDown' || err.$metadata?.httpStatusCode === 429);
@@ -18,7 +24,6 @@ async function gcpRetryCall(callFn, retryOptions) {
     let lastError;
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
         try {
-             
             return await callFn();
         } catch (err) {
             lastError = err;
@@ -219,6 +224,7 @@ module.exports = {
     genGetTagObj,
     genDelTagObj,
     genUniqID,
+    genBucketName,
     gcpRetryCall,
     gcpRetry,
     gcpCreateMultipartUploadWithRetry,
