refactor: Adapt docker for modern logs

Author: pgrzesik

index.js

@@ -137,7 +137,7 @@ class ServerlessPythonRequirements {
       this.log = v3Utils.log;
       this.progress = v3Utils.progress;
       this.writeText = v3Utils.writeText;
-    };
+    }
 
     this.commands = {
       requirements: {

lib/docker.js

@@ -72,7 +72,7 @@ function findTestFile(servicePath) {
  * @param {string} bindPath
  * @return {boolean}
  */
-function tryBindPath(serverless, bindPath, testFile) {
+function tryBindPath(bindPath, testFile, { serverless, log }) {
   const debug = process.env.SLS_DEBUG;
   const options = [
     'run',
@@ -84,12 +84,30 @@ function tryBindPath(serverless, bindPath, testFile) {
     `/test/${testFile}`,
   ];
   try {
-    if (debug) serverless.cli.log(`Trying bindPath ${bindPath} (${options})`);
+    if (debug) {
+      if (log) {
+        log.debug(`Trying bindPath ${bindPath} (${options})`);
+      } else {
+        serverless.cli.log(`Trying bindPath ${bindPath} (${options})`);
+      }
+    }
     const ps = dockerCommand(options);
-    if (debug) serverless.cli.log(ps.stdout.trim());
+    if (debug) {
+      if (log) {
+        log.debug(ps.stdout.trim());
+      } else {
+        serverless.cli.log(ps.stdout.trim());
+      }
+    }
     return ps.stdout.trim() === `/test/${testFile}`;
   } catch (err) {
-    if (debug) serverless.cli.log(`Finding bindPath failed with ${err}`);
+    if (debug) {
+      if (log) {
+        log.debug(`Finding bindPath failed with ${err}`);
+      } else {
+        serverless.cli.log(`Finding bindPath failed with ${err}`);
+      }
+    }
     return false;
   }
 }
@@ -100,7 +118,7 @@ function tryBindPath(serverless, bindPath, testFile) {
  * @param {string} servicePath
  * @return {string} The bind path.
  */
-function getBindPath(serverless, servicePath) {
+function getBindPath(servicePath, pluginInstance) {
   // Determine bind path
   if (process.platform !== 'win32' && !isWsl) {
     return servicePath;
@@ -144,7 +162,7 @@ function getBindPath(serverless, servicePath) {
 
   for (let i = 0; i < bindPaths.length; i++) {
     const bindPath = bindPaths[i];
-    if (tryBindPath(serverless, bindPath, testFile)) {
+    if (tryBindPath(bindPath, testFile, pluginInstance)) {
       return bindPath;
     }
   }

lib/inject.js

@@ -148,12 +148,15 @@ function injectAllRequirements(funcArtifact) {
     );
   }
 
-  return returnPromise
-    .then(() => injectProgress && injectProgress.remove())
-    .catch((e) => {
-      injectProgress && injectProgress.remove();
-      throw e;
-    });
+  return (
+    returnPromise &&
+    returnPromise
+      .then(() => injectProgress && injectProgress.remove())
+      .catch((e) => {
+        injectProgress && injectProgress.remove();
+        throw e;
+      })
+  );
 }
 
 module.exports = { injectAllRequirements };

lib/pip.js

@@ -126,18 +126,18 @@ function pipAcceptsSystem(pythonBin) {
  * @param {Object} options
  * @return {undefined}
  */
-function installRequirements(
-  targetFolder,
-  { options, serverless, log, progress }
-) {
+function installRequirements(targetFolder, pluginInstance) {
+  const { options, serverless, log, progress } = pluginInstance;
   const targetRequirementsTxt = path.join(targetFolder, 'requirements.txt');
 
   let installProgress;
   if (progress) {
+    log.info(
+      `Installing requirements from "${targetRequirementsTxt}"`,
+    );
     installProgress = progress.get('python-install');
     installProgress.update(
-      `Installing requirements from "${targetRequirementsTxt}"`,
-      { isMainEvent: true }
+      'Installing requirements',
     );
   } else {
     serverless.cli.log(
@@ -262,7 +262,9 @@ function installRequirements(
       }
 
       // Prepare bind path depending on os platform
-      const bindPath = dockerPathForWin(getBindPath(serverless, targetFolder));
+      const bindPath = dockerPathForWin(
+        getBindPath(targetFolder, pluginInstance)
+      );
 
       dockerCmd.push('docker', 'run', '--rm', '-v', `${bindPath}:/var/task:z`);
       if (options.dockerSsh) {
@@ -300,7 +302,7 @@ function installRequirements(
         fse.closeSync(
           fse.openSync(path.join(downloadCacheDir, 'requirements.txt'), 'w')
         );
-        const windowsized = getBindPath(serverless, downloadCacheDir);
+        const windowsized = getBindPath(downloadCacheDir, pluginInstance);
         // And now push it to a volume mount and to pip...
         dockerCmd.push('-v', `${windowsized}:${dockerDownloadCacheDir}:z`);
         pipCmd.push('--cache-dir', dockerDownloadCacheDir);