Add custom templates support

Author: hubertpompecki

lib/deploy/events/apiGateway/methods.js

@@ -109,32 +109,33 @@ module.exports = {
   },
 
   getIntegrationRequestTemplates(stateMachineName, customName, http) {
+    const defaultRequestTemplates = this.getDefaultRequestTemplates(stateMachineName, customName);
+    return Object.assign(
+      defaultRequestTemplates,
+      _.get(http, ['request', 'template'])
+     );
+  },
+
+  getDefaultRequestTemplates(stateMachineName, customName) {
     const stateMachineLogicalId = this.getStateMachineLogicalId(stateMachineName, customName);
     return {
-      'application/json': {
-        'Fn::Join': [
-          '', [
-            "#set( $body = $util.escapeJavaScript($input.json('$')) ) \n\n",
-            '{"input": "$body","name": "$context.requestId","stateMachineArn":"',
-            {
-              Ref: `${stateMachineLogicalId}`,
-            },
-            '"}',
-          ],
-        ],
-      },
-      'application/x-www-form-urlencoded': {
-        'Fn::Join': [
-          '', [
-            "#set( $body = $util.escapeJavaScript($input.json('$')) ) \n\n",
-            '{"input": "$body","name": "$context.requestId","stateMachineArn":"',
-            {
-              Ref: `${stateMachineLogicalId}`,
-            },
-            '"}',
-          ],
+      'application/json': this.buildDefaultRequestTemplate(stateMachineLogicalId),
+      'application/x-www-form-urlencoded': this.buildDefaultRequestTemplate(stateMachineLogicalId)
+    }
+  },
+
+  buildDefaultRequestTemplate(stateMachineLogicalId) {
+    return {
+      'Fn::Join': [
+        '', [
+          "#set( $body = $util.escapeJavaScript($input.json('$')) ) \n\n",
+          '{"input": "$body","name": "$context.requestId","stateMachineArn":"',
+          {
+            Ref: `${stateMachineLogicalId}`,
+          },
+          '"}',
         ],
-      },
+      ],
     }
   },
 

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

@@ -82,6 +82,7 @@ describe('#methods()', () => {
         .to.have.property('Integration');
     });
 
+    // Remove these 2 specs
     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)
@@ -115,6 +116,81 @@ describe('#methods()', () => {
     });
   });
 
+  describe('#getIntegrationRequestTemplates()', () => {
+    it('should set stateMachinelogical ID in default templates when customName is not set', () => {
+      expect(serverlessStepFunctions.getIntegrationRequestTemplates('stateMachine')
+        ['application/json']['Fn::Join'][1][2].Ref)
+        .to.be.equal('StateMachineStepFunctionsStateMachine');
+    });
+
+    it('should set custom stateMachinelogical ID in default templates when customName is set',
+    () => {
+      expect(serverlessStepFunctions.getIntegrationRequestTemplates('stateMachine', 'custom')
+        ['application/json']['Fn::Join'][1][2].Ref)
+        .to.be.equal('Custom');
+    });
+
+    it('should return the default template for application/json when one is not given', () => {
+      const http_without_request_template = {
+        path: 'foo/bar1',
+        method: 'post',
+        request: {
+          template: {
+            'application/x-www-form-urlencoded': 'custom template'
+          }
+        }
+      }
+      expect(serverlessStepFunctions.getMethodIntegration('stateMachine', undefined, http_without_request_template)
+        .Properties.Integration.RequestTemplates['application/json']['Fn::Join'][1][2].Ref)
+        .to.be.equal('StateMachineStepFunctionsStateMachine');
+    });
+
+    it('should return a custom template for application/json when one is given', () => {
+      const http_with_request_template = {
+        path: 'foo/bar1',
+        method: 'post',
+        request: {
+          template: {
+            'application/json': 'custom template'
+          }
+        }
+      }
+      expect(serverlessStepFunctions.getMethodIntegration('stateMachine', undefined, http_with_request_template)
+        .Properties.Integration.RequestTemplates['application/json'])
+        .to.be.equal('custom template');
+    });
+
+    it('should return the default template for application/x-www-form-urlencoded when one is not given', () => {
+      const http_without_request_template = {
+        path: 'foo/bar1',
+        method: 'post',
+        request: {
+          template: {
+            'application/json': 'custom template'
+          }
+        }
+      }
+      expect(serverlessStepFunctions.getMethodIntegration('stateMachine', undefined, http_without_request_template)
+        .Properties.Integration.RequestTemplates['application/x-www-form-urlencoded']['Fn::Join'][1][2].Ref)
+        .to.be.equal('StateMachineStepFunctionsStateMachine');
+    });
+
+    it('should return a custom template for application/x-www-form-urlencoded when one is given', () => {
+      const http_with_request_template = {
+        path: 'foo/bar1',
+        method: 'post',
+        request: {
+          template: {
+            'application/x-www-form-urlencoded': 'custom template'
+          }
+        }
+      }
+      expect(serverlessStepFunctions.getMethodIntegration('stateMachine', undefined, http_with_request_template)
+        .Properties.Integration.RequestTemplates['application/x-www-form-urlencoded'])
+        .to.be.equal('custom template');
+    });
+  });
+
   describe('#getMethodResponses()', () => {
     it('should return a corresponding methodResponses resource', () => {
       expect(serverlessStepFunctions.getMethodResponses().Properties)