fix(AWS Deploy): Correctly identify "no updates" error during deploy

serverless · Apr 6, 2021 · 0e6a1ce · 0e6a1ce
1 parent dae9058
commit 0e6a1ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
@@ -131,15 +131,17 @@ module.exports = {
       params.RollbackConfiguration = this.serverless.service.provider.rollbackConfiguration;
     }
 
-    return this.provider
-      .request('CloudFormation', 'updateStack', params)
-      .then((cfData) => this.monitorStack('update', cfData))
-      .catch((e) => {
-        if (e.message === NO_UPDATE_MESSAGE) {
-          return BbPromise.resolve();
-        }
-        throw e;
-      });
+    let cfData;
+    try {
+      cfData = await this.provider.request('CloudFormation', 'updateStack', params);
+    } catch (e) {
+      if (e.message.includes(NO_UPDATE_MESSAGE)) {
+        return;
+      }
+      throw e;
+    }
+
+    await this.monitorStack('update', cfData);
   },
 
   async updateStack() {

diff --git a/test/unit/lib/plugins/aws/lib/updateStack.test.js b/test/unit/lib/plugins/aws/lib/updateStack.test.js
@@ -198,8 +198,10 @@ describe('updateStack', () => {
     });
 
     it('should success if no changes to stack happened', () => {
-      awsDeploy.monitorStack.restore();
-      sinon.stub(awsDeploy, 'monitorStack').rejects(new Error('No updates are to be performed.'));
+      awsDeploy.provider.request.restore();
+      sinon
+        .stub(awsDeploy.provider, 'request')
+        .rejects(new Error('No updates are to be performed.'));
 
       return awsDeploy.update();
     });