fix(AWS Deploy): Fix stack errors processing

serverless · May 20, 2021 · 18a9b2b · 18a9b2b
1 parent 29f0e9c
commit 18a9b2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
@@ -101,9 +101,12 @@ module.exports = {
                 this.serverless.cli.log(`View the full error output: ${stackUrl}`);
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
-                errorMessage += `${stackLatestError.ResourceStatusReason}.`;
+                errorMessage += `${
+                  stackLatestError.ResourceStatusReason || stackLatestError.ResourceStatus
+                }.`;
                 const errorCode = (() => {
                   if (
+                    stackLatestError.ResourceStatusReason &&
                     stackLatestError.ResourceStatusReason.startsWith('Properties validation failed')
                   ) {
                     return `AWS_STACK_${action.toUpperCase()}_VALIDATION_ERROR`;

diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
@@ -921,7 +921,6 @@ describe('monitorStack', () => {
             ResourceType: 'AWS::CloudFormation::Stack',
             Timestamp: new Date(),
             ResourceStatus: 'UPDATE_ROLLBACK_IN_PROGRESS',
-            ResourceStatusReason: 'Export is in use',
           },
         ],
       };
@@ -943,7 +942,7 @@ describe('monitorStack', () => {
 
       return awsPlugin.monitorStack('update', cfDataMock, { frequency: 10 }).catch((e) => {
         let errorMessage = 'An error occurred: ';
-        errorMessage += 'mocha - Export is in use.';
+        errorMessage += 'mocha - UPDATE_ROLLBACK_IN_PROGRESS.';
         expect(e.name).to.be.equal('ServerlessError');
         expect(e.message).to.be.equal(errorMessage);
         // callCount is 2 because Serverless will immediately exits and shows the error