Skip to content

Improvement/cldsrv 724-backbeat-related-functional-tests #5985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benzekrimaha wants to merge 20 commits into
base: improvement/CLDSRV-724-service-get-related-functional-tests
Choose a base branch
from
Open

Improvement/cldsrv 724-backbeat-related-functional-tests #5985

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a1fff68
backbeat functional tests migration
benzekrimaha Dec 2, 2025
91fe932
aws-node-sdk bucket functional tests migration
benzekrimaha Dec 2, 2025
7408990
aws-node-sdk multiple backend tests migration
benzekrimaha Dec 2, 2025
0ff38c1
raw-node gcp object and bucket tests migration
benzekrimaha Dec 2, 2025
1c371b1
routBackbeat migration adaptation
benzekrimaha Dec 2, 2025
03dc295
aws-node-sdk test utils migration
benzekrimaha Dec 2, 2025
ac83417
raw-node rest of code migration
benzekrimaha Dec 2, 2025
b07e438
rest of code migration
benzekrimaha Dec 2, 2025
c2f4c3a
deps install
benzekrimaha Dec 2, 2025
0be0667
add ceph logs in CI for debug purposes in future
benzekrimaha Dec 2, 2025
b534e28
commenting out ceph tests from CI
benzekrimaha Dec 2, 2025
3699de7
getlocation functional aws-node-sdk test bucket lint
benzekrimaha Dec 2, 2025
b3e16fb
multiple backend aws-node-sdk lint fixup
benzekrimaha Dec 2, 2025
536ef7f
arsenal rebump
benzekrimaha Dec 4, 2025
1af0814
new bucket logging and rate limit tests migration
benzekrimaha Dec 4, 2025
1ce0df8
new bucket logging and rate limit tests migration
benzekrimaha Dec 4, 2025
cede1b9
new bucket logging and rate limit tests migration
benzekrimaha Dec 4, 2025
553c156
new bucket logging and rate limit tests migration
benzekrimaha Dec 4, 2025
768b263
latest arsenal bump
benzekrimaha Dec 5, 2025
5313153
fixups post reviews
benzekrimaha Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions tests/functional/raw-node/test/GCP/bucket/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand All @@ -25,11 +25,13 @@ function populateBucket(createdObjects, callback) {
bucket: bucketName,
objectKey: object,
authCredentials: config.credentials,
}, err => moveOn(err));
}, err => {
moveOn(err);
});
}, err => {
if (err) {
process.stdout
.write(`err putting objects ${err.code}`);
.write(`err putting objects ${err.code}\n`);
}
return callback(err);
});
Expand All @@ -49,7 +51,7 @@ function removeObjects(createdObjects, callback) {
}, err => {
if (err) {
process.stdout
.write(`err deleting objects ${err.code}`);
.write(`err deleting objects ${err.code}\n`);
}
return callback(err);
});
Expand Down Expand Up @@ -87,12 +89,22 @@ describe('GCP: GET Bucket', function testSuite() {
describe('without existing bucket', () => {
it('should return 404 and NoSuchBucket', done => {
const badBucketName = `nonexistingbucket-${genUniqID()}`;
gcpClient.getBucket({
gcpClient.listObjects({
Copy link
Contributor

@SylvainSenechal SylvainSenechal Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why changing from getBucket to listObject ? I guess the test is still valid because listObject will also return noSuchBucket but still, here we want to test the getBucket api I think

Bucket: badBucketName,
}, err => {
assert(err);
assert.strictEqual(err.statusCode, 404);
assert.strictEqual(err.code, 'NoSuchBucket');
assert.strictEqual(err.$metadata?.httpStatusCode, 404);
assert.strictEqual(err.name, 'NoSuchBucket');
return done();
});
});

it('should return 200', done => {
gcpClient.listObjects({
Bucket: bucketName,
}, (err, res) => {
assert.equal(err, null, `Expected success, but got ${err}`);
assert.strictEqual(res.$metadata?.httpStatusCode, 200);
return done();
});
});
Expand Down
36 changes: 19 additions & 17 deletions tests/functional/raw-node/test/GCP/bucket/getVersioning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
require('../../../../aws-node-sdk/test/support/awsConfig');

const credentialOne = 'gcpbackend';
const verEnabledObj = { Status: 'Enabled' };
const verDisabledObj = { Status: 'Suspended' };
const verEnabledObj = 'Enabled';
const verDisabledObj = 'Suspended';
const xmlEnable =
'<?xml version="1.0" encoding="UTF-8"?>' +
'<VersioningConfiguration>' +
Expand All @@ -33,7 +33,7 @@ describe('GCP: GET Bucket Versioning', () => {
authCredentials: config.credentials,
}, 0, err => {
if (err) {
process.stdout.write(`err in creating bucket ${err}\n`);
process.stdout.write(`err in creating bucket ${err.code}\n`);
}
return done(err);
});
Expand All @@ -46,7 +46,7 @@ describe('GCP: GET Bucket Versioning', () => {
authCredentials: config.credentials,
}, 0, err => {
if (err) {
process.stdout.write(`err in deleting bucket ${err}\n`);
process.stdout.write(`err in deleting bucket ${err.code}\n`);
}
return done(err);
});
Expand All @@ -58,22 +58,24 @@ describe('GCP: GET Bucket Versioning', () => {
method: 'PUT',
bucket: this.test.bucketName,
authCredentials: config.credentials,
queryObj: { versioning: {} },
queryObj: { versioning: '' },
requestBody: xmlEnable,
}, err => {
if (err) {
process.stdout.write(`err in setting versioning ${err}`);
process.stdout.write(`err in setting versioning ${err.code}`);
}
return next(err);
}),
next => gcpClient.getBucketVersioning({
Bucket: this.test.bucketName,
}, (err, res) => {
assert.equal(err, null,
`Expected success, but got err ${err}`);
assert.deepStrictEqual(res, verEnabledObj);
return next();
}),
next => {
gcpClient.getBucketVersioning({
Bucket: this.test.bucketName,
}, (err, res) => {
assert.equal(err, null,
`Expected success, but got err ${err}`);
assert.deepStrictEqual(res.Status, verEnabledObj);
return next();
});
},
], err => done(err));
});

Expand All @@ -83,7 +85,7 @@ describe('GCP: GET Bucket Versioning', () => {
method: 'PUT',
bucket: this.test.bucketName,
authCredentials: config.credentials,
queryObj: { versioning: {} },
queryObj: { versioning: '' },
requestBody: xmlDisable,
}, err => {
if (err) {
Expand All @@ -96,7 +98,7 @@ describe('GCP: GET Bucket Versioning', () => {
}, (err, res) => {
assert.equal(err, null,
`Expected success, but got err ${err}`);
assert.deepStrictEqual(res, verDisabledObj);
assert.deepStrictEqual(res.Status, verDisabledObj);
return next();
}),
], err => done(err));
Expand Down
8 changes: 5 additions & 3 deletions tests/functional/raw-node/test/GCP/bucket/head.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const assert = require('assert');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
require('../../../../aws-node-sdk/test/support/awsConfig');
Expand All @@ -22,7 +22,7 @@ describe('GCP: HEAD Bucket', () => {
Bucket: this.test.bucketName,
}, err => {
assert(err);
assert.strictEqual(err.statusCode, 404);
assert.strictEqual(err.$metadata?.httpStatusCode, 404);
return done();
});
});
Expand Down Expand Up @@ -67,7 +67,9 @@ describe('GCP: HEAD Bucket', () => {
Bucket: this.test.bucketName,
}, (err, res) => {
assert.equal(err, null, `Expected success, but got ${err}`);
assert.deepStrictEqual(this.test.bucketObj, res);
const { $metadata, ...data } = res;
assert.strictEqual($metadata.httpStatusCode, 200);
assert.deepStrictEqual(this.test.bucketObj, data);
return done();
});
});
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/raw-node/test/GCP/bucket/putVersioning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const xml2js = require('xml2js');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down Expand Up @@ -70,7 +70,7 @@ describe('GCP: PUT Bucket Versioning', () => {
method: 'GET',
bucket: this.test.bucketName,
authCredentials: config.credentials,
queryObj: { versioning: {} },
queryObj: { versioning: '' },
}, (err, res) => {
if (err) {
process.stdout.write(`err in retrieving bucket ${err}`);
Expand All @@ -97,7 +97,7 @@ describe('GCP: PUT Bucket Versioning', () => {
method: 'GET',
bucket: this.test.bucketName,
authCredentials: config.credentials,
queryObj: { versioning: {} },
queryObj: { versioning: '' },
}, (err, res) => {
if (err) {
process.stdout.write(`err in retrieving bucket ${err}`);
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/completeMpu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP, GcpUtils } = arsenal.storage.data.external;
const { GCP, GcpUtils } = arsenal.storage.data.external.GCP;
const { gcpRequestRetry, setBucketClass, gcpMpuSetup, genUniqID } =
require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/raw-node/test/GCP/object/copy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down Expand Up @@ -51,8 +51,8 @@ describe('GCP: COPY Object', function testSuite() {
CopySource: `/${bucketName}/${missingObject}`,
}, err => {
assert(err);
assert.strictEqual(err.statusCode, 404);
assert.strictEqual(err.code, 'NoSuchKey');
assert.strictEqual(err.$metadata.httpStatusCode, 404);
assert.strictEqual(err.name, 'NoSuchKey');
return done();
});
});
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/raw-node/test/GCP/object/delete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down Expand Up @@ -90,8 +90,8 @@ describe('GCP: DELETE Object', function testSuite() {
Key: badObjectKey,
}, err => {
assert(err);
assert.strictEqual(err.statusCode, 404);
assert.strictEqual(err.code, 'NoSuchKey');
assert.strictEqual(err.$metadata.httpStatusCode, 404);
assert.strictEqual(err.name, 'NoSuchKey');
return done();
});
});
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/raw-node/test/GCP/object/deleteMpu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { gcpRequestRetry, setBucketClass, gcpMpuSetup, genUniqID } =
require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down Expand Up @@ -122,7 +122,7 @@ describe('GCP: Abort MPU', function testSuite() {
Key: keyName,
}, err => {
assert(err);
assert.strictEqual(err.code, 404);
assert.strictEqual(err.$metadata.httpStatusCode, 404);
return next();
});
},
Expand Down Expand Up @@ -164,7 +164,7 @@ describe('GCP: Abort MPU', function testSuite() {
Key: keyName,
}, err => {
assert(err);
assert.strictEqual(err.code, 404);
assert.strictEqual(err.$metadata.httpStatusCode, 404);
return next();
});
},
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/deleteTagging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genDelTagObj, genUniqID } =
require('../../../utils/gcpUtils');
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/raw-node/test/GCP/object/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const assert = require('assert');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down Expand Up @@ -96,8 +96,8 @@ describe('GCP: GET Object', function testSuite() {
Key: badObjectKey,
}, err => {
assert(err);
assert.strictEqual(err.statusCode, 404);
assert.strictEqual(err.code, 'NoSuchKey');
assert.strictEqual(err.$metadata?.httpStatusCode, 404);
assert.strictEqual(err.name, 'NoSuchKey');
return done();
});
});
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/getTagging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const assert = require('assert');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genGetTagObj, genUniqID } =
require('../../../utils/gcpUtils');
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/raw-node/test/GCP/object/head.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const assert = require('assert');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down Expand Up @@ -96,7 +96,7 @@ describe('GCP: HEAD Object', function testSuite() {
Key: badObjectkey,
}, err => {
assert(err);
assert.strictEqual(err.statusCode, 404);
assert.strictEqual(err.$metadata.httpStatusCode, 404);
return done();
});
});
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/initiateMpu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, setBucketClass, genUniqID } =
require('../../../utils/gcpUtils');
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/put.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const assert = require('assert');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genUniqID } = require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/putTagging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { makeGcpRequest } = require('../../../utils/makeRequest');
const { gcpRequestRetry, genPutTagObj, genUniqID } =
require('../../../utils/gcpUtils');
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/raw-node/test/GCP/object/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const async = require('async');
const arsenal = require('arsenal');
const { GCP } = arsenal.storage.data.external;
const { GCP } = arsenal.storage.data.external.GCP;
const { gcpRequestRetry, setBucketClass, genUniqID } =
require('../../../utils/gcpUtils');
const { getRealAwsConfig } =
Expand Down