refactor(CLI): Modern logs for plugin list command

serverless · Sep 28, 2021 · 00e016c · 00e016c
1 parent 3094be0
commit 00e016c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
@@ -7,6 +7,7 @@ const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const chalk = require('chalk');
 const _ = require('lodash');
+const { legacy, log, writeText, style } = require('@serverless/utils/log');
 const ServerlessError = require('../../../serverless-error');
 
 module.exports = {
@@ -73,18 +74,27 @@ module.exports = {
       const orderedPlugins = _.orderBy(plugins, ['name'], ['asc']);
       orderedPlugins.forEach((plugin) => {
         message += `${chalk.yellow.underline(plugin.name)} - ${plugin.description}\n`;
+        writeText(`${style.link(plugin.name)} ${style.aside(plugin.description)}`);
       });
       // remove last two newlines for a prettier output
       message = message.slice(0, -2);
-      this.serverless.cli.consoleLog(message);
-      this.serverless.cli.consoleLog(`
+      legacy.consoleLog(message);
+      legacy.consoleLog(`
 To install a plugin run 'serverless plugin install --name plugin-name-here'
 
 It will be automatically downloaded and added to your package.json and serverless.yml file
       `);
+      writeText(
+        null,
+        'Install a plugin by running:',
+        '  serverless plugin install --name ...',
+        null,
+        'It will be automatically downloaded and added to package.json and serverless.yml'
+      );
     } else {
       message = 'There are no plugins available to display';
-      this.serverless.cli.consoleLog(message);
+      legacy.consoleLog(message);
+      log.notice.skip('There are no plugins available to display');
     }
 
     return BbPromise.resolve(message);

diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -15,7 +15,6 @@ chai.use(require('chai-as-promised'));
 describe('PluginUtils', () => {
   let pluginUtils;
   let serverless;
-  let consoleLogStub;
   const plugins = [
     {
       name: 'serverless-plugin-1',
@@ -39,11 +38,6 @@ describe('PluginUtils', () => {
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginUtils = new PluginInstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
   });
 
   describe('#getServerlessFilePath()', () => {
@@ -107,7 +101,6 @@ describe('PluginUtils', () => {
       expectedMessage += ' - Serverless Plugin 2\n';
       expectedMessage = expectedMessage.slice(0, -2);
       return expect(pluginUtils.display(plugins)).to.be.fulfilled.then((message) => {
-        expect(consoleLogStub.calledTwice).to.equal(true);
         expect(message).to.equal(expectedMessage);
       });
     });
@@ -116,7 +109,6 @@ describe('PluginUtils', () => {
       const expectedMessage = 'There are no plugins available to display';
 
       return pluginUtils.display([]).then((message) => {
-        expect(consoleLogStub.calledOnce).to.equal(true);
         expect(message).to.equal(expectedMessage);
       });
     });