Skip to content

Commit fea7c95

Browse files
SylvainSenechalSylvainSenechal
committed
continue refactor
1 parent 52bdf31 commit fea7c95

File tree

10 files changed

+94
-139
lines changed

10 files changed

+94
-139
lines changed

‎tests/zenko_tests/node_tests/backbeat/LifecycleUtility.js‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,18 @@ const async = require('async');
33
const {
44
CreateBucketCommand,
55
CreateMultipartUploadCommand,
6-
CopyObjectCommand,
76
DeleteBucketCommand,
87
DeleteObjectCommand,
9-
GetBucketVersioningCommand,
10-
GetBucketReplicationCommand,
118
GetObjectCommand,
129
HeadObjectCommand,
1310
ListObjectsCommand,
1411
ListObjectVersionsCommand,
1512
ListMultipartUploadsCommand,
1613
PutBucketLifecycleConfigurationCommand,
17-
PutBucketReplicationCommand,
1814
PutBucketVersioningCommand,
19-
PutObjectCommand,
2015
PutObjectLegalHoldCommand,
2116
PutObjectLockConfigurationCommand,
22-
PutObjectTaggingCommand,
2317
RestoreObjectCommand,
24-
S3Client,
2518
} = require('@aws-sdk/client-s3');
2619
const ReplicationUtility = require('./ReplicationUtility');
2720

@@ -385,7 +378,6 @@ class LifecycleUtility extends ReplicationUtility {
385378
hasObjects(bucket, count, cb) {
386379
this.s3.send(new ListObjectsCommand({ Bucket: bucket }))
387380
.then(res => {
388-
console.log(`hasObjects: ${JSON.stringify(res)}`);
389381
const contents = res.Contents || [];
390382
if (typeof count === 'number') {
391383
return cb(null, contents.length === count);
@@ -398,7 +390,6 @@ class LifecycleUtility extends ReplicationUtility {
398390
hasDeleteMarkers(bucket, count, cb) {
399391
this.s3.send(new ListObjectVersionsCommand({ Bucket: bucket }))
400392
.then(res => {
401-
console.log(`hasDeleteMarkers: ${JSON.stringify(res)}`);
402393
const deleteMarkers = res.DeleteMarkers || [];
403394
if (typeof count === 'number') {
404395
return cb(null, deleteMarkers.length === count);
@@ -411,7 +402,6 @@ class LifecycleUtility extends ReplicationUtility {
411402
hasVersionedObjects(bucket, count, cb) {
412403
this.s3.send(new ListObjectVersionsCommand({ Bucket: bucket }))
413404
.then(res => {
414-
console.log(`hasVersionedObjects: ${JSON.stringify(res)}`);
415405
const versions = res.Versions || [];
416406
if (typeof count === 'number') {
417407
return cb(null, versions.length === count);
@@ -424,7 +414,6 @@ class LifecycleUtility extends ReplicationUtility {
424414
hasIncompleteMPUs(bucket, count, cb) {
425415
this.s3.send(new ListMultipartUploadsCommand({ Bucket: bucket }))
426416
.then(res => {
427-
console.log(`hasIncompleteMPUs: ${JSON.stringify(res)}`);
428417
const uploads = res.Uploads || [];
429418
if (typeof count === 'number') {
430419
return cb(null, uploads.length === count);

‎tests/zenko_tests/node_tests/backbeat/ReplicationUtility.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const async = require('async');
44
const { jsutil } = require('arsenal');
55

66
const {
7-
DeleteObjectsCommand,
87
ListObjectVersionsCommand,
98
PutObjectCommand,
109
CopyObjectCommand,
@@ -98,8 +97,6 @@ class ReplicationUtility {
9897
// If replicating to a multiple backend bucket, we only want to
9998
// remove versions that we have put with our tests.
10099
if (keyPrefix) {
101-
const originalVersionCount = versions.length;
102-
const originalMarkerCount = deleteMarkers.length;
103100
versions = versions.filter(version => version.Key.startsWith(keyPrefix));
104101
deleteMarkers = deleteMarkers.filter(marker => marker.Key.startsWith(keyPrefix));
105102
}
@@ -109,12 +106,8 @@ class ReplicationUtility {
109106
}
110107

111108
return async.series([
112-
next => {
113-
this._deleteVersionList(deleteMarkers, bucketName, next);
114-
},
115-
next => {
116-
this._deleteVersionList(versions, bucketName, next);
117-
},
109+
next => this._deleteVersionList(deleteMarkers, bucketName, next),
110+
next => this._deleteVersionList(versions, bucketName, next),
118111
], err => {
119112
cb(err);
120113
});

‎tests/zenko_tests/node_tests/backbeat/tests/ingestion/ingestionS3C.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,6 @@ describe('Ingesting existing data from RING S3C bucket', () => {
415415
);
416416
},
417417
next => {
418-
const startTime = Date.now();
419418
ringS3CUtils.s3.send(new ListObjectVersionsCommand({
420419
Bucket: ingestionNonVersionedSrcBucket,
421420
}))
@@ -440,15 +439,8 @@ describe('Ingesting existing data from RING S3C bucket', () => {
440439
return next(error);
441440
}
442441

443-
let processedCount = 0;
444-
const totalObjects = versions.length;
445-
const overallStartTime = Date.now();
446-
447442
// Process objects serially to avoid overwhelming the ingestion service
448443
async.forEachSeries(versions, (version, cb) => {
449-
processedCount++;
450-
const objectStartTime = Date.now();
451-
452444
scalityUtils.compareObjectsRINGS3C(
453445
ingestionNonVersionedSrcBucket,
454446
INGESTION_DEST_BUCKET,

‎tests/zenko_tests/node_tests/backbeat/tests/lifecycle/transition.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ testsToRun.forEach(test => {
136136
return cloud.clearBucket(next);
137137
},
138138
], err => {
139+
if (err || (!this.currentTest.isPending() && !this.currentTest.isPassed())) {
140+
const testName = this.currentTest.fullTitle();
141+
const retry = this.currentTest.currentRetry();
142+
console.log(` FAILED ${testName} [retry #${retry}] : ${srcBucket}`);
143+
}
139144
done(err);
140145
});
141146
});

‎tests/zenko_tests/node_tests/cloudserver/bucketPolicy/tests/bucketPolicy.js‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,11 @@ const async = require('async');
66
const uuidV4 = require('uuid/v4');
77
const {
88
CreateBucketCommand,
9-
DeleteBucketCommand,
10-
PutObjectCommand,
11-
DeleteObjectCommand,
12-
GetObjectCommand,
139
PutBucketPolicyCommand,
14-
GetBucketPolicyCommand,
1510
DeleteBucketPolicyCommand,
16-
PutBucketWebsiteCommand,
17-
GetBucketWebsiteCommand,
18-
DeleteBucketWebsiteCommand,
19-
PutBucketCorsCommand,
20-
GetBucketCorsCommand,
21-
DeleteBucketCorsCommand,
22-
PutBucketLifecycleConfigurationCommand,
23-
GetBucketLifecycleConfigurationCommand,
24-
DeleteBucketLifecycleCommand,
25-
PutBucketReplicationCommand,
26-
GetBucketReplicationCommand,
27-
DeleteBucketReplicationCommand,
28-
PutBucketVersioningCommand,
29-
GetBucketVersioningCommand,
3011
CreateMultipartUploadCommand,
31-
UploadPartCommand,
32-
CompleteMultipartUploadCommand,
3312
AbortMultipartUploadCommand,
34-
ListMultipartUploadsCommand,
35-
ListPartsCommand,
3613
GetBucketLocationCommand,
37-
PutBucketAclCommand,
38-
GetBucketAclCommand,
39-
PutObjectAclCommand,
40-
GetObjectAclCommand,
41-
ListObjectsCommand,
42-
ListObjectsV2Command,
43-
CopyObjectCommand,
44-
DeleteObjectsCommand,
4514
} = require('@aws-sdk/client-s3');
4615

4716
const { scalityS3Client, altScalityS3Client } = require('../../../s3SDK');
@@ -159,9 +128,13 @@ describe('Bucket policies', () => {
159128
]);
160129

161130
await scalityS3Client.send(new PutBucketPolicyCommand(params));
162-
const mpuData = await scalityS3Client.send(new CreateMultipartUploadCommand({ Bucket: bucket, Key: mpuKey }));
131+
const mpuData = await scalityS3Client.send(new CreateMultipartUploadCommand(
132+
{ Bucket: bucket, Key: mpuKey },
133+
));
163134
const uId = mpuData.UploadId;
164-
await altScalityS3Client.send(new AbortMultipartUploadCommand({ Bucket: bucket, Key: mpuKey, UploadId: uId }));
135+
await altScalityS3Client.send(new AbortMultipartUploadCommand(
136+
{ Bucket: bucket, Key: mpuKey, UploadId: uId },
137+
));
165138
});
166139

167140
it(`should not ${allow} because bucket owner action: `

‎tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/nonVersionedBucket.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const assert = require('assert');
2-
const async = require('async');
32
const werelogs = require('werelogs');
43
const { MetadataWrapper } = require('arsenal').storage.metadata;
54
const { versioning } = require('arsenal');
@@ -53,7 +52,7 @@ describe('Cloudserver : keyFormatVersion : non versioned bucket', () => {
5352
const bucketInfo = await new Promise((resolve, reject) => {
5453
metadata.getBucket('tmp-bucket', logger, (err, res) => {
5554
if (err) return reject(err);
56-
resolve(res);
55+
return resolve(res);
5756
});
5857
});
5958

@@ -97,7 +96,7 @@ describe('Cloudserver : keyFormatVersion : non versioned bucket', () => {
9796
await new Promise((resolve, reject) => {
9897
metadata.createBucket(BUCKET_NAME[vFormat], bucketMD, logger, (err) => {
9998
if (err) return reject(err);
100-
resolve();
99+
return resolve();
101100
});
102101
});
103102
}
@@ -120,7 +119,12 @@ describe('Cloudserver : keyFormatVersion : non versioned bucket', () => {
120119
},
121120
};
122121
metadata = new MetadataWrapper(IMPL_NAME, opts, null, logger);
123-
await new Promise((resolve, reject) => metadata.setup(err => (err ? reject(err) : resolve())));
122+
await new Promise((resolve, reject) => {
123+
metadata.setup(err => {
124+
if (err) return reject(err);
125+
return resolve();
126+
});
127+
});
124128

125129
await getBucketOwnerInfo();
126130
await createBucket(BucketVersioningKeyFormat.v0);
@@ -140,7 +144,7 @@ describe('Cloudserver : keyFormatVersion : non versioned bucket', () => {
140144
await new Promise((resolve, reject) => {
141145
metadata.close((err) => {
142146
if (err) return reject(err);
143-
resolve();
147+
return resolve();
144148
});
145149
});
146150
});

‎tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/versionedBucket.js‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
const assert = require('assert');
2-
const async = require('async');
32
const werelogs = require('werelogs');
43
const { MetadataWrapper } = require('arsenal').storage.metadata;
54
const { versioning } = require('arsenal');
65
const { BucketInfo } = require('arsenal').models;
7-
const s3 = require('../../../s3SDK').scalityS3Client;
86
const {
97
CreateBucketCommand,
108
DeleteBucketCommand,
@@ -15,6 +13,7 @@ const {
1513
ListObjectVersionsCommand,
1614
PutBucketVersioningCommand,
1715
} = require('@aws-sdk/client-s3');
16+
const s3 = require('../../../s3SDK').scalityS3Client;
1817

1918
const logger = new werelogs.Logger('keyFormatVersion', 'debug', 'debug');
2019
const { BucketVersioningKeyFormat } = versioning.VersioningConstants;
@@ -61,7 +60,7 @@ describe('Cloudserver : keyFormatVersion : versioned bucket', () => {
6160
const res = await new Promise((resolve, reject) => {
6261
metadata.getBucket('tmp-bucket', logger, (err, result) => {
6362
if (err) return reject(err);
64-
resolve(result);
63+
return resolve(result);
6564
});
6665
});
6766
ownerInfo._owner = res._owner;
@@ -142,7 +141,12 @@ describe('Cloudserver : keyFormatVersion : versioned bucket', () => {
142141
},
143142
};
144143
metadata = new MetadataWrapper(IMPL_NAME, opts, null, logger);
145-
await new Promise((resolve, reject) => metadata.setup(err => (err ? reject(err) : resolve())));
144+
await new Promise((resolve, reject) => {
145+
metadata.setup(err => {
146+
if (err) return reject(err);
147+
return resolve();
148+
});
149+
});
146150
await getBucketOwnerInfo();
147151
await createAndPopulateVersionedBucket(BucketVersioningKeyFormat.v0);
148152
await createAndPopulateVersionedBucket(BucketVersioningKeyFormat.v1);
@@ -151,7 +155,12 @@ describe('Cloudserver : keyFormatVersion : versioned bucket', () => {
151155
after(async () => {
152156
await emptyAndDeleteBucket(BucketVersioningKeyFormat.v0);
153157
await emptyAndDeleteBucket(BucketVersioningKeyFormat.v1);
154-
await new Promise((resolve, reject) => metadata.close(err => (err ? reject(err) : resolve())));
158+
await new Promise((resolve, reject) => {
159+
metadata.close(err => {
160+
if (err) return reject(err);
161+
return resolve();
162+
});
163+
});
155164
});
156165

157166
['v0', 'v1'].forEach(vFormat => {
@@ -225,7 +234,9 @@ describe('Cloudserver : keyFormatVersion : versioned bucket', () => {
225234
});
226235

227236
it(`Should create a delete marker ${vFormat}`, async () => {
228-
const deleteData = await s3.send(new DeleteObjectCommand({ Bucket: BUCKET_NAME[vFormat], Key: 'first-key' }));
237+
const deleteData = await s3.send(new DeleteObjectCommand(
238+
{ Bucket: BUCKET_NAME[vFormat], Key: 'first-key' },
239+
));
229240
assert(deleteData.DeleteMarker);
230241
const deleteMarkerVersionId = deleteData.VersionId;
231242

‎tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/versioningSuspended.js‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
const assert = require('assert');
2-
const async = require('async');
32
const werelogs = require('werelogs');
43
const { MetadataWrapper } = require('arsenal').storage.metadata;
54
const { versioning } = require('arsenal');
65
const { BucketInfo } = require('arsenal').models;
7-
const s3 = require('../../../s3SDK').scalityS3Client;
86
const {
97
CreateBucketCommand,
108
DeleteBucketCommand,
@@ -15,6 +13,7 @@ const {
1513
ListObjectVersionsCommand,
1614
PutBucketVersioningCommand,
1715
} = require('@aws-sdk/client-s3');
16+
const s3 = require('../../../s3SDK').scalityS3Client;
1817

1918
const logger = new werelogs.Logger('keyFormatVersion', 'debug', 'debug');
2019
const { BucketVersioningKeyFormat } = versioning.VersioningConstants;
@@ -61,7 +60,7 @@ describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
6160
const res = await new Promise((resolve, reject) => {
6261
metadata.getBucket('tmp-bucket', logger, (err, result) => {
6362
if (err) return reject(err);
64-
resolve(result);
63+
return resolve(result);
6564
});
6665
});
6766
ownerInfo._owner = res._owner;
@@ -153,7 +152,12 @@ describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
153152
},
154153
};
155154
metadata = new MetadataWrapper(IMPL_NAME, opts, null, logger);
156-
await new Promise((resolve, reject) => metadata.setup(err => (err ? reject(err) : resolve())));
155+
await new Promise((resolve, reject) => {
156+
metadata.setup(err => {
157+
if (err) return reject(err);
158+
return resolve();
159+
});
160+
});
157161
await getBucketOwnerInfo();
158162
await createAndPopulateVersionedBucket(BucketVersioningKeyFormat.v0);
159163
await createAndPopulateVersionedBucket(BucketVersioningKeyFormat.v1);
@@ -164,7 +168,12 @@ describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
164168
after(async () => {
165169
await emptyAndDeleteBucket(BucketVersioningKeyFormat.v0);
166170
await emptyAndDeleteBucket(BucketVersioningKeyFormat.v1);
167-
await new Promise((resolve, reject) => metadata.close(err => (err ? reject(err) : resolve())));
171+
await new Promise((resolve, reject) => {
172+
metadata.close(err => {
173+
if (err) return reject(err);
174+
return resolve();
175+
});
176+
});
168177
});
169178

170179
['v0', 'v1'].forEach(vFormat => {
@@ -176,7 +185,9 @@ describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
176185
));
177186
assert.strictEqual(data.VersionId, 'null');
178187

179-
await s3.send(new DeleteObjectCommand({ Bucket: BUCKET_NAME[vFormat], Key: 'first-key', VersionId: 'null' }));
188+
await s3.send(new DeleteObjectCommand(
189+
{ Bucket: BUCKET_NAME[vFormat], Key: 'first-key', VersionId: 'null' },
190+
));
180191
});
181192

182193
it(`Should not list DeleteMarkers ${vFormat}`, async () => {
@@ -261,7 +272,9 @@ describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
261272
});
262273

263274
it(`Should create a delete marker with null versionId ${vFormat}`, async () => {
264-
const deleteData = await s3.send(new DeleteObjectCommand({ Bucket: BUCKET_NAME[vFormat], Key: 'first-key' }));
275+
const deleteData = await s3.send(new DeleteObjectCommand(
276+
{ Bucket: BUCKET_NAME[vFormat], Key: 'first-key' },
277+
));
265278
assert(deleteData.DeleteMarker);
266279
assert.strictEqual(deleteData.VersionId, 'null');
267280

@@ -272,7 +285,9 @@ describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
272285
assert.strictEqual(err.name, 'NoSuchKey');
273286
}
274287

275-
await s3.send(new DeleteObjectCommand({ Bucket: BUCKET_NAME[vFormat], Key: 'first-key', VersionId: 'null' }));
288+
await s3.send(new DeleteObjectCommand(
289+
{ Bucket: BUCKET_NAME[vFormat], Key: 'first-key', VersionId: 'null' },
290+
));
276291
});
277292
});
278293
});

0 commit comments

Comments
 (0)