fixed bugs when invoking

Author: horike37

lib/index.js

@@ -27,7 +27,6 @@ class ServerlessStepFunctions {
     this.service = this.serverless.service.service;
     this.region = this.provider.getRegion();
     this.stage = this.provider.getStage();
-
     Object.assign(
       this,
       compileStateMachines,
@@ -86,6 +85,7 @@ class ServerlessStepFunctions {
 
     this.hooks = {
       'invoke:stepf:invoke': () => BbPromise.bind(this)
+        .then(this.yamlParse)
         .then(this.invoke),
       'package:initialize': () => BbPromise.bind(this)
         .then(this.yamlParse),

lib/index.test.js

@@ -50,9 +50,13 @@ describe('#index', () => {
     it('should run invoke:stepf:invoke promise chain in order', () => {
       const invokeStub = sinon
         .stub(serverlessStepFunctions, 'invoke').returns(BbPromise.resolve());
+      const yamlParseStub = sinon
+        .stub(serverlessStepFunctions, 'yamlParse').returns(BbPromise.resolve());
       return serverlessStepFunctions.hooks['invoke:stepf:invoke']()
         .then(() => {
           expect(invokeStub.calledOnce).to.be.equal(true);
+          expect(yamlParseStub.calledOnce).to.be.equal(true);
+          serverlessStepFunctions.yamlParse.restore();
           serverlessStepFunctions.invoke.restore();
         });
     });

lib/invoke/invoke.js

@@ -5,8 +5,16 @@ const path = require('path');
 
 module.exports = {
   getStateMachineArn() {
-    const stateMachineOutputKey =
-      this.getStateMachineOutputLogicalId(this.options.name);
+    let stateMachineOutputKey;
+    if (this.serverless.service.stepFunctions.stateMachines[this.options.name].name) {
+      stateMachineOutputKey =
+        this.getStateMachineOutputLogicalId(this.options.name
+          , this.serverless.service.stepFunctions.stateMachines[this.options.name].name);
+    } else {
+      stateMachineOutputKey =
+        this.getStateMachineOutputLogicalId(this.options.name);
+    }
+
     const stackName = this.provider.naming.getStackName(this.options.stage);
 
     return this.provider.request('CloudFormation',

lib/invoke/invoke.test.js

@@ -71,6 +71,48 @@ describe('invoke', () => {
       });
     });
 
+    it('should return arn when correct params given with specifing name statement in serverless.yml'
+    , () => {
+      getStateMachineStub = sinon.stub(serverlessStepFunctions.provider, 'request')
+        .returns(BbPromise.resolve({
+          Stacks: [
+            {
+              Outputs: [
+                {
+                  OutputKey: 'StatemachinenameArn',
+                  OutputValue: 'arn:aws:states:us-east-1:xxxx',
+                  Description: 'Current StateMachine Arn' },
+              ],
+            },
+          ],
+        })
+      );
+
+      serverless.service.stepFunctions = {
+        stateMachines: {
+          myStateMachine: {
+            name: 'statemachinename',
+            definition: 'definition1',
+          },
+        },
+      };
+
+      serverlessStepFunctions.getStateMachineArn()
+      .then(() => {
+        expect(getStateMachineStub.calledOnce).to.be.equal(true);
+        expect(getStateMachineStub.calledWithExactly(
+          'CloudFormation',
+          'describeStacks',
+          { StackName: 'new-service-dev' },
+          serverlessStepFunctions.options.stage,
+          serverlessStepFunctions.options.region
+        )).to.be.equal(true);
+        expect(serverlessStepFunctions.stateMachineArn).to.be
+        .equal('arn:aws:states:us-east-1:xxxx');
+        serverlessStepFunctions.provider.request.restore();
+      });
+    });
+
     it('should throw error if correct params is not given'
     , () => {
       getStateMachineStub = sinon.stub(serverlessStepFunctions.provider, 'request')

lib/yamlParser.js

@@ -23,6 +23,19 @@ module.exports = {
           = serverlessFileParam.stepFunctions
           && serverlessFileParam.stepFunctions.activities
           ? serverlessFileParam.stepFunctions.activities : [];
+
+        if (!this.serverless.pluginManager.cliOptions.stage) {
+          this.serverless.pluginManager.cliOptions.stage = this.options.stage
+            || (this.serverless.service.provider && this.serverless.service.provider.stage)
+            || 'dev';
+        }
+
+        if (!this.serverless.pluginManager.cliOptions.region) {
+          this.serverless.pluginManager.cliOptions.region = this.options.region
+            || (this.serverless.service.provider && this.serverless.service.provider.region)
+            || 'us-east-1';
+        }
+
         this.serverless.variables.populateService(this.serverless.pluginManager.cliOptions);
         return BbPromise.resolve();
       });