Skip to content

CLDSRV-808: PUT/GET bucket logging fix test cleanup #6024

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

Merged
bert-e merged 2 commits into from
Dec 10, 2025
+45 −22
Merged

CLDSRV-808: PUT/GET bucket logging fix test cleanup #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d0956b
CLDSRV-808: PUT/GET bucket logging fix test cleanup
leif-scality Dec 10, 2025
be287a3
CLDSRV-808: bump package.json version to 9.2.8
leif-scality Dec 10, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenko/cloudserver",
"version": "9.2.7",
"version": "9.2.8",
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
"main": "index.js",
"engines": {
Expand Down
36 changes: 24 additions & 12 deletions tests/functional/aws-node-sdk/test/bucket/getBucketLogging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,31 @@ const validLoggingConfig = {
},
};

function cleanUp(bucketUtil, cb) {
Promise.all([
bucketUtil.deleteOne(bucketName).catch(err => {
if (err && err.code !== 'NoSuchBucket') {
throw err;
}
}),
bucketUtil.deleteOne(targetBucket).catch(err => {
if (err && err.code !== 'NoSuchBucket') {
throw err;
}
}),
]).then(() => cb()).catch(err => cb(err));
}

describe('GET bucket logging', () => {
withV4(sigCfg => {
const bucketUtil = new BucketUtility('default', sigCfg);
const s3 = bucketUtil.s3;

afterEach(done => {
process.stdout.write('Deleting buckets\n');
bucketUtil.deleteOne(bucketName).then(() => bucketUtil.deleteOne(targetBucket)).then(() => done())
.catch(err => {
if (err && err.code !== 'NoSuchBucket') {
return done(err);
}
return done();
});
});
after(done => { cleanUp(bucketUtil, done); });

describe('without existing bucket', () => {
afterEach(done => { cleanUp(bucketUtil, done); });

it('should return NoSuchBucket', done => {
s3.getBucketLogging({ Bucket: bucketName }, err => {
assert(err);
Expand All @@ -41,7 +49,9 @@ describe('GET bucket logging', () => {
});

describe('on bucket without logging configuration', () => {
before(done => {
afterEach(done => { cleanUp(bucketUtil, done); });

beforeEach(done => {
process.stdout.write('Creating bucket without logging\n');
s3.createBucket({ Bucket: bucketName }, err => {
if (err) {
Expand All @@ -65,7 +75,9 @@ describe('GET bucket logging', () => {
});

describe('with existing logging configuration', () => {
before(done => {
afterEach(done => { cleanUp(bucketUtil, done); });

beforeEach(done => {
process.stdout.write('Creating buckets and setting logging\n');
return s3.createBucket({ Bucket: bucketName }, err => {
if (err) {
Expand Down
29 changes: 20 additions & 9 deletions tests/functional/aws-node-sdk/test/bucket/putBucketLogging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,21 @@ const validLoggingConfigWithGrants = {

const itSkipIfAWS = process.env.AWS_ON_AIR ? it.skip : it;

function cleanUp(bucketUtil, cb) {
Promise.all([
bucketUtil.deleteOne(bucketName).catch(err => {
if (err && err.code !== 'NoSuchBucket') {
throw err;
}
}),
bucketUtil.deleteOne(targetBucket).catch(err => {
if (err && err.code !== 'NoSuchBucket') {
throw err;
}
}),
]).then(() => cb()).catch(err => cb(err));
}

describe('PUT bucket logging', () => {
withV4(sigCfg => {
const bucketUtil = new BucketUtility('default', sigCfg);
Expand All @@ -57,6 +72,10 @@ describe('PUT bucket logging', () => {
});
}

after(done => {
cleanUp(bucketUtil, done);
});

describe('without existing bucket', () => {
it('should return NoSuchBucket', done => {
_testPutBucketLoggingError(s3, validLoggingConfig, 404, 'NoSuchBucket', done);
Expand All @@ -75,14 +94,7 @@ describe('PUT bucket logging', () => {
});

afterEach(done => {
process.stdout.write('Deleting buckets\n');
bucketUtil.deleteOne(bucketName).then(() => bucketUtil.deleteOne(targetBucket)).then(() => done())
.catch(err => {
if (err && err.code !== 'NoSuchBucket') {
return done(err);
}
return done();
});
cleanUp(bucketUtil, done);
});

it('should put bucket logging configuration successfully', done => {
Expand Down Expand Up @@ -209,7 +221,6 @@ describe('PUT bucket logging', () => {
TargetPrefix: 'logs/',
},
};

s3.putBucketLogging({
Bucket: bucketName,
BucketLoggingStatus: crossAccountConfig,
Expand Down
Loading