fixed bug with api gatewayevent when you specify customename

Author: horike37

lib/deploy/events/apiGateway/methods.js

@@ -10,6 +10,7 @@ module.exports = {
     this.pluginhttpValidated.events.forEach((event) => {
       const resourceId = this.getResourceId(event.http.path);
       const resourceName = this.getResourceName(event.http.path);
+      const stateMachineObj = this.getStateMachine(event.stateMachineName);
 
       const template = {
         Type: 'AWS::ApiGateway::Method',
@@ -23,7 +24,7 @@ module.exports = {
       };
 
       _.merge(template,
-        this.getMethodIntegration(event.stateMachineName),
+        this.getMethodIntegration(event.stateMachineName, stateMachineObj.name),
         this.getMethodResponses()
       );
 
@@ -40,8 +41,8 @@ module.exports = {
     return BbPromise.resolve();
   },
 
-  getMethodIntegration(stateMachineName) {
-    const stateMachineLogicalId = this.getStateMachineLogicalId(stateMachineName);
+  getMethodIntegration(stateMachineName, customName) {
+    const stateMachineLogicalId = this.getStateMachineLogicalId(stateMachineName, customName);
     const apiToStepFunctionsIamRoleLogicalId = this.getApiToStepFunctionsIamRoleLogicalId();
     const integration = {
       IntegrationHttpMethod: 'POST',

lib/deploy/events/apiGateway/methods.test.js

@@ -21,6 +21,11 @@ describe('#methods()', () => {
       region: 'us-east-1',
     };
     serverlessStepFunctions = new ServerlessStepFunctions(serverless, options);
+    serverlessStepFunctions.serverless.service.stepFunctions = {
+      stateMachines: {
+        first: {},
+      },
+    };
     serverlessStepFunctions.apiGatewayResourceLogicalIds
       = { 'foo/bar': 'apiGatewayResourceLogicalId' };
     serverlessStepFunctions.apiGatewayResourceNames
@@ -53,6 +58,19 @@ describe('#methods()', () => {
       expect(serverlessStepFunctions.getMethodIntegration('stateMachine').Properties)
         .to.have.property('Integration');
     });
+
+    it('should set stateMachinelogical ID to RequestTemplates when customName is not set', () => {
+      expect(serverlessStepFunctions.getMethodIntegration('stateMachine').Properties
+        .Integration.RequestTemplates['application/json']['Fn::Join'][1][2].Ref)
+        .to.be.equal('StateMachineStepFunctionsStateMachine');
+    });
+
+    it('should set custom stateMachinelogical ID to RequestTemplates when customName is set',
+    () => {
+      expect(serverlessStepFunctions.getMethodIntegration('stateMachine', 'custom').Properties
+        .Integration.RequestTemplates['application/json']['Fn::Join'][1][2].Ref)
+        .to.be.equal('Custom');
+    });
   });
 
   describe('#getMethodResponses()', () => {