CLI: Modern logs adjustements for logs and info commands

lib/cli/handle-error.js

@@ -159,10 +159,7 @@ module.exports = async (exception, options = {}) => {
   const errorMsg = stripAnsi(
     exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message
   );
-  writeText(style.error('\nError:'));
-  if (errorMsg) {
-    writeText(`  ${errorMsg.split('\n').join('\n  ')}`);
-  }
+  writeText(null, style.error('Error:'), errorMsg);
 
   legacy.consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
   legacy.consoleLog(`${chalk.yellow('     Docs:          ')}docs.serverless.com`);

lib/cli/write-service-outputs.js

@@ -3,7 +3,6 @@
 const { writeText, style } = require('@serverless/utils/log');
 
 module.exports = (serviceOutputs) => {
-  writeText();
   for (const [section, entries] of serviceOutputs) {
     if (typeof entries === 'string') {
       writeText(`${style.aside(`${section}:`)} ${entries}`);

lib/plugins/aws/deploy/index.js

@@ -12,7 +12,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');
 
 const mainProgress = progress.get('main');
@@ -189,7 +189,8 @@ class AwsDeploy {
             )}s)`
           )}`
         );
-        if (this.serverless.serviceOutputs) writeServiceOutputs(this.serverless.serviceOutputs);
+        writeText();
+        writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };
   }

lib/plugins/aws/info/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const { progress } = require('@serverless/utils/log');
+const { progress, writeText, style } = require('@serverless/utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
@@ -75,7 +75,14 @@ class AwsInfo {
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
 
-        if (this.serverless.serviceOutputs) writeServiceOutputs(this.serverless.serviceOutputs);
+        writeText(
+          null,
+          `${style.aside('service:')} ${this.serverless.service.service}`,
+          `${style.aside('stage:')} ${this.provider.getStage()}`,
+          `${style.aside('region:')} ${this.provider.getRegion()}`,
+          `${style.aside('stack:')} ${this.provider.naming.getStackName()}`
+        );
+        writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };
   }

lib/plugins/aws/logs.js

@@ -4,8 +4,7 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 const utc = require('dayjs/plugin/utc');
 const wait = require('timers-ext/promise/sleep');
-const stripAnsi = require('strip-ansi');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { legacy, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
 const ServerlessError = require('../../serverless-error');
@@ -96,9 +95,8 @@ class AwsLogs {
     const results = await this.provider.request('CloudWatchLogs', 'filterLogEvents', params);
     if (results.events) {
       results.events.forEach((e) => {
-        const text = formatLambdaLogEvent(e.message);
-        legacy.write(text);
-        writeText(style.aside(stripAnsi(text).trimRight()));
+        legacy.write(formatLambdaLogEvent(e.message));
+        writeText(formatLambdaLogEvent(e.message, { isModern: true }));
       });
     }
 

lib/plugins/aws/utils/formatLambdaLogEvent.js

@@ -3,19 +3,23 @@
 const dayjs = require('dayjs');
 const chalk = require('chalk');
 const os = require('os');
+const { style } = require('@serverless/utils/log');
 
-module.exports = (msgParam) => {
+module.exports = (msgParam, options = {}) => {
+  const { isModern } = options;
   let msg = msgParam;
   const dateFormat = 'YYYY-MM-DD HH:mm:ss.SSS (Z)';
 
-  if (msg.startsWith('REPORT')) {
+  if (isModern) {
+    if (!msg.startsWith('REPORT')) msg = msg.trimRight();
+  } else if (msg.startsWith('REPORT')) {
     msg += os.EOL;
   }
 
   if (msg.startsWith('START') || msg.startsWith('END') || msg.startsWith('REPORT')) {
-    return chalk.gray(msg);
+    return isModern ? style.aside(msg) : chalk.gray(msg);
   } else if (msg.trim() === 'Process exited before completing request') {
-    return chalk.red(msg);
+    return isModern ? style.error(msg) : chalk.red(msg);
   }
 
   const splitted = msg.split('\t');
@@ -38,7 +42,8 @@ module.exports = (msgParam) => {
     return msg;
   }
   const text = msg.split(`${reqId}\t`)[1];
-  const time = chalk.green(dayjs(date).format(dateFormat));
+  const time = dayjs(date).format(dateFormat);
 
-  return `${time}\t${chalk.yellow(reqId)}\t${level}${text}`;
+  if (isModern) return `${style.aside(`${time}\t${reqId}`)}\t${level}${text}`;
+  return `${chalk.green(time)}\t${chalk.yellow(reqId)}\t${level}${text}`;
 };