fix(CLI): Fix log messages timing

serverless · Sep 17, 2021 · 084a995 · 084a995
1 parent 7eeaa10
commit 084a995
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 34 deletions.
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
@@ -11,7 +11,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, progress } = require('@serverless/utils/log');
+const { style, log, progress, writeText } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 class AwsDeploy {
@@ -119,15 +119,6 @@ class AwsDeploy {
       'aws:deploy:deploy:updateStack': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
         await this.updateStack();
-        log.notice(
-          `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
-            .getProvider('aws')
-            .naming.getStackName()} ${style.aside(
-            `(${Math.floor(
-              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-            )}s)`
-          )}\n`
-        );
       },
 
       // Deploy finalize inner lifecycle
@@ -158,6 +149,39 @@ class AwsDeploy {
           );
         }
       },
+
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'deploy') return;
+        if (this.options.function) return;
+        if (this.serverless.service.provider.shouldNotDeploy) {
+          log.notice(
+            `\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+          return;
+        }
+        log.notice(
+          `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
+            .getProvider('aws')
+            .naming.getStackName()} ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}\n`
+        );
+        if (this.serverless.serviceOutputs) {
+          for (const [section, entries] of this.serverless.serviceOutputs) {
+            if (typeof entries === 'string') {
+              writeText(`${style.aside(`${section}:`)} ${entries}`);
+            } else {
+              writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
+            }
+          }
+        }
+      },
     };
   }
 }

diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const ServerlessError = require('../../../../serverless-error');
-const { style, legacy, log } = require('@serverless/utils/log');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async checkForChanges() {
@@ -188,13 +188,6 @@ module.exports = {
 
           const message = ['Service files not changed. Skipping deployment...'].join('');
           legacy.log(message, 'Serverless', { color: 'orange' });
-          log.notice(
-            `\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
-              `(${Math.floor(
-                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-              )}s)`
-            )}`
-          );
         }
       });
     }

diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const { style, legacy, writeText, isVerboseMode } = require('@serverless/utils/log');
+const { legacy, isVerboseMode } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
@@ -183,16 +183,4 @@ module.exports = {
 
     return message;
   },
-
-  displayServiceOutputs() {
-    if (this.serverless.serviceOutputs && !this.serverless.service.provider.shouldNotDeploy) {
-      for (const [section, entries] of this.serverless.serviceOutputs) {
-        if (typeof entries === 'string') {
-          writeText(`${style.aside(`${section}:`)} ${entries}`);
-        } else {
-          writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
-        }
-      }
-    }
-  },
 };
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
@@ -28,7 +28,6 @@ class AwsInfo {
               'displayFunctions',
               'displayLayers',
               'displayStackOutputs',
-              'displayServiceOutputs',
             ],
           },
         },
@@ -63,8 +62,6 @@ class AwsInfo {
 
       'aws:info:displayStackOutputs': async () =>
         BbPromise.bind(this).then(this.displayStackOutputs),
-
-      'aws:info:displayServiceOutputs': async () => await this.displayServiceOutputs(),
     };
   }
 }