Skip to content

Commit 61f8a03

Browse files
benzekrimahabenzekrimaha
committed
post reviews fixups
1 parent 9844ffb commit 61f8a03

File tree

3 files changed

+130
-180
lines changed

3 files changed

+130
-180
lines changed

‎tests/functional/aws-node-sdk/lib/utility/bucket-util.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class BucketUtility {
1616
if (unauthenticated) {
1717
this.s3 = new S3Client({
1818
...s3Config,
19+
maxAttempts: 0,
1920
credentials: { accessKeyId: '', secretAccessKey: '' },
2021
forcePathStyle: true,
2122
signer: { sign: async request => request },
@@ -128,19 +129,21 @@ class BucketUtility {
128129
Bucket: bucketName,
129130
Key: object.Key,
130131
VersionId: object.VersionId,
131-
}))
132-
.then(() => object)
133-
))
134-
));
132+
})).then(() => object)
133+
)
134+
)
135+
)
136+
);
135137
}
136138

137139
emptyMany(bucketNames) {
138-
const promises = bucketNames.map(
139-
bucketName => this.empty(bucketName)
140+
const promises = bucketNames.map(
141+
bucketName => this.empty(bucketName)
140142
);
141143

142144
return Promise.all(promises);
143145
}
146+
144147
emptyIfExists(bucketName) {
145148
return this.bucketExists(bucketName)
146149
.then(exists => {

‎tests/sur/quota.js‎

Lines changed: 79 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ function createBucket(bucket, locked, cb) {
4545
}
4646
return s3Client.send(new CreateBucketCommand(config))
4747
.then(data => cb(null, data))
48-
.catch(err => {
49-
assert.ifError(err);
50-
cb(err);
51-
});
48+
.catch(cb);
5249
}
5350

5451
function configureBucketVersioning(bucket, cb) {
@@ -59,10 +56,7 @@ function configureBucketVersioning(bucket, cb) {
5956
},
6057
}))
6158
.then(data => cb(null, data))
62-
.catch(err => {
63-
assert.ifError(err);
64-
cb(err);
65-
});
59+
.catch(err => cb(err));
6660
}
6761

6862
function putObjectLockConfiguration(bucket, cb) {
@@ -79,19 +73,13 @@ function putObjectLockConfiguration(bucket, cb) {
7973
},
8074
}))
8175
.then(data => cb(null, data))
82-
.catch(err => {
83-
assert.ifError(err);
84-
cb(err);
85-
});
76+
.catch(err => cb(err));
8677
}
8778

8879
function deleteBucket(bucket, cb) {
8980
return s3Client.send(new DeleteBucketCommand({ Bucket: bucket }))
9081
.then(data => cb(null, data))
91-
.catch(err => {
92-
assert.ifError(err);
93-
cb(err);
94-
});
82+
.catch(err => cb(err));
9583
}
9684

9785
function putObject(bucket, key, size, cb) {
@@ -106,9 +94,7 @@ function putObject(bucket, key, size, cb) {
10694
}
10795
return cb(null, data);
10896
})
109-
.catch(err => {
110-
cb(err);
111-
});
97+
.catch(cb);
11298
}
11399

114100
function putObjectWithCustomHeader(bucket, key, size, vID, cb) {
@@ -151,9 +137,7 @@ function copyObject(bucket, key, sourceSize, cb) {
151137
}
152138
return cb(null, data);
153139
})
154-
.catch(err => {
155-
cb(err);
156-
});
140+
.catch(cb);
157141
}
158142

159143
function deleteObject(bucket, key, size, cb) {
@@ -167,9 +151,7 @@ function deleteObject(bucket, key, size, cb) {
167151
}
168152
return cb();
169153
})
170-
.catch(err => {
171-
cb(err);
172-
});
154+
.catch(cb);
173155
}
174156

175157
function deleteVersionID(bucket, key, versionId, size, cb) {
@@ -184,9 +166,7 @@ function deleteVersionID(bucket, key, versionId, size, cb) {
184166
}
185167
return cb(null, data);
186168
})
187-
.catch(err => {
188-
cb(err);
189-
});
169+
.catch(cb);
190170
}
191171

192172
function objectMPU(bucket, key, parts, partSize, callback) {
@@ -241,7 +221,7 @@ function objectMPU(bucket, key, parts, partSize, callback) {
241221
},
242222
], err => {
243223
if (!s3Config.isQuotaInflightEnabled()) {
244-
mockScuba.incrementBytesForBucket(bucket, -(parts * partSize));
224+
mockScuba.incrementBytesForBucket(bucket, parts * partSize);
245225
}
246226
return callback(err, uploadId);
247227
});
@@ -259,9 +239,7 @@ function abortMPU(bucket, key, uploadId, size, callback) {
259239
}
260240
return callback(null, data);
261241
})
262-
.catch(err => {
263-
callback(err);
264-
});
242+
.catch(err => callback(err));
265243
}
266244

267245
function uploadPartCopy(bucket, key, partNumber, partSize, sleepDuration, keyToCopy, callback) {
@@ -352,9 +330,7 @@ function restoreObject(bucket, key, size, callback) {
352330
}
353331
return callback(null, data);
354332
})
355-
.catch(err => {
356-
callback(err);
357-
});
333+
.catch(callback);
358334
}
359335

360336
function multiObjectDelete(bucket, keys, size, callback) {
@@ -375,7 +351,6 @@ function multiObjectDelete(bucket, keys, size, callback) {
375351
callback(null, data);
376352
})
377353
.catch(err => {
378-
379354
if (!s3Config.isQuotaInflightEnabled()) {
380355
mockScuba.incrementBytesForBucket(bucket, size);
381356
}
@@ -409,38 +384,7 @@ function multiObjectDelete(bucket, keys, size, callback) {
409384
// Force the client to not add automatic headers
410385
useGlobalEndpoint: false,
411386
});
412-
413-
// Add middleware to strip ALL checksum headers
414-
s3Client.middlewareStack.add(
415-
next => async args => {
416-
if (args.request && args.request.headers) {
417-
// Remove all AWS checksum headers
418-
// eslint-disable-next-line no-param-reassign
419-
delete args.request.headers['x-amz-checksum-crc32'];
420-
// eslint-disable-next-line no-param-reassign
421-
delete args.request.headers['x-amz-checksum-crc32c'];
422-
// eslint-disable-next-line no-param-reassign
423-
delete args.request.headers['x-amz-checksum-sha1'];
424-
// eslint-disable-next-line no-param-reassign
425-
delete args.request.headers['x-amz-checksum-sha256'];
426-
// eslint-disable-next-line no-param-reassign
427-
delete args.request.headers['x-amz-sdk-checksum-algorithm'];
428-
// eslint-disable-next-line no-param-reassign
429-
delete args.request.headers['content-md5'];
430-
431-
// Log what headers we're sending
432-
// eslint-disable-next-line no-console
433-
console.log('Request headers after stripping:', Object.keys(args.request.headers));
434-
}
435-
return next(args);
436-
},
437-
{
438-
step: 'build',
439-
name: 'stripAllChecksumHeaders',
440-
priority: 'high'
441-
}
442-
);
443-
387+
444388
scuba.start();
445389
metadata.setup(err => wait(2000, () => done(err)));
446390
});
@@ -463,8 +407,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
463407
JSON.stringify(quota), config).then(() => next()).catch(err => next(err)),
464408
next => {
465409
putObject(bucket, key, size, err => {
466-
assert.strictEqual(err.Code, 'QuotaExceeded');
467-
return next();
410+
try {
411+
assert.strictEqual(err.Code, 'QuotaExceeded');
412+
return next();
413+
} catch (assertError) {
414+
return next(assertError);
415+
}
468416
});
469417
},
470418
next => deleteBucket(bucket, next),
@@ -488,8 +436,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
488436
}),
489437
next => wait(inflightFlushFrequencyMS * 2, next),
490438
next => copyObject(bucket, key, size, err => {
491-
assert.strictEqual(err.Code, 'QuotaExceeded');
492-
return next();
439+
try {
440+
assert.strictEqual(err.Code, 'QuotaExceeded');
441+
return next();
442+
} catch (assertError) {
443+
return next(assertError);
444+
}
493445
}),
494446
next => deleteVersionID(bucket, key, vID, size, next),
495447
next => deleteBucket(bucket, next),
@@ -507,8 +459,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
507459
next => putObject(bucket, key, size, next),
508460
next => wait(inflightFlushFrequencyMS * 2, next),
509461
next => copyObject(bucket, key, size, err => {
510-
assert.strictEqual(err.Code, 'QuotaExceeded');
511-
return next();
462+
try {
463+
assert.strictEqual(err.Code, 'QuotaExceeded');
464+
return next();
465+
} catch (assertError) {
466+
return next(assertError);
467+
}
512468
}),
513469
next => deleteObject(bucket, key, size, next),
514470
next => deleteBucket(bucket, next),
@@ -527,8 +483,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
527483
JSON.stringify(quota), config).then(() => next()).catch(err => next(err)),
528484
next => objectMPU(bucket, key, parts, partSize, (err, _uploadId) => {
529485
uploadId = _uploadId;
530-
assert.strictEqual(err.Code, 'QuotaExceeded');
531-
return next();
486+
try {
487+
assert.strictEqual(err.name, 'QuotaExceeded');
488+
return next();
489+
} catch (assertError) {
490+
return next(assertError);
491+
}
532492
}),
533493
next => abortMPU(bucket, key, uploadId, 0, next),
534494
next => wait(inflightFlushFrequencyMS * 2, next),
@@ -595,8 +555,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
595555
next => uploadPartCopy(bucket, key, parts, partSize, inflightFlushFrequencyMS * 2, keyToCopy,
596556
(err, _uploadId) => {
597557
uploadId = _uploadId;
598-
assert.strictEqual(err.Code, 'QuotaExceeded');
599-
return next();
558+
try {
559+
assert.strictEqual(err.Code, 'QuotaExceeded');
560+
return next();
561+
} catch (assertError) {
562+
return next(assertError);
563+
}
600564
}),
601565
next => abortMPU(bucket, key, uploadId, parts * partSize, next),
602566
next => deleteObject(bucket, keyToCopy, partSize, next),
@@ -624,8 +588,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
624588
}, next),
625589
next => wait(inflightFlushFrequencyMS * 2, next),
626590
next => restoreObject(bucket, key, size, err => {
627-
assert.strictEqual(err.Code, 'QuotaExceeded');
628-
return next();
591+
try {
592+
assert.strictEqual(err.Code, 'QuotaExceeded');
593+
return next();
594+
} catch (assertError) {
595+
return next(assertError);
596+
}
629597
}),
630598
next => deleteVersionID(bucket, key, vID, size, next),
631599
next => deleteBucket(bucket, next),
@@ -687,8 +655,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
687655
}),
688656
next => wait(inflightFlushFrequencyMS * 2, next),
689657
next => putObject(bucket, `${key}3`, size, err => {
690-
assert.strictEqual(err.Code, 'QuotaExceeded');
691-
return next();
658+
try {
659+
assert.strictEqual(err.Code, 'QuotaExceeded');
660+
return next();
661+
} catch (assertError) {
662+
return next(assertError);
663+
}
692664
}),
693665
next => wait(inflightFlushFrequencyMS * 2, next),
694666
next => {
@@ -739,8 +711,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
739711
// Here we have 0 inflight but the stored bytes are 4000 (equal to the quota)
740712
// Should reject new write with QuotaExceeded (4000 + 400)
741713
next => putObject(bucket, `${key}3`, size, err => {
742-
assert.strictEqual(err.Code, 'QuotaExceeded');
743-
return next();
714+
try {
715+
assert.strictEqual(err.Code, 'QuotaExceeded');
716+
return next();
717+
} catch (assertError) {
718+
return next(assertError);
719+
}
744720
}),
745721
next => wait(inflightFlushFrequencyMS * 2, next),
746722
// Should still have 0 as inflight
@@ -797,9 +773,7 @@ function multiObjectDelete(bucket, keys, size, callback) {
797773
const key = 'quota-test-object';
798774
const size = 400;
799775
return async.series([
800-
next => {
801-
createBucket(bucket, false, next);
802-
},
776+
next => createBucket(bucket, false, next),
803777
next => sendRequest(putQuotaVerb, '127.0.0.1:8000', `/${bucket}/?quota=true`,
804778
JSON.stringify(quota), config).then(() => next()).catch(err => next(err)),
805779
next => {
@@ -856,8 +830,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
856830
return next();
857831
},
858832
next => putObject(bucket, `${key}3`, size, err => {
859-
assert.strictEqual(err.Code, 'QuotaExceeded');
860-
return next();
833+
try {
834+
assert.strictEqual(err.Code, 'QuotaExceeded');
835+
return next();
836+
} catch (assertError) {
837+
return next(assertError);
838+
}
861839
}),
862840
next => wait(inflightFlushFrequencyMS * 2, next),
863841
next => {
@@ -899,8 +877,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
899877
return next();
900878
},
901879
next => deleteVersionID(bucket, key, vID, size, err => {
902-
assert.strictEqual(err.Code, 'AccessDenied');
903-
next();
880+
try {
881+
assert.strictEqual(err.Code, 'AccessDenied');
882+
next();
883+
} catch (assertError) {
884+
next(assertError);
885+
}
904886
}),
905887
next => wait(inflightFlushFrequencyMS * 2, next),
906888
next => {
@@ -976,8 +958,12 @@ function multiObjectDelete(bucket, keys, size, callback) {
976958
}, next),
977959
// Put an object, the quota should be exceeded
978960
next => putObject(bucket, `${key}-2`, size, err => {
979-
assert.strictEqual(err.Code, 'QuotaExceeded');
980-
return next();
961+
try {
962+
assert.strictEqual(err.Code, 'QuotaExceeded');
963+
return next();
964+
} catch (assertError) {
965+
return next(assertError);
966+
}
981967
}),
982968
// Simulate the real restore
983969
next => putObjectWithCustomHeader(bucket, key, size, vID, err => {

0 commit comments

Comments
 (0)