From 05fb97fdab0c0ddc471ca554e48e09e661f797db Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 18 Jan 2022 16:24:19 +0100
Subject: [PATCH] refactor: Refactor direct use of `@serverless/utils/log`

---
 lib/aws/request.js                                        | 3 ++-
 .../variables/eventually-report-resolution-errors.js      | 8 ++++++--
 lib/plugins/aws/package/compile/functions.js              | 4 ++--
 lib/utils/npmPackage/isWritable.js                        | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index 6a68d08e9..c7a102a3f 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -96,7 +96,8 @@ const shouldS3Accelerate = (method, params) => {
     params &&
     params.isS3TransferAccelerationEnabled
   ) {
-    log('Using S3 Transfer Acceleration Endpoint...');
+    legacy.log('Using S3 Transfer Acceleration Endpoint...');
+    log.notice('Using S3 Transfer Acceleration Endpoint...');
     return true;
   }
   return false;
diff --git a/lib/configuration/variables/eventually-report-resolution-errors.js b/lib/configuration/variables/eventually-report-resolution-errors.js
index 29819fac0..ead279da6 100644
--- a/lib/configuration/variables/eventually-report-resolution-errors.js
+++ b/lib/configuration/variables/eventually-report-resolution-errors.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const log = require('@serverless/utils/log');
+const { log, legacy } = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const resolveCliInput = require('../../cli/resolve-input');
 const logDeprecation = require('../../utils/logDeprecation');
@@ -14,11 +14,15 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
   if (!resolutionErrors.size) return false;
 
   if (resolveCliInput().isHelpRequest) {
-    log(
+    legacy.log(
       'Resolution of service configuration failed when resolving variables: ' +
         `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`,
       { color: 'orange' }
     );
+    log.warning(
+      'Resolution of service configuration failed when resolving variables: ' +
+        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`
+    );
   } else {
     if (configuration.variablesResolutionMode) {
       throw new ServerlessError(
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 4d878b63a..e4559bb44 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -6,7 +6,6 @@ const crypto = require('crypto');
 const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
-const oldLog = require('@serverless/utils/log');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
@@ -755,8 +754,9 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
       const configuration = cfTemplate.Resources[potentialLocalLayerObject.Ref];
 
       if (!configuration) {
+        log.info(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
         if (process.env.SLS_DEBUG) {
-          oldLog(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
+          legacy.log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
         }
         return;
       }
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npmPackage/isWritable.js
index b8333b345..4fb18ebdf 100644
--- a/lib/utils/npmPackage/isWritable.js
+++ b/lib/utils/npmPackage/isWritable.js
@@ -3,7 +3,7 @@
 const { format } = require('util');
 const path = require('path');
 const fsp = require('fs').promises;
-const log = require('@serverless/utils/log');
+const { log, legacy } = require('@serverless/utils/log');
 
 const npmPackageRoot = path.resolve(__dirname, '../../../');
 
@@ -13,7 +13,10 @@ module.exports = async () => {
     await fsp.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
     return true;
   } catch (error) {
-    if (process.env.SLS_DEBUG) log(format('Auto update: file access error: %O', error));
+    if (process.env.SLS_DEBUG) {
+      legacy.log(format('Auto update: file access error: %O', error));
+    }
+    log.info('Auto update: file access error: %O', error);
     return false;
   }
 };