refactoring & caching bug-fix

- refactors naming of functions for easier comprehension of what its doing
-  refactors logic of determining requirments-path
- fixes bug in caching depending on correct deterination of working path

Author: bweigel

lib/pip.js

@@ -27,15 +27,19 @@ function quote_single(quoteme) {
  * @param {Object} options
  * @return {undefined}
  */
-function installRequirementsFile(
+function generateRequirementsFile(
   requirementsPath,
   targetFile,
   serverless,
   servicePath,
   options
 ) {
   if (options.usePipenv && fse.existsSync(path.join(servicePath, 'Pipfile'))) {
-    generateRequirementsFile(
+    filterRequirementsFile(
+      /*
+      TODO: this is supposed to generate a requirements.txt from Pipfile, 
+      but source and target are basicalle the same
+      */
       path.join(servicePath, '.serverless/requirements.txt'),
       targetFile,
       options
@@ -44,7 +48,7 @@ function installRequirementsFile(
       `Parsed requirements.txt from Pipfile in ${targetFile}...`
     );
   } else {
-    generateRequirementsFile(requirementsPath, targetFile, options);
+    filterRequirementsFile(requirementsPath, targetFile, options);
     serverless.cli.log(
       `Generated requirements from ${requirementsPath} in ${targetFile}...`
     );
@@ -300,7 +304,7 @@ function dockerPathForWin(options, path) {
  * @param {string} target requirements where results are written
  * @param {Object} options
  */
-function generateRequirementsFile(source, target, options) {
+function filterRequirementsFile(source, target, options) {
   const noDeploy = new Set(options.noDeploy || []);
   const requirements = fse
     .readFileSync(source, { encoding: 'utf-8' })
@@ -381,11 +385,21 @@ function installRequirementsIfNeeded(
   // Our source requirements, under our service path, and our module path (if specified)
   const fileName = path.join(servicePath, modulePath, options.fileName);
 
-  // First, generate the requirements file to our local .serverless folder
-  fse.ensureDirSync(path.join(servicePath, '.serverless'));
-  const slsReqsTxt = path.join(servicePath, '.serverless', 'requirements.txt');
+  let requirementsTxtDirectory;
+  // Copy our requirements to another filename in .serverless (incase of individually packaged)
+  if (modulePath && modulePath != '.') {
+    requirementsTxtDirectory = path.join(
+      servicePath,
+      '.serverless',
+      modulePath
+    );
+  } else {
+    requirementsTxtDirectory = path.join(servicePath, '.serverless');
+  }
+  fse.ensureDirSync(requirementsTxtDirectory);
+  const slsReqsTxt = path.join(requirementsTxtDirectory, 'requirements.txt');
 
-  installRequirementsFile(
+  generateRequirementsFile(
     fileName,
     slsReqsTxt,
     serverless,
@@ -401,28 +415,13 @@ function installRequirementsIfNeeded(
     return false;
   }
 
-  // Copy our requirements to another filename in .serverless (incase of individually packaged)
-  if (modulePath && modulePath != '.') {
-    fse.existsSync(path.join(servicePath, '.serverless', modulePath));
-    const destinationFile = path.join(
-      servicePath,
-      '.serverless',
-      modulePath,
-      'requirements.txt'
-    );
-    serverless.cli.log(
-      `Copying from ${slsReqsTxt} into ${destinationFile} ...`
-    );
-    fse.copySync(slsReqsTxt, destinationFile);
-  }
-
   // Then generate our MD5 Sum of this requirements file to determine where it should "go" to and/or pull cache from
   const reqChecksum = md5Path(slsReqsTxt);
 
   // Then figure out where this cache should be, if we're caching, if we're in a module, etc
   const workingReqsFolder = getRequirementsWorkingPath(
     reqChecksum,
-    servicePath,
+    requirementsTxtDirectory,
     options
   );
 

lib/shared.js

@@ -57,7 +57,11 @@ function checkForAndDeleteMaxCacheVersions(options, serverless) {
  * @param  {Object} options
  * @return {string}
  */
-function getRequirementsWorkingPath(subfolder, servicePath, options) {
+function getRequirementsWorkingPath(
+  subfolder,
+  requirementsTxtDirectory,
+  options
+) {
   // If we want to use the static cache
   if (options && options.useStaticCache) {
     if (subfolder) {
@@ -69,7 +73,7 @@ function getRequirementsWorkingPath(subfolder, servicePath, options) {
   }
 
   // If we don't want to use the static cache, then fallback to the way things used to work
-  return path.join(servicePath, '.serverless', 'requirements');
+  return path.join(requirementsTxtDirectory, 'requirements');
 }
 
 /**