Merge pull request #196 from horike37/feature/lambda_proxy_template_update

fix: address some diffs with lambda_proxy

Author: theburningmonk

lib/deploy/events/apiGateway/methods.js

@@ -6,45 +6,69 @@ const awsArnRegExs = require('../../../utils/arnRegularExpressions');
 
 const LAMBDA_PROXY_REQUEST_TEMPLATE = `
   #define( $loop )
-    {
+  {
     #foreach($key in $map.keySet())
-        #set( $k = $util.escapeJavaScript($key) )
-        #set( $v = $util.escapeJavaScript($map.get($key)).replaceAll("\\\\'", "'") )
-        "$k":
+      #set( $k = $util.escapeJavaScript($key) )
+      #set( $v = $util.escapeJavaScript($map.get($key)).replaceAll("\\\\'", "'") )
+      "$k":
+        #if ("$v" == "")
+          null
+        #else
           "$v"
-          #if( $foreach.hasNext ) , #end
+        #end
+        #if( $foreach.hasNext ) , #end
     #end
-    }
+  }
   #end
   #define( $smInput )
   {
-    "body": $body,
-    "httpMethod": "$context.httpMethod",
-    "path": "$context.path",
     "resource": "$context.resourcePath",
+    "path": "$context.path",
+    "httpMethod": "$context.httpMethod",
     #set( $map = $input.params().header )
     "headers": $loop,
+
+    #if ($input.params().querystring.size() == 0)
+    "queryStringParameters": null,
+    #else
     #set( $map = $input.params().querystring )
     "queryStringParameters": $loop,
+    #end
+
+    #if ($input.params().path.size() == 0)
+    "pathParameters": null,
+    #else
     #set( $map = $input.params().path )
     "pathParameters": $loop,
+    #end
+
+    #if ($stageVariables.size() == 0)
+    "stageVariables": null,
+    #else
+    #set( $map = $stageVariables )
+    "stageVariables": $loop,
+    #end
+
     "requestContext": {
-      "accountId": "\${AccountId}",
       "resourceId": "$context.resourceId",
-      "stage": "$context.stage",
-      "requestId": "$context.requestId",
+      "resourcePath": "$context.resourcePath",
+      "httpMethod": "$context.httpMethod",
+      "extendedRequestId": "$context.extendedRequestId",
       "requestTime": "$context.requestTime",
+      "path": "$context.path",
+      "accountId": "\${AccountId}",
+      "protocol": "$context.protocol",
+      "stage": "$context.stage",
+      "domainPrefix": "$context.domainPrefix",
       "requestTimeEpoch": "$context.requestTimeEpoch",
+      "requestId": "$context.requestId",
       #set( $map = $context.identity )
       "identity": $loop,
-      "path": "$context.path",
-      "resourcePath": "$context.resourcePath",
-      "httpMethod": "$context.httpMethod",
-      "protocol": "$context.protocol",
+      "domainName": "$context.domainName",
       "apiId": "$context.apiId"
     },
-    #set( $map = $stageVariables )
-    "stageVariables": $loop
+    "body": "$util.escapeJavaScript("$body")",
+    "isBase64Encoded": false
   }
   #end
   {
@@ -54,7 +78,7 @@ const LAMBDA_PROXY_REQUEST_TEMPLATE = `
   }`;
 
 const LAMBDA_PROXY_JSON_REQUEST_TEMPLATE = `
-  #set( $body = $input.json('$') )
+  #set( $body = $input.body )
   ${LAMBDA_PROXY_REQUEST_TEMPLATE}`;
 
 const LAMBDA_PROXY_FORM_URL_ENCODED_REQUEST_TEMPLATE = `

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

@@ -239,7 +239,7 @@ describe('#methods()', () => {
         .getMethodIntegration('stateMachine', undefined, httpWithRequestTemplate)
         .Properties.Integration.RequestTemplates;
       expect(requestTemplates['application/json']['Fn::Sub'][0])
-        .to.contain("#set( $body = $input.json('$') )");
+        .to.contain('#set( $body = $input.body )');
       expect(requestTemplates['application/json']['Fn::Sub'][1])
         .to.be.deep.equal({
           StateMachineArn: { Ref: 'StateMachineStepFunctionsStateMachine' },