Merge pull request #30 from horike37/fix-fn-sub

Refactor: Use Fn::Sub function instead of Fn::Join

Author: horike37

lib/package/kinesis/compileMethodsToKinesis.js

@@ -54,16 +54,7 @@ module.exports = {
         'Fn::GetAtt': ['ApigatewayToKinesisRole', 'Arn']
       },
       Uri: {
-        'Fn::Join': [
-          '',
-          [
-            'arn:aws:apigateway:',
-            {
-              Ref: 'AWS::Region'
-            },
-            ':kinesis:action/PutRecord'
-          ]
-        ]
+        'Fn::Sub': 'arn:aws:apigateway:${AWS::Region}:kinesis:action/PutRecord'
       },
       PassthroughBehavior: 'NEVER',
       RequestTemplates: this.getKinesisIntegrationRequestTemplates(http)
@@ -147,27 +138,16 @@ module.exports = {
   },
 
   buildDefaultKinesisRequestTemplate(http) {
-    let streamName
-    if (typeof http.streamName == 'object') {
-      streamName = http.streamName
-    } else {
-      streamName = `"${http.streamName}"`
-    }
-
     const objectRequestParam = this.getKinesisObjectRequestParameter(http)
 
     return {
-      'Fn::Join': [
-        '',
-        [
-          '{',
-          '"StreamName": "',
-          streamName,
-          '",',
-          '"Data": "$util.base64Encode($input.body)",',
-          `"PartitionKey": "${objectRequestParam}"`,
-          '}'
-        ]
+      'Fn::Sub': [
+        '{"StreamName":"${StreamName}","Data":"${Data}","PartitionKey":"${PartitionKey}"}',
+        {
+          StreamName: http.streamName,
+          Data: '$util.base64Encode($input.body)',
+          PartitionKey: `${objectRequestParam}`
+        }
       ]
     }
   }