More debugging of integration failures

craftship · Feb 10, 2017 · 4754f3b · 4754f3b
1 parent 8e02127
commit 4754f3b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/.serverless_plugins/remove-storage/index.js b/.serverless_plugins/remove-storage/index.js
@@ -16,17 +16,17 @@ class RemoveStorageBucket {
     };
   }
 
-  listAllKeys(marker) {
+  listAllKeys(token) {
     const allKeys = [];
-    return this.s3.listObjects({
+    return this.s3.listObjectsV2({
       Bucket: this.bucket,
-      Marker: marker,
+      ContinuationToken: token,
     }).promise()
    .then((data) => {
       allKeys.push(data.Contents);
 
       if (data.IsTruncated) {
-        return this.listAllKeys(data.NextMarker);
+        return this.listAllKeys(data.NextContinuationToken);
       }
 
       return [].concat.apply([], allKeys).map(

diff --git a/integration/bin/deploy b/integration/bin/deploy
@@ -18,12 +18,7 @@ const slsDeploy = spawn('sls', ['deploy', '--stage', stage]);
 
 let registryUrl;
 
-slsDeploy.stderr.on('data', (data) => {
-  console.log('Error:', data.toString());
-});
-
 slsDeploy.stdout.on('data', (data) => {
-  console.log(data.toString());
   if (!registryUrl) {
     const registryRegex = new RegExp('https://.+?(?={name})');
     const urls = registryRegex.exec(data.toString());
@@ -37,10 +32,10 @@ slsDeploy.stdout.on('data', (data) => {
   }
 });
 
-slsDeploy.on('close', (code) => {
+slsDeploy.on('exit', (code) => {
   if (code === 0) {
     console.log(`Finished deployment for yith ${stage} : code ${code}`);
   } else {
-    throw new Error(code);
+    console.log(`Error deploying code ${code}`);
   }
 });
diff --git a/test/serverless_plugins/remove-storage/index.test.js b/test/serverless_plugins/remove-storage/index.test.js
@@ -40,7 +40,7 @@ describe('Plugin: RemoveStorageBucket', () => {
 
                 const awsS3Instance = createStubInstance(AWS.S3);
                 awsS3Instance.deleteBucket = deleteBucketStub;
-                awsS3Instance.listObjects = listObjectsStub;
+                awsS3Instance.listObjectsV2 = listObjectsStub;
                 awsS3Instance.deleteObjects = deleteObjectsStub;
 
                 return awsS3Instance;
@@ -71,7 +71,7 @@ describe('Plugin: RemoveStorageBucket', () => {
 
         assert(listObjectsStub.calledWithExactly({
           Bucket: 'foo-bucket',
-          Marker: undefined,
+          ContinuationToken: undefined,
         }));
       });
 
@@ -123,7 +123,7 @@ describe('Plugin: RemoveStorageBucket', () => {
                 });
 
                 const awsS3Instance = createStubInstance(AWS.S3);
-                awsS3Instance.listObjects = listObjectsStub;
+                awsS3Instance.listObjectsV2 = listObjectsStub;
 
                 return awsS3Instance;
               }),