Linting and such.

Author: bsamuel-ui

lib/pip.js

@@ -21,7 +21,7 @@ const {
  * @return {string[][]} a list of valid commands.
  */
 function filterCommands(commands) {
-  return commands.filter((cmd) => Boolean(cmd) && cmd.length > 0);
+  return commands.filter(cmd => Boolean(cmd) && cmd.length > 0);
 }
 
 /**
@@ -34,13 +34,13 @@ function filterCommands(commands) {
 function mergeCommands(commands) {
   const cmds = filterCommands(commands);
   if (cmds.length === 0) {
-    throw new Error('Expected at least one non-empty command')
+    throw new Error('Expected at least one non-empty command');
   } else if (cmds.length === 1) {
     return cmds[0];
   } else {
     // Quote the arguments in each command and join them all using &&.
     const script = cmds.map(quote).join(' && ');
-    return ["/bin/sh", "-c", script];
+    return ['/bin/sh', '-c', script];
   }
 }
 
@@ -79,17 +79,10 @@ function installRequirementsFile(
 
 function pipAcceptsSystem(pythonBin) {
   // Check if pip has Debian's --system option and set it if so
-  const pipTestRes = spawnSync(pythonBin, [
-    '-m',
-    'pip',
-    'help',
-    'install'
-  ]);
+  const pipTestRes = spawnSync(pythonBin, ['-m', 'pip', 'help', 'install']);
   if (pipTestRes.error) {
     if (pipTestRes.error.code === 'ENOENT') {
-      throw new Error(
-        `${pythonBin} not found! Try the pythonBin option.`
-      );
+      throw new Error(`${pythonBin} not found! Try the pythonBin option.`);
     }
     throw pipTestRes.error;
   }
@@ -140,8 +133,12 @@ function installRequirements(targetFolder, serverless, options) {
 
   if (!options.dockerizePip) {
     // Push our local OS-specific paths for requirements and target directory
-    pipCmd.push('-t', dockerPathForWin(targetFolder),
-                '-r', dockerPathForWin(targetRequirementsTxt));
+    pipCmd.push(
+      '-t',
+      dockerPathForWin(targetFolder),
+      '-r',
+      dockerPathForWin(targetRequirementsTxt)
+    );
     // If we want a download cache...
     if (options.useDownloadCache) {
       const downloadCacheDir = path.join(
@@ -175,18 +172,20 @@ function installRequirements(targetFolder, serverless, options) {
     serverless.cli.log(`Docker Image: ${dockerImage}`);
 
     // Prepare bind path depending on os platform
-    const bindPath = dockerPathForWin(
-      getBindPath(serverless, targetFolder)
-    );
+    const bindPath = dockerPathForWin(getBindPath(serverless, targetFolder));
 
     dockerCmd.push('docker', 'run', '--rm', '-v', `${bindPath}:/var/task:z`);
     if (options.dockerSsh) {
       // Mount necessary ssh files to work with private repos
       dockerCmd.push(
-        '-v', `${process.env.HOME}/.ssh/id_rsa:/root/.ssh/id_rsa:z`,
-        '-v', `${process.env.HOME}/.ssh/known_hosts:/root/.ssh/known_hosts:z`,
-        '-v', `${process.env.SSH_AUTH_SOCK}:/tmp/ssh_sock:z`,
-        '-e', 'SSH_AUTH_SOCK=/tmp/ssh_sock'
+        '-v',
+        `${process.env.HOME}/.ssh/id_rsa:/root/.ssh/id_rsa:z`,
+        '-v',
+        `${process.env.HOME}/.ssh/known_hosts:/root/.ssh/known_hosts:z`,
+        '-v',
+        `${process.env.SSH_AUTH_SOCK}:/tmp/ssh_sock:z`,
+        '-e',
+        'SSH_AUTH_SOCK=/tmp/ssh_sock'
       );
     }
 
@@ -207,10 +206,7 @@ function installRequirements(targetFolder, serverless, options) {
       );
       const windowsized = getBindPath(serverless, downloadCacheDir);
       // And now push it to a volume mount and to pip...
-      dockerCmd.push(
-        '-v',
-        `${windowsized}:${dockerDownloadCacheDir}:z`
-      );
+      dockerCmd.push('-v', `${windowsized}:${dockerDownloadCacheDir}:z`);
       pipCmd.push('--cache-dir', dockerDownloadCacheDir);
     }
 
@@ -229,17 +225,20 @@ function installRequirements(targetFolder, serverless, options) {
       }
       // Install requirements with pip
       // Set the ownership of the current folder to user
-      pipCmds.push(['chown', '-R', `${process.getuid()}:${process.getgid()}`, '/var/task']);
+      pipCmds.push([
+        'chown',
+        '-R',
+        `${process.getuid()}:${process.getgid()}`,
+        '/var/task'
+      ]);
       if (options.useDownloadCache) {
         // Set the ownership of the download cache dir back to user
-        pipCmds.push(
-          [
-            'chown',
-            '-R',
-            `${process.getuid()}:${process.getgid()}`,
-            dockerDownloadCacheDir
-          ]
-        );
+        pipCmds.push([
+          'chown',
+          '-R',
+          `${process.getuid()}:${process.getgid()}`,
+          dockerDownloadCacheDir
+        ]);
       }
     } else {
       // Use same user so --cache-dir works
@@ -252,8 +251,10 @@ function installRequirements(targetFolder, serverless, options) {
   switch (getStripMode(options)) {
     case 'docker':
       pipCmds.push(getStripCommand(options, '/var/task'));
+      break;
     case 'direct':
       postCmds.push(getStripCommand(options, dockerPathForWin(targetFolder)));
+      break;
   }
 
   let spawnArgs = { shell: true };
@@ -272,17 +273,20 @@ function installRequirements(targetFolder, serverless, options) {
   serverless.cli.log(`Running ${quote(dockerCmd)}...`);
 
   filterCommands(mainCmds).forEach(([cmd, ...args]) => {
-      const res = spawnSync(cmd, args);
-      if (res.error) {
-        if (res.error.code === 'ENOENT') {
-          const advice = cmd.indexOf('python') > -1 ? 'Try the pythonBin option' : 'Please install it';
-          throw new Error(`${cmd} not found! ${advice}`);
-        }
-        throw res.error;
-      }
-      if (res.status !== 0) {
-        throw new Error(res.stderr);
+    const res = spawnSync(cmd, args);
+    if (res.error) {
+      if (res.error.code === 'ENOENT') {
+        const advice =
+          cmd.indexOf('python') > -1
+            ? 'Try the pythonBin option'
+            : 'Please install it';
+        throw new Error(`${cmd} not found! ${advice}`);
       }
+      throw res.error;
+    }
+    if (res.status !== 0) {
+      throw new Error(res.stderr);
+    }
   });
   // If enabled slimming, delete files in slimPatterns
   if (options.slim === true || options.slim === 'true') {

lib/slim.js

@@ -2,19 +2,31 @@ const isWsl = require('is-wsl');
 const glob = require('glob-all');
 const fse = require('fs-extra');
 
-const getStripMode = (options) => {
+const getStripMode = options => {
   if (options.slim === false || options.slim === 'false') {
     return 'skip';
   } else if (options.dockerizePip) {
     return 'docker';
-  } else if (!isWsl && process.platform === 'win32' || process.platform === 'darwin') {
+  } else if (
+    (!isWsl && process.platform === 'win32') ||
+    process.platform === 'darwin'
+  ) {
     return 'skip';
   } else {
     return 'direct';
   }
-}
+};
 
-const getStripCommand = (options, folderPath) => (['find', folderPath, '-name', '*.so', '-exec', 'strip', '{}', '+']);
+const getStripCommand = (options, folderPath) => [
+  'find',
+  folderPath,
+  '-name',
+  '*.so',
+  '-exec',
+  'strip',
+  '{}',
+  ';'
+];
 
 const deleteFiles = (options, folderPath) => {
   let patterns = ['**/*.py[c|o]', '**/__pycache__*', '**/*.dist-info*'];

test.js

@@ -27,13 +27,15 @@ const mkCommand = cmd => (args, options = {}) => {
     )
   );
   if (error) {
-    console.error(`Error running: ${quote([cmd, ...args])}`);
+    console.error(`Error running: ${quote([cmd, ...args])}`); // eslint-disable-line no-console
     throw error;
   }
   if (status) {
     console.error('STDOUT: ', stdout.toString()); // eslint-disable-line no-console
     console.error('STDERR: ', stderr.toString()); // eslint-disable-line no-console
-    throw new Error(`${quote([cmd, ...args])} failed with status code ${status}`);
+    throw new Error(
+      `${quote([cmd, ...args])} failed with status code ${status}`
+    );
   }
   return stdout && stdout.toString().trim();
 };