Merge branch 'master' into patch-1

Author: bsamuel-ui

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: eslint
+    versions:
+    - "> 7.22.0"

.github/workflows/lint.yml

@@ -4,19 +4,14 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        node-version: [12]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up Node ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 14
 
       - name: Install deps
         run: npm install

.github/workflows/publish.yml

@@ -6,11 +6,13 @@ jobs:
   publish-npm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
         with:
-          version: 12
+          version: 14
           registry-url: https://registry.npmjs.org/
+
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/test.yml

@@ -9,8 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        python-version: [3.6, 2.7]
-        node-version: [12]
+        python-version: [2.7, 3.6]
     steps:
       - uses: actions/checkout@v2
 
@@ -19,10 +18,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Set up Node ${{ matrix.node-version }}
+      - name: Set up Node
         uses: actions/setup-node@v1
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 14
 
       - name: Check python version
         run: |

.gitignore

@@ -45,3 +45,4 @@ __pycache__
 
 #NODE STUFF
 package-lock.json
+yarn.lock

.tool-versions

@@ -105,7 +105,7 @@ custom:
 ## :sparkles::pencil::sparkles: Poetry support
 
 If you include a `pyproject.toml` and have `poetry` installed instead of a `requirements.txt` this will use
-`poetry export --without-hashes -f requirements.txt -o requirements.txt` to generate them. It is fully compatible with all options such as `zip` and
+`poetry export --without-hashes -f requirements.txt -o requirements.txt --with-credentials` to generate them. It is fully compatible with all options such as `zip` and
 `dockerizePip`. If you don't want this plugin to generate it for you, set the following option:
 
 ```yaml

README.md

@@ -151,6 +151,19 @@ class ServerlessPythonRequirements {
         .then(cleanup)
         .then(removeVendorHelper);
 
+    const setupArtifactPathCapturing = () => {
+      // Reference:
+      // https://github.com/serverless/serverless/blob/9591d5a232c641155613d23b0f88ca05ea51b436/lib/plugins/package/lib/packageService.js#L139
+      // The packageService#packageFunction does set artifact path back to the function config.
+      // As long as the function config's "package" attribute wasn't undefined, we can still use it
+      // later to access the artifact path.
+      for (const functionName in this.serverless.service.functions) {
+        if (!serverless.service.functions[functionName].package) {
+          serverless.service.functions[functionName].package = {};
+        }
+      }
+    };
+
     const before = () => {
       if (!isFunctionRuntimePython(arguments)) {
         return;
@@ -160,7 +173,8 @@ class ServerlessPythonRequirements {
         .then(pyprojectTomlToRequirements)
         .then(addVendorHelper)
         .then(installAllRequirements)
-        .then(packRequirements);
+        .then(packRequirements)
+        .then(setupArtifactPathCapturing);
     };
 
     const after = () => {

index.js

@@ -14,7 +14,7 @@ function cleanup() {
   const artifacts = ['.requirements'];
   if (this.options.zip) {
     if (this.serverless.service.package.individually) {
-      this.targetFuncs.forEach(f => {
+      this.targetFuncs.forEach((f) => {
         artifacts.push(path.join(f.module, '.requirements.zip'));
         artifacts.push(path.join(f.module, 'unzip_requirements.py'));
       });
@@ -25,7 +25,7 @@ function cleanup() {
   }
 
   return BbPromise.all(
-    artifacts.map(artifact =>
+    artifacts.map((artifact) =>
       fse.removeAsync(path.join(this.servicePath, artifact))
     )
   );
@@ -47,7 +47,7 @@ function cleanupCache() {
     const promises = [];
     glob
       .sync([path.join(cacheLocation, '*slspyc/')], { mark: true, dot: false })
-      .forEach(file => {
+      .forEach((file) => {
         promises.push(fse.removeAsync(file));
       });
     return BbPromise.all(promises);

lib/clean.js

@@ -81,7 +81,7 @@ function tryBindPath(serverless, bindPath, testFile) {
     `${bindPath}:/test`,
     'alpine',
     'ls',
-    `/test/${testFile}`
+    `/test/${testFile}`,
   ];
   try {
     if (debug) serverless.cli.log(`Trying bindPath ${bindPath} (${options})`);
@@ -167,7 +167,7 @@ function getDockerUid(bindPath) {
     'stat',
     '-c',
     '%u',
-    '/bin/sh'
+    '/bin/sh',
   ];
   const ps = dockerCommand(options);
   return ps.stdout.trim();

lib/docker.js

@@ -21,15 +21,15 @@ function injectRequirements(requirementsPath, packagePath, options) {
 
   return fse
     .readFileAsync(packagePath)
-    .then(buffer => JSZip.loadAsync(buffer))
-    .then(zip =>
+    .then((buffer) => JSZip.loadAsync(buffer))
+    .then((zip) =>
       BbPromise.resolve(
         glob.sync([path.join(requirementsPath, '**')], {
           mark: true,
-          dot: true
+          dot: true,
         })
       )
-        .map(file => [file, path.relative(requirementsPath, file)])
+        .map((file) => [file, path.relative(requirementsPath, file)])
         .filter(
           ([file, relativeFile]) =>
             !file.endsWith('/') &&
@@ -42,7 +42,7 @@ function injectRequirements(requirementsPath, packagePath, options) {
         .mapSeries(([file, relativeFile, fileStat]) =>
           zipFile(zip, relativeFile, fse.readFileAsync(file), {
             unixPermissions: fileStat.mode,
-            createFolders: false
+            createFolders: false,
           })
         )
         .then(() => writeZip(zip, packagePath))
@@ -61,16 +61,16 @@ function moveModuleUp(source, target, module) {
 
   return fse
     .readFileAsync(source)
-    .then(buffer => JSZip.loadAsync(buffer))
-    .then(sourceZip =>
+    .then((buffer) => JSZip.loadAsync(buffer))
+    .then((sourceZip) =>
       sourceZip.filter(
-        file =>
+        (file) =>
           file.startsWith(module + '/') ||
           file.startsWith('serverless_sdk/') ||
           file.match(/^s_.*\.py/) !== null
       )
     )
-    .map(srcZipObj =>
+    .map((srcZipObj) =>
       zipFile(
         targetZip,
         srcZipObj.name.startsWith(module + '/')
@@ -96,18 +96,18 @@ function injectAllRequirements(funcArtifact) {
 
   if (this.serverless.service.package.individually) {
     return BbPromise.resolve(this.targetFuncs)
-      .filter(func =>
+      .filter((func) =>
         (func.runtime || this.serverless.service.provider.runtime).match(
           /^python.*/
         )
       )
-      .map(func => {
+      .map((func) => {
         if (!get(func, 'module')) {
           set(func, ['module'], '.');
         }
         return func;
       })
-      .map(func => {
+      .map((func) => {
         if (func.module !== '.') {
           const artifact = func.package ? func.package.artifact : funcArtifact;
           const newArtifact = path.join(
@@ -122,7 +122,7 @@ function injectAllRequirements(funcArtifact) {
           return func;
         }
       })
-      .map(func => {
+      .map((func) => {
         return this.options.zip
           ? func
           : injectRequirements(

lib/inject.js

@@ -36,7 +36,7 @@ function createLayers() {
       }-${this.serverless.providers.aws.getStage()}-python-requirements`,
       description:
         'Python requirements generated by serverless-python-requirements.',
-      compatibleRuntimes: [this.serverless.service.provider.runtime]
+      compatibleRuntimes: [this.serverless.service.provider.runtime],
     },
     this.options.layer
   );
@@ -55,11 +55,9 @@ function layerRequirements() {
 
   this.serverless.cli.log('Packaging Python Requirements Lambda Layer...');
 
-  return BbPromise.bind(this)
-    .then(zipRequirements)
-    .then(createLayers);
+  return BbPromise.bind(this).then(zipRequirements).then(createLayers);
 }
 
 module.exports = {
-  layerRequirements
+  layerRequirements,
 };