refactor(CLI): Minor modern logs updates

serverless · Oct 8, 2021 · 39c09e4 · 39c09e4
1 parent 519d091
commit 39c09e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
@@ -2,6 +2,7 @@
 
 const BbPromise = require('bluebird');
 const _ = require('lodash');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async disassociateUsagePlan() {
@@ -10,7 +11,8 @@ module.exports = {
       this.serverless.service.provider.apiKeys;
 
     if (apiKeys && apiKeys.length) {
-      this.serverless.cli.log('Removing usage plan association...');
+      legacy.log('Removing usage plan association...');
+      log.info('Removing usage plan association');
       const stackName = `${this.provider.naming.getStackName()}`;
       return BbPromise.all([
         this.provider.request('CloudFormation', 'describeStackResource', {

diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
@@ -6,11 +6,12 @@ const crypto = require('crypto');
 const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
-const log = require('@serverless/utils/log');
+const oldLog = require('@serverless/utils/log');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
 const parseS3URI = require('../../utils/parse-s3-uri');
+const { legacy, log } = require('@serverless/utils/log');
 
 class AwsCompileFunctions {
   constructor(serverless, options) {
@@ -120,8 +121,9 @@ class AwsCompileFunctions {
     const s3Object = parseS3URI(artifactFilePath);
     if (!s3Object) return;
     if (process.env.SLS_DEBUG) {
-      this.serverless.cli.log(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
+      legacy.log(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
     }
+    log.info(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
     await new Promise((resolve, reject) => {
       const tmpDir = this.serverless.utils.getTmpDirPath();
       const filePath = path.join(tmpDir, path.basename(s3Object.Key));
@@ -743,7 +745,7 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
 
       if (!configuration) {
         if (process.env.SLS_DEBUG) {
-          log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
+          oldLog(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
         }
         return;
       }