Merge pull request #22 from vkkis93/feat/2.1

Feat/2.1

Author: vkkis93

README.md

@@ -7,7 +7,8 @@
 
 
 # serverless-step-functions-offline
-:warning: Version 2.0 with breaking changes see [usage](#usage)  :warning:
+:warning: From v2.1.0 `custom.stepFunctionsOffline` is deprecated :warning:
+
 ## Documentation
 
 - [Install](#install)
@@ -46,7 +47,7 @@ sls step-functions-offline
 
 It should rise an error like that:
 
-> Serverless plugin "serverless-step-functions-offline" initialization errored: Please add ENV_VARIABLES to section "custom"
+> This command requires the --stateMachine option
 
 # Requirements
 This plugin works only with [serverless-step-functions](https://github.com/horike37/serverless-step-functions).
@@ -55,54 +56,6 @@ You must have this plugin installed and correctly specified statemachine definit
 
 Example of statemachine definition you can see [here](https://github.com/horike37/serverless-step-functions#setup).
 
-# Usage
-After all steps are done, need to add to section **custom** in serverless.yml the key **stepFunctionsOffline** with properties *stateName*: name of lambda function.
-
-For example:
-
-```yaml
-service: ServerlessStepPlugin
-frameworkVersion: ">=1.13.0 <2.0.0"
-plugins:
-   - serverless-step-functions-offline
-
-# ...
-
-custom:
-  stepFunctionsOffline:
-    stepOne: firstLambda #(v2.0)
-    # ...
-    # ...
-    stepTwo: secondLambda #(v2.0)
-
-functions:
-    firstLambda:
-        handler: firstLambda/index.handler
-        name: TheFirstLambda
-    secondLambda:
-        handler: secondLambda/index.handler
-        name: TheSecondLambda
-stepFunctions:
-  stateMachines:
-    foo:
-      definition:
-        Comment: "An example of the Amazon States Language using wait states"
-        StartAt: FirstLambda
-        States:
-            FirstLambda:
-              Type: Task
-              Resource: arn:aws:lambda:eu-west-1:123456789:function:TheFirstLambda
-              Next: SecondLambda
-            SecondLambda:
-              Type: Task
-              Resource: arn:aws:lambda:eu-west-1:123456789:function:TheSecondLambda
-              End: true
-```
-
-Where:
-- `StepOne` is the name of step in state machine
-- `firstLambda` is the name of function in section **functions**
-
 # Run Plugin
 ```bash
 sls step-functions-offline --stateMachine={{name}} --event={{path to event file}}

build.js

@@ -6,7 +6,6 @@ const Promise = require('bluebird');
 const enumList = require('./enum');
 
 module.exports = {
-
     // findFunctionsPathAndHandler() {
     //     for (const functionName in this.variables) {
     //         const functionHandler = this.variables[functionName];
@@ -77,28 +76,21 @@ module.exports = {
             return;
         }// end of states
         this.executionLog(`~~~~~~~~~~~~~~~~~~~~~~~~~~~ ${this.currentStateName} started ~~~~~~~~~~~~~~~~~~~~~~~~~~~`);
-        const promis = f(event, this.contextObject, this.contextObject.done);
-
-        if (promis && promis.then) {
-            promis.then((data) => {
-                this.contextObject.done(null, data);
-            }).catch(err => {
-                this.contextObject.done(err);
-            });
+        f(event, this.contextObject, this.contextObject.done);
 
-            return promis;
-        }
     },
 
     _states(currentState, currentStateName) {
         switch (currentState.Type) {
         case 'Task': // just push task to general array
             //before each task restore global default env variables
             process.env = Object.assign({}, this.environmentVariables);
-            let f = this.variables[currentStateName];
-            f = this.functions[f];
+            const functionN = currentState.Resource.split(':');
+            const functionName = functionN[functionN.length - 1];
+            // let f = this.variables[currentStateName];
+            const f = this.functions[functionName];
             if (!f) {
-                this.cliLog(`Function "${currentStateName}" does not presented in serverless.yml`);
+                this.cliLog(`Function "${functionName}" does not presented in serverless.yml`);
                 process.exit(1);
             }
             const {handler, filePath} = this._findFunctionPathAndHandler(f.handler);

index.js

@@ -66,7 +66,6 @@ class StepFunctionsOfflinePlugin {
 
         this._getLocation();
         this._checkVersion();
-        this._checkVariableInYML();
     }
 
     _getLocation() {
@@ -85,13 +84,6 @@ class StepFunctionsOfflinePlugin {
         }
     }
 
-    _checkVariableInYML() {
-        if (!_.has(this.serverless.service, 'custom.stepFunctionsOffline')) {
-            throw new this.serverless.classes.Error('Please add ENV_VARIABLES to section "custom"');
-        }
-        return;
-    }
-
     isInstalledPluginSLSStepFunctions() {
         const plugins = this.serverless.service.plugins;
         if (plugins.indexOf('serverless-step-functions') < 0) {
@@ -105,7 +97,8 @@ class StepFunctionsOfflinePlugin {
             return this.eventFile = {};
         }
         try {
-            this.eventFile = require(path.join(process.cwd(), this.eventFile));
+            this.eventFile = path.isAbsolute(this.eventFile) ? require(this.eventFile) :
+                require(path.join(process.cwd(), this.eventFile));
         } catch (err) {
             throw err;
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-step-functions-offline",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Serverlesss plugin to support step function offline",
   "main": "index.js",
   "author": "viktor.kis <[email protected]>",
@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "bluebird": "^3.5.1",
-    "lodash": "^4.17.4",
+    "lodash": "4.17.11",
     "moment": "^2.20.1"
   },
   "devDependencies": {
-    "eslint": "^4.16.0",
+    "eslint": "4.17.11",
     "chai": "^4.1.2",
     "mocha": "^5.0.0",
     "nyc": "^11.4.1",