Skip to content

Commit b3e16fb

Browse files
benzekrimahabenzekrimaha
committed
multiple backend aws-node-sdk lint fixup
1 parent 3699de7 commit b3e16fb

File tree

5 files changed

+55
-56
lines changed

5 files changed

+55
-56
lines changed

‎tests/functional/aws-node-sdk/test/multipleBackend/acl/aclAwsVersioning.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ function putObjectAndAcl(s3, key, body, acp, cb) {
8989

9090
s3.send(command)
9191
.then(putData => {
92-
putObjectAcl(s3, key, putData.VersionId, acp, (err) => {
92+
putObjectAcl(s3, key, putData.VersionId, acp, err => {
9393
if (err) {
9494
return cb(err);
9595
}
96-
cb(null, putData.VersionId);
96+
return cb(null, putData.VersionId);
9797
});
9898
})
9999
.catch(cb);
@@ -119,7 +119,7 @@ function putVersionsWithAclToAws(s3, key, data, acps, cb) {
119119
if (err) {
120120
return cb(err);
121121
}
122-
cb(null, results);
122+
return cb(null, results);
123123
});
124124
});
125125
}
@@ -142,7 +142,8 @@ function getObjectAndAssertAcl(s3, params, cb) {
142142
})
143143
.then(data => {
144144
// eslint-disable-next-line no-unused-vars
145-
let {$metadata, ...aclData} = data;
145+
const {$metadata, ...aclData} = data;
146+
// eslint-disable-next-line no-param-reassign
146147
data = aclData;
147148
assert.deepEqual(data, expectedResult);
148149
cb();
@@ -223,7 +224,7 @@ function testSuite() {
223224
if (err) {
224225
return done(err);
225226
}
226-
putObjectAndAcl(s3, key, someBody, testAcp, (err, versionId) => {
227+
return putObjectAndAcl(s3, key, someBody, testAcp, (err, versionId) => {
227228
assert.strictEqual(versionId, undefined);
228229
getObjectAndAssertAcl(s3, { bucket, key, body: someBody,
229230
expectedResult: testAcp }, done);

‎tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAwsVersioning.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
173173
bucketUtil = new BucketUtility('default', sigCfg);
174174
s3 = bucketUtil.s3;
175175
return s3.send(new CreateBucketCommand({ Bucket: bucket }))
176-
.then(() => {
177-
return s3.send(new GetBucketVersioningCommand({ Bucket: bucket }));
178-
})
176+
.then(() => s3.send(new GetBucketVersioningCommand({ Bucket: bucket })))
179177
.catch(err => {
180178
process.stdout.write(`Error creating bucket: ${err}\n`);
181179
throw err;
@@ -204,7 +202,7 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
204202
if (err) {
205203
return next(err);
206204
}
207-
next();
205+
return next();
208206
}),
209207
next => putToAwsBackend(s3, bucket, key, someBody,
210208
err => next(err)),
@@ -246,7 +244,7 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
246244
if (err) {
247245
return next(err);
248246
}
249-
next();
247+
return next();
250248
}),
251249
next => putNullVersionsToAws(s3, bucket, key, [someBody],
252250
err => next(err)),
@@ -270,7 +268,7 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
270268
if (err) {
271269
return next(err);
272270
}
273-
next();
271+
return next();
274272
}),
275273
next => putVersionsToAws(s3, bucket, key, [someBody],
276274
(err, versionIds) => next(err, versionIds[0])),
@@ -430,7 +428,7 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
430428
if (err) {
431429
return next(err);
432430
}
433-
next();
431+
return next();
434432
}),
435433
next => putVersionsToAws(s3, bucket, key, [someBody],
436434
(err, versionIds) => next(err, versionIds[0])),
@@ -458,7 +456,7 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
458456
if (err) {
459457
return next(err);
460458
}
461-
next();
459+
return next();
462460
}),
463461
next => putVersionsToAws(s3, bucket, key, [someBody],
464462
(err, versionIds) => next(err, versionIds[0])),
@@ -742,7 +740,7 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
742740
if (err) {
743741
return next(err);
744742
}
745-
next();
743+
return next();
746744
}),
747745
next => putVersionsToAws(s3, bucket, key, [someBody],
748746
(err, versionIds) => next(err, versionIds[0])),

‎tests/functional/aws-node-sdk/test/multipleBackend/get/get.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const assert = require('assert');
2-
const async = require('async');
32
const {
43
CreateBucketCommand,
54
GetObjectCommand,

‎tests/functional/aws-node-sdk/test/multipleBackend/objectCopy/objectCopyAwsVersioning.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ function assertGetObjects(testParams, cb) {
183183
.then(async res => {
184184
const bodyBuffer = await loadBodyBuffer(res);
185185
if (bodyBuffer !== undefined) {
186+
// eslint-disable-next-line no-param-reassign
186187
res.Body = bodyBuffer;
187188
}
188189
cb(null, res);
@@ -194,6 +195,7 @@ function assertGetObjects(testParams, cb) {
194195
.then(async res => {
195196
const bodyBuffer = await loadBodyBuffer(res);
196197
if (bodyBuffer !== undefined) {
198+
// eslint-disable-next-line no-param-reassign
197199
res.Body = bodyBuffer;
198200
}
199201
cb(null, res);

‎tests/functional/aws-node-sdk/test/multipleBackend/utils.js‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -216,44 +216,39 @@ utils.expectedETag = (body, getStringified = true) => {
216216

217217
utils.waitForVersioningBeforePut = async (s3, bucket, callback) => {
218218
const MAX_VERSIONING_CHECKS = 10;
219-
const VERSIONING_CHECK_INTERVAL = 1000; // 1 second
220-
221-
const waitForVersioning = async () => {
219+
const VERSIONING_CHECK_INTERVAL = 1000;
220+
const sleep = () => new Promise(resolve => setTimeout(resolve, VERSIONING_CHECK_INTERVAL));
221+
222+
const waitForVersioning = (async () => {
222223
for (let attempt = 1; attempt <= MAX_VERSIONING_CHECKS; attempt++) {
224+
let versioningEnabled = false;
223225
try {
224-
const versioningResult = await s3.send(new GetBucketVersioningCommand({ Bucket: bucket }));
225-
if (versioningResult.Status === 'Enabled') {
226-
if (callback) {
227-
return callback();
228-
}
229-
return;
230-
}
231-
232-
if (attempt < MAX_VERSIONING_CHECKS) {
233-
await new Promise(resolve => setTimeout(resolve, VERSIONING_CHECK_INTERVAL));
234-
} else {
235-
if (callback) {
236-
return callback();
237-
}
238-
return;
239-
}
240-
} catch (err) {
241-
if (attempt < MAX_VERSIONING_CHECKS) {
242-
await new Promise(resolve => setTimeout(resolve, VERSIONING_CHECK_INTERVAL));
243-
} else {
244-
if (callback) {
245-
return callback();
246-
}
247-
return;
226+
const versioningResult = await s3.send(new GetBucketVersioningCommand({
227+
Bucket: bucket,
228+
}));
229+
versioningEnabled = versioningResult.Status === 'Enabled';
230+
} catch {
231+
if (attempt === MAX_VERSIONING_CHECKS) {
232+
break;
248233
}
234+
await sleep();
235+
continue;
236+
}
237+
if (versioningEnabled) {
238+
break;
239+
}
240+
241+
if (attempt < MAX_VERSIONING_CHECKS) {
242+
await sleep();
249243
}
250244
}
251-
};
252-
245+
})();
246+
253247
if (callback) {
254-
return waitForVersioning().catch(err => callback(err));
248+
waitForVersioning.then(() => callback()).catch(err => callback(err));
249+
return waitForVersioning;
255250
}
256-
return waitForVersioning();
251+
return waitForVersioning;
257252
};
258253

259254
utils.putToAwsBackend = (s3, bucket, key, body, callback) => {
@@ -263,7 +258,7 @@ utils.putToAwsBackend = (s3, bucket, key, body, callback) => {
263258
Body: body,
264259
Metadata: { 'scal-location-constraint': awsLocation }
265260
}));
266-
if(callback) {
261+
if (callback) {
267262
return result.then(data => {
268263
callback(null, data.VersionId);
269264
}).catch(err => {
@@ -316,12 +311,14 @@ utils.mapToAwsPuts = async (s3, bucket, key, dataArray, callback) => {
316311
results.push(versionId);
317312
}
318313
if (callback) {
319-
return callback(null, results);
314+
callback(null, results);
315+
return undefined;
320316
}
321317
return results;
322318
} catch (err) {
323319
if (callback) {
324-
return callback(err);
320+
callback(err);
321+
return undefined;
325322
}
326323
throw err;
327324
}
@@ -334,12 +331,14 @@ utils.putVersionsToAws = async (s3, bucket, key, versions, callback) => {
334331
await utils.waitForVersioningBeforePut(s3, bucket);
335332
const results = await utils.mapToAwsPuts(s3, bucket, key, versions);
336333
if (callback) {
337-
return callback(null, results);
334+
callback(null, results);
335+
return undefined;
338336
}
339337
return results;
340338
} catch (err) {
341339
if (callback) {
342-
return callback(err);
340+
callback(err);
341+
return undefined;
343342
}
344343
throw err;
345344
}
@@ -352,12 +351,14 @@ utils.putNullVersionsToAws = async (s3, bucket, key, versions, callback) => {
352351
// The wait is only needed when enabling versioning to ensure Ceph returns VersionId
353352
const results = await utils.mapToAwsPuts(s3, bucket, key, versions);
354353
if (callback) {
355-
return callback(null, results);
354+
callback(null, results);
355+
return undefined;
356356
}
357357
return results;
358358
} catch (err) {
359359
if (callback) {
360-
return callback(err);
360+
callback(err);
361+
return undefined;
361362
}
362363
throw err;
363364
}
@@ -465,9 +466,7 @@ utils.getAwsRetry = (params, retryNumber, assertCb) => {
465466
}
466467
return assertCb(err);
467468
})
468-
.catch(e => {
469-
return assertCb(e);
470-
});
469+
.catch(e => assertCb(e));
471470
}, timeout);
472471
};
473472

0 commit comments

Comments
 (0)