Fixing some linting and removing some debugging

Author: AndrewFarley

lib/docker.js

@@ -7,8 +7,6 @@ const isWsl = require('is-wsl');
  * @return {Object}
  */
 function dockerCommand(options) {
-  console.log("dockerCommand")
-  console.log(options)
   const cmd = 'docker';
   const ps = spawnSync(cmd, options, {'encoding': 'utf-8'});
   if (ps.error) {
@@ -28,8 +26,6 @@ function dockerCommand(options) {
  * @return {string} The name of the built docker image.
  */
 function buildImage(dockerFile) {
-  console.log("buildImage")
-  console.log(dockerFile)
   const imageName = 'sls-py-reqs-custom';
   const options = [
     'build', '-f', dockerFile, '-t', imageName, '.',
@@ -44,8 +40,6 @@ function buildImage(dockerFile) {
  * @return {boolean}
  */
 function tryBindPath(bindPath) {
-  console.log("tryBindPath")
-  console.log(bindPath)
   const options = ['run', '--rm', '-v', `${bindPath}:/test`,
     'alpine', 'ls', '/test/serverless.yml'];
   try {
@@ -63,8 +57,6 @@ function tryBindPath(bindPath) {
  * @return {string} The bind path.
  */
 function getBindPath(servicePath) {
-  console.log("getBindPath")
-  console.log(servicePath)
   // Determine bind path
   if (process.platform !== 'win32' && !isWsl) {
     return servicePath;
@@ -116,8 +108,6 @@ function getBindPath(servicePath) {
  * @return {boolean}
  */
 function getDockerUid(bindPath) {
-  console.log("getDockerUid")
-  console.log(bindPath)
   const options = ['run', '--rm', '-v', `${bindPath}:/test`,
     'alpine', 'stat', '-c', '%u', '/bin/sh'];
   const ps = dockerCommand(options);

lib/pip.js

@@ -45,7 +45,7 @@ function installRequirementsFile(requirementsPath, targetFile, serverless, servi
  * @param {Object} options
  * @return {undefined}
  */
-function installRequirements(targetFolder, servicePath, serverless, options) {
+function installRequirements(targetFolder, serverless, options) {
   const targetRequirementsTxt = path.join(targetFolder, 'requirements.txt');
 
   serverless.cli.log(`Installing requirements from ${targetRequirementsTxt} ...`);
@@ -56,13 +56,13 @@ function installRequirements(targetFolder, servicePath, serverless, options) {
     options.pythonBin, '-m', 'pip', '--isolated', 'install',
     ...options.pipCmdExtraArgs,
   ];
-  
+
   // If we're not dockerizing pip
   if (!options.dockerizePip) {
     // Push our local OS-specific paths for requirements and target directory
     pipCmd.push('-t', targetFolder);
     pipCmd.push('-r', targetRequirementsTxt);
-    
+
     // If we want a download cache...
     if (options.useDownloadCache) {
       const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCache_slspyc');
@@ -100,11 +100,11 @@ function installRequirements(targetFolder, servicePath, serverless, options) {
       dockerImage = options.dockerImage;
     }
     serverless.cli.log(`Docker Image: ${dockerImage}`);
-    
+
     // Push docker-specific paths for requirements and target directory
     pipCmd.push('-t', '/var/task/');
     pipCmd.push('-r', '/var/task/requirements.txt');
-    
+
     // Prepare bind path depending on os platform
     const bindPath = getBindPath(targetFolder);
 
@@ -148,13 +148,7 @@ function installRequirements(targetFolder, servicePath, serverless, options) {
     cmd = pipCmd[0];
     cmdOptions = pipCmd.slice(1);
   }
-  serverless.cli.log(`Trying to run command...`);
-  console.log(cmd)
-  console.log(cmdOptions)
   const res = spawnSync(cmd, cmdOptions, {cwd: targetFolder, shell: true});
-  serverless.cli.log(`Ran command`);
-  serverless.cli.log(res)
-
   if (res.error) {
     if (res.error.code === 'ENOENT') {
       if (options.dockerizePip) {
@@ -281,7 +275,6 @@ function installRequirementsIfNeeded(servicePath, modulePath, options, serverles
   // Then install our requirements from this folder
   installRequirements(
     workingReqsFolder,
-    servicePath,
     serverless,
     options
   );