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

@@ -73,7 +73,7 @@ function findTestFile(servicePath) {
  * @param {string} bindPath
  * @return {boolean}
  */
-async function tryBindPath(serverless, bindPath, testFile) {
+async function tryBindPath(bindPath, testFile, { serverless, log }) {
   const debug = process.env.SLS_DEBUG;
   const options = [
     'run',
@@ -85,12 +85,30 @@ async 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 = await dockerCommand(options);
-    if (debug) serverless.cli.log(ps.stdout.trim());
-    return ps.stdout.trim() === `/test/${testFile}`;
+    if (debug) {
+      if (log) {
+        log.debug(ps.stdoutBuffer.trim());
+      } else {
+        serverless.cli.log(ps.stdoutBuffer.trim());
+      }
+    }
+    return ps.stdoutBuffer.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;
   }
 }
@@ -101,7 +119,7 @@ async function tryBindPath(serverless, bindPath, testFile) {
  * @param {string} servicePath
  * @return {string} The bind path.
  */
-async function getBindPath(serverless, servicePath) {
+async function getBindPath(servicePath, pluginInstance) {
   // Determine bind path
   if (process.platform !== 'win32' && !isWsl) {
     return servicePath;
@@ -145,7 +163,7 @@ async function getBindPath(serverless, servicePath) {
 
   for (let i = 0; i < bindPaths.length; i++) {
     const bindPath = bindPaths[i];
-    if (await tryBindPath(serverless, bindPath, testFile)) {
+    if (await tryBindPath(bindPath, testFile, pluginInstance)) {
       return bindPath;
     }
   }
@@ -171,7 +189,7 @@ async function getDockerUid(bindPath) {
     '/bin/sh',
   ];
   const ps = await dockerCommand(options);
-  return ps.stdout.trim();
+  return ps.stdoutBuffer.trim();
 }
 
 module.exports = { buildImage, getBindPath, getDockerUid };

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

@@ -133,19 +133,15 @@ async function pipAcceptsSystem(pythonBin) {
  * @param {Object} options
  * @return {undefined}
  */
-async function installRequirements(
-  targetFolder,
-  { options, serverless, log, progress }
-) {
+async 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 }
-    );
+    installProgress.update('Installing requirements');
   } else {
     serverless.cli.log(
       `Installing requirements from ${targetRequirementsTxt} ...`
@@ -226,7 +222,7 @@ async function installRequirements(
         pipCmd.push('--cache-dir', downloadCacheDir);
       }
 
-      if (pipAcceptsSystem(options.pythonBin)) {
+      if (await pipAcceptsSystem(options.pythonBin)) {
         pipCmd.push('--system');
       }
     }
@@ -253,7 +249,7 @@ async function installRequirements(
           );
         }
         try {
-          dockerImage = buildImage(
+          dockerImage = await buildImage(
             options.dockerFile,
             options.dockerBuildCmdExtraArgs
           );
@@ -270,7 +266,9 @@ async function installRequirements(
       }
 
       // Prepare bind path depending on os platform
-      const bindPath = dockerPathForWin(getBindPath(serverless, targetFolder));
+      const bindPath = dockerPathForWin(
+        await getBindPath(targetFolder, pluginInstance)
+      );
 
       dockerCmd.push('docker', 'run', '--rm', '-v', `${bindPath}:/var/task:z`);
       if (options.dockerSsh) {
@@ -308,7 +306,7 @@ async function installRequirements(
         fse.closeSync(
           fse.openSync(path.join(downloadCacheDir, 'requirements.txt'), 'w')
         );
-        const windowsized = getBindPath(serverless, downloadCacheDir);
+        const windowsized = await 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);
@@ -337,7 +335,7 @@ async function installRequirements(
         ]);
       } else {
         // Use same user so --cache-dir works
-        dockerCmd.push('-u', getDockerUid(bindPath));
+        dockerCmd.push('-u', await getDockerUid(bindPath));
       }
 
       for (let path of options.dockerExtraFiles) {
@@ -716,9 +714,7 @@ async function installAllRequirements() {
       // If we didn't already process a module (functions can re-use modules)
       if (!doneModules.includes(f.module)) {
         const reqsInstalledAt = await installRequirementsIfNeeded(
-          this.servicePath,
           f.module,
-          this.options,
           f,
           this.serverless
         );