fix(Packaging): Ensure support for package.patterns

BREAKING CHANGE: Plugin now relies on `package.patterns` which was introduced
with Serverless Framework `v2.32.0`

Author: pgrzesik

lib/zip.js

@@ -18,13 +18,14 @@ function addVendorHelper() {
     if (this.serverless.service.package.individually) {
       return BbPromise.resolve(this.targetFuncs)
         .map((f) => {
-          if (!get(f, 'package.include')) {
-            set(f, ['package', 'include'], []);
+          if (!get(f, 'package.patterns')) {
+            set(f, ['package', 'patterns'], []);
           }
           if (!get(f, 'module')) {
             set(f, ['module'], '.');
           }
-          f.package.include.push('unzip_requirements.py');
+
+          f.package.patterns.push('unzip_requirements.py');
           return f;
         })
         .then((functions) => uniqBy(functions, (func) => func.module))
@@ -41,11 +42,11 @@ function addVendorHelper() {
     } else {
       this.serverless.cli.log('Adding Python requirements helper...');
 
-      if (!get(this.serverless.service, 'package.include')) {
-        set(this.serverless.service, ['package', 'include'], []);
+      if (!get(this.serverless.service, 'package.patterns')) {
+        set(this.serverless.service, ['package', 'patterns'], []);
       }
 
-      this.serverless.service.package.include.push('unzip_requirements.py');
+      this.serverless.service.package.patterns.push('unzip_requirements.py');
 
       return fse.copyAsync(
         path.resolve(__dirname, '../unzip_requirements.py'),
@@ -106,15 +107,15 @@ function packRequirements() {
           this.serverless.cli.log(
             `Zipping required Python packages for ${f.module}...`
           );
-          f.package.include.push(`${f.module}/.requirements.zip`);
+          f.package.patterns.push(`${f.module}/.requirements.zip`);
           return addTree(
             new JSZip(),
             `.serverless/${f.module}/requirements`
           ).then((zip) => writeZip(zip, `${f.module}/.requirements.zip`));
         });
     } else {
       this.serverless.cli.log('Zipping required Python packages...');
-      this.serverless.service.package.include.push('.requirements.zip');
+      this.serverless.service.package.patterns.push('.requirements.zip');
       return addTree(new JSZip(), '.serverless/requirements').then((zip) =>
         writeZip(zip, path.join(this.servicePath, '.requirements.zip'))
       );

package.json

@@ -68,7 +68,7 @@
     "shell-quote": "^1.7.2"
   },
   "peerDependencies": {
-    "serverless": "^1.34 || 2"
+    "serverless": "^2.32"
   },
   "eslintConfig": {
     "extends": "eslint:recommended",

tests/base/serverless.yml

@@ -30,9 +30,8 @@ custom:
 
 package:
   individually: ${opt:individually, self:custom.defaults.individually}
-  exclude:
-    - '**/*'
-  include:
+  patterns:
+    - '!**/*'
     - 'handler.py'
 
 functions:
@@ -47,7 +46,7 @@ functions:
     handler: fn2_handler.hello
     module: fn2
     package:
-      include:
+      patterns:
         - 'fn2/**'
   hello5:
     image: 000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38

tests/individually/serverless.yml

@@ -6,8 +6,8 @@ provider:
 
 package:
   individually: true
-  exclude:
-    - 'node_modules/**'
+  patterns:
+    - '!node_modules/**'
 custom:
   pythonRequirements:
     dockerizePip: ${opt:dockerizePip, self:custom.defaults.dockerizePip}

tests/non_build_pyproject/serverless.yml

@@ -11,10 +11,9 @@ custom:
     usePoetry: false
 
 package:
-  exclude:
-    - '**/*'
-  include:
-    - handler.py
+  patterns:
+    - '!**/*'
+    - 'handler.py'
 
 functions:
   hello:

tests/non_poetry_pyproject/serverless.yml

@@ -8,10 +8,9 @@ plugins:
   - serverless-python-requirements
 
 package:
-  exclude:
-    - '**/*'
-  include:
-    - handler.py
+  patterns:
+    - '!**/*'
+    - 'handler.py'
 
 functions:
   hello:

tests/pipenv/serverless.yml

@@ -21,10 +21,9 @@ custom:
     dockerizePip: false
 
 package:
-  exclude:
-    - '**/*'
-  include:
-    - handler.py
+  patterns:
+    - '!**/*'
+    - 'handler.py'
 
 functions:
   hello:

tests/poetry/serverless.yml

@@ -21,10 +21,9 @@ custom:
     dockerizePip: false
 
 package:
-  exclude:
-    - '**/*'
-  include:
-    - handler.py
+  patterns:
+    - '!**/*'
+    - 'handler.py'
 
 functions:
   hello: