Properly filter requirements for lambda layer

Author: Yossi Synett

lib/inject.js

@@ -9,6 +9,46 @@ const { writeZip, zipFile } = require('./zipTree');
 
 BbPromise.promisifyAll(fse);
 
+/**
+ * Inject requirements into JSZip object
+ * @param {JSZip} zip js
+ * @param {string} requirementsPath requirements folder path
+ * @param {Object} options our options object
+ * @return {Promise} the JSZip object constructed.
+ */
+function injectRequirementsToZip(zip, requirementsPath, options) {
+  const noDeploy = new Set(options.noDeploy || []);
+  const runtimePath = 'python';
+
+  return BbPromise.resolve(
+    glob.sync([path.join(requirementsPath, '**')], {
+      mark: true,
+      dot: true
+    })
+  )
+    .map(file => [file, path.relative(requirementsPath, file)])
+    .filter(
+      ([file, relativeFile]) =>
+        !file.endsWith('/') &&
+        !relativeFile.match(/^__pycache__[\\/]/) &&
+        !noDeploy.has(relativeFile.split(/([-\\/]|\.py$|\.pyc$)/, 1)[0])
+    )
+    .map(([file, relativeFile]) =>
+      Promise.all([
+        file,
+        options.layer ? path.join(runtimePath, relativeFile) : relativeFile,
+        fse.statAsync(file)
+      ])
+    )
+    .mapSeries(([file, relativeFile, fileStat]) =>
+      zipFile(zip, relativeFile, fse.readFileAsync(file), {
+        unixPermissions: fileStat.mode,
+        createFolders: false
+      })
+    )
+    .then(() => zip);
+}
+
 /**
  * Inject requirements into packaged application.
  * @param {string} requirementsPath requirements folder path
@@ -17,36 +57,11 @@ BbPromise.promisifyAll(fse);
  * @return {Promise} the JSZip object constructed.
  */
 function injectRequirements(requirementsPath, packagePath, options) {
-  const noDeploy = new Set(options.noDeploy || []);
-
   return fse
     .readFileAsync(packagePath)
     .then(buffer => JSZip.loadAsync(buffer))
-    .then(zip =>
-      BbPromise.resolve(
-        glob.sync([path.join(requirementsPath, '**')], {
-          mark: true,
-          dot: true
-        })
-      )
-        .map(file => [file, path.relative(requirementsPath, file)])
-        .filter(
-          ([file, relativeFile]) =>
-            !file.endsWith('/') &&
-            !relativeFile.match(/^__pycache__[\\/]/) &&
-            !noDeploy.has(relativeFile.split(/([-\\/]|\.py$|\.pyc$)/, 1)[0])
-        )
-        .map(([file, relativeFile]) =>
-          Promise.all([file, relativeFile, fse.statAsync(file)])
-        )
-        .mapSeries(([file, relativeFile, fileStat]) =>
-          zipFile(zip, relativeFile, fse.readFileAsync(file), {
-            unixPermissions: fileStat.mode,
-            createFolders: false
-          })
-        )
-        .then(() => writeZip(zip, packagePath))
-    );
+    .then(zip => injectRequirementsToZip(zip, requirementsPath, options))
+    .then(zip => writeZip(zip, packagePath));
 }
 
 /**
@@ -140,4 +155,7 @@ function injectAllRequirements(funcArtifact) {
   }
 }
 
-module.exports = { injectAllRequirements };
+module.exports = {
+  injectAllRequirements,
+  injectRequirementsToZip
+};

lib/layer.js

@@ -2,7 +2,8 @@ const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const path = require('path');
 const JSZip = require('jszip');
-const { writeZip, addTree } = require('./zipTree');
+const { writeZip } = require('./zipTree');
+const { injectRequirementsToZip } = require('./inject');
 
 BbPromise.promisifyAll(fse);
 
@@ -13,10 +14,9 @@ BbPromise.promisifyAll(fse);
 function zipRequirements() {
   const rootZip = new JSZip();
   const src = path.join('.serverless', 'requirements');
-  const runtimepath = 'python';
 
-  return addTree(rootZip.folder(runtimepath), src).then(() =>
-    writeZip(rootZip, path.join('.serverless', 'pythonRequirements.zip'))
+  return injectRequirementsToZip(rootZip, src, this.options).then(zip =>
+    writeZip(zip, path.join('.serverless', 'pythonRequirements.zip'))
   );
 }