Merge branch 'multi-version'

.travis.yml

@@ -4,6 +4,19 @@ node_js:
   - "6"
   - "8"
   - "10"
+env:
+  - SERVERLESS_VERSION=latest
+  - SERVERLESS_VERSION=latest~1
+  - SERVERLESS_VERSION=latest~2
+  - SERVERLESS_VERSION=latest~3
+  - SERVERLESS_VERSION=latest~4
+
+before_install:
+  - npm i -g npm@6
+
+install:
+  - travis_retry npm install
+  - npm install --no-save `npx npm-get-version serverless@$SERVERLESS_VERSION`
 
 sudo: false
 

package.json

@@ -40,12 +40,13 @@
   },
   "devDependencies": {
     "@types/chai": "^4.1.3",
-    "@types/lodash": "^4.14.108",
+    "@types/lodash": "^4.14.109",
     "@types/mocha": "^5.2.0",
     "@types/node": "^6.0.110",
     "chai": "^4.1.2",
     "coveralls": "^3.0.1",
-    "mocha": "^5.1.1",
+    "mocha": "^5.2.0",
+    "npm-get-version": "^0.1.0",
     "nyc": "^11.8.0",
     "rimraf": "^2.6.2",
     "serverless": "^1.27.2",

src/lib/index.ts

@@ -23,7 +23,7 @@ class ServerlessIamPerFunctionPlugin {
     this.provider = 'aws';
     this.serverless = serverless;
     this.hooks = {
-      'after:package:compileFunctions': this.createRolesPerFunction.bind(this),
+      'before:package:finalize': this.createRolesPerFunction.bind(this),
     };    
     this.defaultInherit = _.get(this.serverless.service, "custom.serverless-iam-roles-per-function.defaultInherit", false);
   }
@@ -42,8 +42,7 @@ class ServerlessIamPerFunctionPlugin {
       }
     }
     if(!this.awsPackagePlugin) {
-      this.serverless.cli.log(`WARNING: could not find ${awsPackagePluginName} plugin to verify statements.`);
-      return;
+      throw new this.serverless.classes.Error(`ERROR: could not find ${awsPackagePluginName} plugin to verify statements.`);      
     }
     this.awsPackagePlugin.validateStatements(statements);
   } 
@@ -93,7 +92,7 @@ class ServerlessIamPerFunctionPlugin {
    */
   getStreamStatements(functionObject: any) {  
     const res: any[] = [];  
-    if(!functionObject.events) { //no events
+    if(_.isEmpty(functionObject.events)) { //no events
       return res;
     }
     const dynamodbStreamStatement: Statement = {