Merge branch 'master' into package_individually_like_base_sls

Author: bweigel

README.md

@@ -72,6 +72,15 @@ It is important that the host of your private repositories has already been adde
 `$HOME/.ssh/known_hosts` file, as the install process will fail otherwise due to host authenticity
 failure.
 
+You can also pass environment variables to docker by specifying them in `dockerEnv`
+option:
+```yaml
+custom:
+  pythonRequirements:
+    dockerEnv:
+      - https_proxy
+```
+
 [:checkered_flag: Windows notes](#checkered_flag-windows-dockerizepip-notes)
 
 ## Pipenv support :sparkles::cake::sparkles:

index.js

@@ -42,6 +42,7 @@ class ServerlessPythonRequirements {
         dockerSsh: false,
         dockerImage: null,
         dockerFile: null,
+        dockerEnv: false,
         useStaticCache: false,
         useDownloadCache: false,
         cacheLocation: false,

lib/pip.js

@@ -196,6 +196,13 @@ function installRequirements(targetFolder, serverless, options) {
       pipCmd.push('--cache-dir', quote_single(dockerDownloadCacheDir));
     }
 
+    if (options.dockerEnv) {
+      // Add environment variables to docker run cmd
+      options.dockerEnv.forEach(function(item) {
+        cmdOptions.push('-e', item);
+      });
+    }
+
     if (process.platform === 'linux') {
       // Use same user so requirements folder is not root and so --cache-dir works
       var commands = [];

test.js

@@ -36,6 +36,7 @@ const mkCommand = cmd => (args, options = {}) => {
 const sls = mkCommand('sls');
 const git = mkCommand('git');
 const npm = mkCommand('npm');
+const perl = mkCommand('perl');
 
 const setup = () => {
   removeSync(getUserCachePath());
@@ -81,6 +82,12 @@ const getPythonBin = (version = 3) => {
 
 const listZipFiles = filename =>
   Object.keys(deasync(new JSZip().loadAsync(readFileSync(filename))).files);
+const listRequirementsZipFiles = filename => {
+  const zip = deasync(new JSZip().loadAsync(readFileSync(filename)));
+  const reqsBuffer = deasync(zip.file('.requirements.zip').async('nodebuffer'));
+  const reqsZip = deasync(new JSZip().loadAsync(reqsBuffer));
+  return Object.keys(reqsZip.files)
+};
 
 test('default pythonBin can package flask with default options', t => {
   process.chdir('tests/base');
@@ -135,6 +142,7 @@ test('py3.6 can package flask with slim option', t => {
   t.end();
 });
 
+
 test('can package individually without moving modules to root of zip-File', t => {
   process.chdir('tests/base');
   const path = npm(['pack', '../..']);
@@ -150,3 +158,29 @@ test('can package individually without moving modules to root of zip-File', t =>
   t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
   t.end();
 });
+
+/*
+ * News tests not in test.bats
+ */
+
+test("py3.6 doesn't package bottle with zip option", t => {
+  process.chdir('tests/base');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  perl(['-p', "-i'.bak'", '-e', 's/(pythonRequirements:$)/\\1\\n    noDeploy: [bottle]/', 'serverless.yml'])
+  sls([`--pythonBin=${getPythonBin(3)}`, '--zip=true', 'package']);
+  const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
+  const zippedReqs = listRequirementsZipFiles('.serverless/sls-py-req-test.zip');
+  t.true(
+    zipfiles.includes('.requirements.zip'),
+    'zipped requirements are packaged'
+  );
+  t.true(zipfiles.includes(`unzip_requirements.py`), 'unzip util is packaged');
+  t.false(
+    zipfiles.includes(`flask${sep}__init__.py`),
+    "flask isn't packaged on its own"
+  );
+  t.true(zippedReqs.includes(`flask/__init__.py`), 'flask is packaged in the .requirements.zip file');
+  t.false(zippedReqs.includes(`bottle.py`), 'bottle is not packaged in the .requirements.zip file');
+  t.end();
+});