fixup

Author: benzekrimaha

tests/functional/sse-kms-migration/beforeMigration.js

@@ -326,7 +326,7 @@ describe('SSE KMS before migration', () => {
             it(`should PutObject versioned with SSE ${obj.name}`, async () => {
                 // ensure versioned bucket is empty
                 await helpers.bucketUtil.empty(bkt.vname);
-                let {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }) || [];
+                let { Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }) || [];
                 // regularly count versioned objects
                 assert.strictEqual(Versions.length, 0);
 
@@ -336,7 +336,7 @@ describe('SSE KMS before migration', () => {
                 await scenarios.assertObjectSSE(
                     { ...baseAssertion, Body: bodyBase },
                     { objConf, obj }, { bktConf, bkt });
-                {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
+                ({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
                 assert.strictEqual(Versions.length, 1);
 
                 await helpers.s3.putBucketVersioning({ Bucket: bkt.vname,
@@ -347,12 +347,12 @@ describe('SSE KMS before migration', () => {
                 const v1 = await helpers.putEncryptedObject(bkt.vname, obj.name, objConf, obj.kmsKey, bodyV1);
                 const bodyV2 = `BODY(${obj.name})-v2`;
                 const v2 = await helpers.putEncryptedObject(bkt.vname, obj.name, objConf, obj.kmsKey, bodyV2);
-                {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
+                ({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
                 assert.strictEqual(Versions.length, 3);
 
                 const current = await helpers.s3.headObject({ Bucket: bkt.vname, Key: obj.name });
                 assert.strictEqual(current.VersionId, v2.VersionId); // ensure versioning as expected
-                {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
+                ({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
                 assert.strictEqual(Versions.length, 3);
 
                 await scenarios.assertObjectSSE(
@@ -363,7 +363,7 @@ describe('SSE KMS before migration', () => {
                     { ...baseAssertion, VersionId: v1.VersionId, Body: bodyV1 }, { objConf, obj }, { bktConf, bkt });
                 await scenarios.assertObjectSSE(
                     { ...baseAssertion, VersionId: v2.VersionId, Body: bodyV2 }, { objConf, obj }, { bktConf, bkt });
-                const {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
+                ({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
                 assert.strictEqual(Versions.length, 3);
 
                 await helpers.s3.putBucketVersioning({ Bucket: bkt.vname,
@@ -379,7 +379,7 @@ describe('SSE KMS before migration', () => {
                     { ...baseAssertion, VersionId: v1.VersionId, Body: bodyV1 }, { objConf, obj }, { bktConf, bkt });
                 await scenarios.assertObjectSSE(
                     { ...baseAssertion, VersionId: v2.VersionId, Body: bodyV2 }, { objConf, obj }, { bktConf, bkt });
-                const {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
+                ({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
                 assert.strictEqual(Versions.length, 3);
 
                 // put a new null version
@@ -389,7 +389,7 @@ describe('SSE KMS before migration', () => {
                     { ...baseAssertion, Body: bodyFinal }, { objConf, obj }, { bktConf, bkt }); // null
                 await scenarios.assertObjectSSE(
                     { ...baseAssertion, Body: bodyFinal }, { objConf, obj }, { bktConf, bkt }, 'null');
-                const {Versions} = await helpers.s3.listObjectVersions({ Bucket: bkt.vname });
+                ({ Versions } = await helpers.s3.listObjectVersions({ Bucket: bkt.vname }));
                 assert.strictEqual(Versions.length, 3);
             });
         }));

tests/functional/sse-kms-migration/helpers.js

@@ -100,7 +100,7 @@ const s3 = {
     putObject: params => wrap(() => s3Client.send(new PutObjectCommand(params))),
     getObject: params => wrap(async () => {
         const response = await s3Client.send(new GetObjectCommand(params));
-        const body = await getBodyAsString(response);
+        const body = await response.Body.transformToString();
         return { ...response, Body: body };
     }),
     listBuckets: params => wrap(() => s3Client.send(new ListBucketsCommand(params || {}))),
@@ -220,13 +220,8 @@ async function createKmsKey(log) {
 const destroyKmsKey = promisify(kms.destroyBucketKey);
 
 async function cleanup(Bucket) {
-    try {
-        await bucketUtil.empty(Bucket);
-        await s3Client.send(new DeleteBucketCommand({ Bucket }));
-    }
-    catch (error) {
-        throw error;
-    }
+    await bucketUtil.empty(Bucket);
+    await s3Client.send(new DeleteBucketCommand({ Bucket }));
 }
 
 module.exports = {