Skip to content

Commit b53f2da

Browse files
benzekrimahabenzekrimaha
committed
kms tests related code update after sdk migration
Issue: CLDSRV-724
1 parent 165b47b commit b53f2da

File tree

7 files changed

+285
-133
lines changed

7 files changed

+285
-133
lines changed

‎tests/functional/sse-kms-migration/arnPrefix.js‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ describe('SSE KMS arnPrefix', () => {
3434
? bkt.kmsKeyInfo.masterKeyArn
3535
: bkt.kmsKeyInfo.masterKeyId;
3636
}
37-
await helpers.s3.createBucket(({ Bucket: bkt.name })).promise();
38-
await helpers.s3.createBucket(({ Bucket: bkt.vname })).promise();
37+
await helpers.s3.createBucket(({ Bucket: bkt.name }));
38+
await helpers.s3.createBucket(({ Bucket: bkt.vname }));
3939
if (bktConf.deleteSSE) {
4040
await scenarios.deleteBucketSSEBeforeEach(bkt.name, log);
4141
await scenarios.deleteBucketSSEBeforeEach(bkt.vname, log);
@@ -46,12 +46,12 @@ describe('SSE KMS arnPrefix', () => {
4646
Bucket: bkt.name,
4747
ServerSideEncryptionConfiguration: helpers.hydrateSSEConfig({
4848
algo: bktConf.algo, masterKeyId: bkt.kmsKey }),
49-
}).promise();
49+
});
5050
await helpers.s3.putBucketEncryption({
5151
Bucket: bkt.vname,
5252
ServerSideEncryptionConfiguration: helpers.hydrateSSEConfig({
5353
algo: bktConf.algo, masterKeyId: bkt.kmsKey }),
54-
}).promise();
54+
});
5555
}
5656

5757
// Put an object for each SSE conf in each bucket
@@ -77,7 +77,7 @@ describe('SSE KMS arnPrefix', () => {
7777
before('setup', async () => {
7878
console.log('Run arnPrefix',
7979
{ profile: helpers.credsProfile, accessKeyId: helpers.s3.config.credentials.accessKeyId });
80-
const allBuckets = (await helpers.s3.listBuckets().promise()).Buckets.map(b => b.Name);
80+
const allBuckets = (await helpers.s3.listBuckets()).Buckets.map(b => b.Name);
8181
console.log('List buckets:', allBuckets);
8282
await helpers.MD.setup();
8383
copyKmsKey = (await helpers.createKmsKey(log)).masterKeyArn;
@@ -92,13 +92,13 @@ describe('SSE KMS arnPrefix', () => {
9292
} catch (e) { void e; }
9393

9494
// init copy bucket
95-
await helpers.s3.createBucket(({ Bucket: copyBkt })).promise();
96-
await helpers.s3.createBucket(({ Bucket: mpuCopyBkt })).promise();
95+
await helpers.s3.createBucket(({ Bucket: copyBkt }));
96+
await helpers.s3.createBucket(({ Bucket: mpuCopyBkt }));
9797
await helpers.s3.putBucketEncryption({
9898
Bucket: copyBkt,
9999
ServerSideEncryptionConfiguration: helpers.hydrateSSEConfig({ algo: 'aws:kms', masterKeyId: copyKmsKey }),
100-
}).promise();
101-
await helpers.s3.putObject({ Bucket: copyBkt, Key: copyObj, Body: 'BODY(copy)' }).promise();
100+
});
101+
await helpers.s3.putObject({ Bucket: copyBkt, Key: copyObj, Body: 'BODY(copy)' });
102102

103103
// Prepare every buckets with 1 object (for copy)
104104
await Promise.all(scenarios.testCases.map(async bktConf => this.initBucket(bktConf)));
@@ -192,7 +192,7 @@ describe('SSE KMS arnPrefix', () => {
192192
it('should encrypt MPU and put 2 encrypted parts', async () => {
193193
const mpuKey = `${obj.name}-mpu`;
194194
const mpu = await helpers.s3.createMultipartUpload(
195-
helpers.putObjParams(bkt.name, mpuKey, objConf, obj.kmsKey)).promise();
195+
helpers.putObjParams(bkt.name, mpuKey, objConf, obj.kmsKey));
196196
const partsBody = [`${obj.body}-MPU1`, `${obj.body}-MPU2`];
197197
const newParts = [];
198198
for (const [index, body] of partsBody.entries()) {
@@ -220,7 +220,7 @@ describe('SSE KMS arnPrefix', () => {
220220
it('should encrypt MPU and copy an encrypted parts from encrypted bucket', async () => {
221221
const mpuKey = `${obj.name}-mpucopy`;
222222
const mpu = await helpers.s3.createMultipartUpload(
223-
helpers.putObjParams(bkt.name, mpuKey, objConf, obj.kmsKey)).promise();
223+
helpers.putObjParams(bkt.name, mpuKey, objConf, obj.kmsKey));
224224
const part1 = await scenarios.tests.mpuUploadPartCopy({
225225
UploadId: mpu.UploadId,
226226
Bucket: bkt.name,
@@ -251,7 +251,7 @@ describe('SSE KMS arnPrefix', () => {
251251
it('should encrypt MPU and copy an encrypted range parts from encrypted bucket', async () => {
252252
const mpuKey = `${obj.name}-mpucopy`;
253253
const mpu = await helpers.s3.createMultipartUpload(
254-
helpers.putObjParams(bkt.name, mpuKey, objConf, obj.kmsKey)).promise();
254+
helpers.putObjParams(bkt.name, mpuKey, objConf, obj.kmsKey));
255255
// source body is "BODY(copy)"
256256
// [copy, BODY]
257257
const sourceRanges = ['bytes=5-8', 'bytes=0-3'];
@@ -283,33 +283,33 @@ describe('SSE KMS arnPrefix', () => {
283283
it(`should PutObject versioned with SSE ${obj.name}`, async () => {
284284
// ensure versioned bucket is empty
285285
await helpers.bucketUtil.empty(bkt.vname);
286-
let { Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise();
286+
let { Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
287287
// regularly count versioned objects
288-
assert.strictEqual(Versions.length, 0);
288+
assert.strictEqual(Versions?.length, 0);
289289

290290
const bodyBase = `BODY(${obj.name})-base`;
291291
await helpers.putEncryptedObject(bkt.vname, obj.name, objConf, obj.kmsKey, bodyBase);
292292
const baseAssertion = { Bucket: bkt.vname, Key: obj.name };
293293
await scenarios.assertObjectSSE(
294294
{ ...baseAssertion, Body: bodyBase },
295295
{ objConf, obj }, { bktConf, bkt }, {}, 'after');
296-
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise());
296+
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
297297
assert.strictEqual(Versions.length, 1);
298298

299299
await helpers.s3.putBucketVersioning({ Bucket: bkt.vname,
300300
VersioningConfiguration: { Status: 'Enabled' },
301-
}).promise();
301+
});
302302

303303
const bodyV1 = `BODY(${obj.name})-v1`;
304304
const v1 = await helpers.putEncryptedObject(bkt.vname, obj.name, objConf, obj.kmsKey, bodyV1);
305305
const bodyV2 = `BODY(${obj.name})-v2`;
306306
const v2 = await helpers.putEncryptedObject(bkt.vname, obj.name, objConf, obj.kmsKey, bodyV2);
307-
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise());
307+
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
308308
assert.strictEqual(Versions.length, 3);
309309

310-
const current = await helpers.s3.headObject({ Bucket: bkt.vname, Key: obj.name }).promise();
310+
const current = await helpers.s3.headObject({ Bucket: bkt.vname, Key: obj.name });
311311
assert.strictEqual(current.VersionId, v2.VersionId); // ensure versioning as expected
312-
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise());
312+
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
313313
assert.strictEqual(Versions.length, 3);
314314

315315
await scenarios.assertObjectSSE(
@@ -324,12 +324,12 @@ describe('SSE KMS arnPrefix', () => {
324324
await scenarios.assertObjectSSE(
325325
{ ...baseAssertion, VersionId: v2.VersionId, Body: bodyV2 }, { objConf, obj }, { bktConf, bkt },
326326
{}, 'after');
327-
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise());
327+
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
328328
assert.strictEqual(Versions.length, 3);
329329

330330
await helpers.s3.putBucketVersioning({ Bucket: bkt.vname,
331331
VersioningConfiguration: { Status: 'Suspended' },
332-
}).promise();
332+
});
333333

334334
// should be fine after version suspension
335335
await scenarios.assertObjectSSE(
@@ -344,7 +344,7 @@ describe('SSE KMS arnPrefix', () => {
344344
await scenarios.assertObjectSSE(
345345
{ ...baseAssertion, VersionId: v2.VersionId, Body: bodyV2 }, { objConf, obj }, { bktConf, bkt },
346346
{}, 'after');
347-
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise());
347+
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
348348
assert.strictEqual(Versions.length, 3);
349349

350350
// put a new null version
@@ -356,7 +356,7 @@ describe('SSE KMS arnPrefix', () => {
356356
await scenarios.assertObjectSSE(
357357
{ ...baseAssertion, Body: bodyFinal }, { objConf, obj }, { bktConf, bkt },
358358
'null', 'after');
359-
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }).promise());
359+
({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
360360
assert.strictEqual(Versions.length, 3);
361361
});
362362
}));
@@ -367,10 +367,10 @@ describe('SSE KMS arnPrefix', () => {
367367
Bucket: mpuCopyBkt,
368368
// AES256 because input key is broken for now
369369
ServerSideEncryptionConfiguration: helpers.hydrateSSEConfig({ algo: 'AES256' }),
370-
}).promise();
370+
});
371371
const mpuKey = 'mpucopy';
372372
const mpu = await helpers.s3.createMultipartUpload(
373-
helpers.putObjParams(mpuCopyBkt, mpuKey, {}, null)).promise();
373+
helpers.putObjParams(mpuCopyBkt, mpuKey, {}, null));
374374
const copyPartArg = {
375375
UploadId: mpu.UploadId,
376376
Bucket: mpuCopyBkt,
@@ -388,7 +388,7 @@ describe('SSE KMS arnPrefix', () => {
388388
...copyPartArg,
389389
PartNumber: partNumber,
390390
CopySource: `${bkt.name}/${obj.name}`,
391-
}).promise();
391+
});
392392

393393
return { partNumber, body: obj.body, res: res.CopyPartResult };
394394
}));
@@ -403,7 +403,7 @@ describe('SSE KMS arnPrefix', () => {
403403
MultipartUpload: {
404404
Parts: parts.map(part => ({ PartNumber: part.partNumber, ETag: part.res.ETag })),
405405
},
406-
}).promise();
406+
});
407407
const assertion = {
408408
Bucket: mpuCopyBkt,
409409
Key: mpuKey,
@@ -421,11 +421,11 @@ describe('ensure MPU use good SSE', () => {
421421
before(async () => {
422422
kmsKeympuKmsBkt = (await helpers.createKmsKey(log)).masterKeyArn;
423423
await helpers.MD.setup();
424-
await helpers.s3.createBucket({ Bucket: mpuKmsBkt }).promise();
424+
await helpers.s3.createBucket({ Bucket: mpuKmsBkt });
425425
await helpers.s3.putBucketEncryption({
426426
Bucket: mpuKmsBkt,
427427
ServerSideEncryptionConfiguration:
428-
helpers.hydrateSSEConfig({ algo: 'aws:kms', masterKeyId: kmsKeympuKmsBkt }) }).promise();
428+
helpers.hydrateSSEConfig({ algo: 'aws:kms', masterKeyId: kmsKeympuKmsBkt }) });
429429
});
430430

431431
after(async () => {
@@ -435,11 +435,11 @@ describe('ensure MPU use good SSE', () => {
435435
it('mpu upload part should fail with sse header', async () => {
436436
const key = 'mpuKeyBadUpload';
437437
const mpu = await helpers.s3.createMultipartUpload({
438-
Bucket: mpuKmsBkt, Key: key }).promise();
438+
Bucket: mpuKmsBkt, Key: key });
439439
const res = await promisify(makeRequest)({
440440
method: 'PUT',
441-
hostname: helpers.s3.endpoint.hostname,
442-
port: helpers.s3.endpoint.port,
441+
hostname: helpers.s3.config.endpoint.hostname,
442+
port: helpers.s3.config.endpoint.port,
443443
path: `/${mpuKmsBkt}/${key}`,
444444
headers: {
445445
'content-length': 4,
@@ -465,7 +465,7 @@ describe('ensure MPU use good SSE', () => {
465465
const key = 'mpuKey';
466466
const mpuKms = (await helpers.createKmsKey(log)).masterKeyArn;
467467
const mpu = await helpers.s3.createMultipartUpload({
468-
Bucket: mpuKmsBkt, Key: key, ServerSideEncryption: 'aws:kms', SSEKMSKeyId: mpuKms }).promise();
468+
Bucket: mpuKmsBkt, Key: key, ServerSideEncryption: 'aws:kms', SSEKMSKeyId: mpuKms });
469469
assert.strictEqual(mpu.ServerSideEncryption, 'aws:kms');
470470
assert.strictEqual(mpu.SSEKMSKeyId, helpers.getKey(mpuKms));
471471

@@ -560,25 +560,25 @@ describe('KMS error', () => {
560560
}
561561

562562
before(async () => {
563-
await helpers.s3.createBucket({ Bucket }).promise();
563+
await helpers.s3.createBucket({ Bucket });
564564

565565
await helpers.s3.putObject({
566566
...helpers.putObjParams(Bucket, 'plaintext', {}, null),
567567
Body: body,
568-
}).promise();
568+
});
569569

570570
mpuPlaintext = await helpers.s3.createMultipartUpload(
571-
helpers.putObjParams(Bucket, 'mpuPlaintext', {}, null)).promise();
571+
helpers.putObjParams(Bucket, 'mpuPlaintext', {}, null));
572572

573573
({ masterKeyId, masterKeyArn } = await helpers.createKmsKey(log));
574574

575575
await helpers.putEncryptedObject(Bucket, Key, sseConfig, masterKeyArn, body);
576576
// ensure we can decrypt and read the object
577-
const obj = await helpers.s3.getObject({ Bucket, Key }).promise();
577+
const obj = await helpers.s3.getObject({ Bucket, Key });
578578
assert.strictEqual(obj.Body.toString(), body);
579579

580580
mpuEncrypted = await helpers.s3.createMultipartUpload(
581-
helpers.putObjParams(Bucket, 'mpuEncrypted', sseConfig, masterKeyArn)).promise();
581+
helpers.putObjParams(Bucket, 'mpuEncrypted', sseConfig, masterKeyArn));
582582

583583
// make key unavailable
584584
await helpers.destroyKmsKey(masterKeyArn, log);
@@ -602,12 +602,12 @@ describe('KMS error', () => {
602602
},
603603
{
604604
action: 'getObject', kmsAction: 'Decrypt',
605-
fct: async () => helpers.s3.getObject({ Bucket, Key }).promise(),
605+
fct: async () => helpers.s3.getObject({ Bucket, Key }) ,
606606
},
607607
{
608608
action: 'copyObject', detail: ' when getting from source', kmsAction: 'Decrypt',
609609
fct: async () =>
610-
helpers.s3.copyObject({ Bucket, Key: 'copy', CopySource: `${Bucket}/${Key}` }).promise(),
610+
helpers.s3.copyObject({ Bucket, Key: 'copy', CopySource: `${Bucket}/${Key}` }) ,
611611
},
612612
{
613613
action: 'copyObject', detail: ' when putting to destination', kmsAction: 'Encrypt',
@@ -617,12 +617,12 @@ describe('KMS error', () => {
617617
CopySource: `${Bucket}/plaintext`,
618618
ServerSideEncryption: 'aws:kms',
619619
SSEKMSKeyId: masterKeyArn,
620-
}).promise(),
620+
}) ,
621621
},
622622
{
623623
action: 'createMPU', kmsAction: 'Encrypt',
624624
fct: async ({ masterKeyArn }) => helpers.s3.createMultipartUpload(
625-
helpers.putObjParams(Bucket, 'mpuKeyEncryptedFail', sseConfig, masterKeyArn)).promise(),
625+
helpers.putObjParams(Bucket, 'mpuKeyEncryptedFail', sseConfig, masterKeyArn)) ,
626626
},
627627
{
628628
action: 'mpu uploadPartCopy', detail: ' when getting from source', kmsAction: 'Decrypt',
@@ -632,7 +632,7 @@ describe('KMS error', () => {
632632
Key: 'mpuPlaintext',
633633
PartNumber: 1,
634634
CopySource: `${Bucket}/${Key}`,
635-
}).promise(),
635+
}) ,
636636
},
637637
{
638638
action: 'mpu uploadPart', detail: ' when putting to destination', kmsAction: 'Encrypt',
@@ -642,7 +642,7 @@ describe('KMS error', () => {
642642
Key: 'mpuEncrypted',
643643
PartNumber: 1,
644644
Body: body,
645-
}).promise(),
645+
}),
646646
},
647647
{
648648
action: 'mpu uploadPartCopy', detail: ' when putting to destination', kmsAction: 'Encrypt',
@@ -652,7 +652,7 @@ describe('KMS error', () => {
652652
Key: 'mpuEncrypted',
653653
PartNumber: 1,
654654
CopySource: `${Bucket}/plaintext`,
655-
}).promise(),
655+
}),
656656
},
657657
];
658658

0 commit comments

Comments
 (0)