Rename createLambdaProxyContext to createLambdaProxyEvent

dherault · Jul 6, 2019 · feed4b2 · dherault · Jul 7, 2019 · dnalborczyk
1 parent 9b13f49
commit feed4b2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/src/ApiGateway.js b/src/ApiGateway.js
@@ -9,7 +9,7 @@ const debugLog = require('./debugLog');
 const jsonPath = require('./jsonPath');
 const createLambdaContext = require('./createLambdaContext');
 const createVelocityContext = require('./createVelocityContext');
-const createLambdaProxyContext = require('./createLambdaProxyContext');
+const createLambdaProxyEvent = require('./createLambdaProxyEvent');
 const renderVelocityTemplateObject = require('./renderVelocityTemplateObject');
 const createAuthScheme = require('./createAuthScheme');
 const functionHelper = require('./functionHelper');
@@ -536,7 +536,7 @@ module.exports = class ApiGateway {
             event = request.payload || {};
           }
         } else if (integration === 'lambda-proxy') {
-          event = createLambdaProxyContext(
+          event = createLambdaProxyEvent(
             request,
             this.options,
             this.velocityContextOptions.stageVariables,

diff --git a/...ts__/unit/createLambdaProxyContextTest.js → ...ests__/unit/createLambdaProxyEventTest.js b/...ts__/unit/createLambdaProxyContextTest.js → ...ests__/unit/createLambdaProxyEventTest.js
@@ -1,11 +1,11 @@
 'use strict';
 
 const RequestBuilder = require('../support/RequestBuilder');
-const createLambdaProxyContext = require('../../createLambdaProxyContext');
+const createLambdaProxyEvent = require('../../createLambdaProxyEvent');
 
 const { isArray } = Array;
 
-describe('createLambdaProxyContext', () => {
+describe('createLambdaProxyEvent', () => {
   const expectFixedAttributes = (lambdaProxyContext) => {
     const { requestContext } = lambdaProxyContext;
 
@@ -48,7 +48,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -98,7 +98,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -145,7 +145,7 @@ describe('createLambdaProxyContext', () => {
       const requestBuilder = new RequestBuilder('GET', '/fn1');
       requestBuilder.addHeader('Authorization', token);
       const request = requestBuilder.toObject();
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -162,7 +162,7 @@ describe('createLambdaProxyContext', () => {
       const requestBuilder = new RequestBuilder('GET', '/fn1');
       requestBuilder.addHeader('authorization', token);
       const request = requestBuilder.toObject();
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -179,7 +179,7 @@ describe('createLambdaProxyContext', () => {
       const requestBuilder = new RequestBuilder('GET', '/fn1');
       requestBuilder.addHeader('Authorization', bearerToken);
       const request = requestBuilder.toObject();
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -196,7 +196,7 @@ describe('createLambdaProxyContext', () => {
       const requestBuilder = new RequestBuilder('GET', '/fn1');
       requestBuilder.addHeader('authorization', bearerToken);
       const request = requestBuilder.toObject();
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -218,7 +218,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -253,7 +253,7 @@ describe('createLambdaProxyContext', () => {
       requestBuilder.addHeader('content-type', 'custom/test');
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -270,7 +270,7 @@ describe('createLambdaProxyContext', () => {
       requestBuilder.addHeader('content-type', 'custom/test');
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -287,7 +287,7 @@ describe('createLambdaProxyContext', () => {
       requestBuilder.addHeader('accept', 'custom/test');
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -304,7 +304,7 @@ describe('createLambdaProxyContext', () => {
       requestBuilder.addHeader('Content-Type', 'custom/test');
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -322,7 +322,7 @@ describe('createLambdaProxyContext', () => {
       requestBuilder.addHeader('content-length', '2');
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -345,7 +345,7 @@ describe('createLambdaProxyContext', () => {
 
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -366,7 +366,7 @@ describe('createLambdaProxyContext', () => {
 
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -388,7 +388,7 @@ describe('createLambdaProxyContext', () => {
 
       const request = requestBuilder.toObject();
 
-      const lambdaProxyContext = createLambdaProxyContext(
+      const lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -410,7 +410,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -431,7 +431,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -452,7 +452,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -485,7 +485,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -511,7 +511,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -536,7 +536,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -561,7 +561,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -588,7 +588,7 @@ describe('createLambdaProxyContext', () => {
     let lambdaProxyContext;
 
     beforeEach(() => {
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,
@@ -627,7 +627,7 @@ describe('createLambdaProxyContext', () => {
       process.env.SLS_COGNITO_IDENTITY_ID = 'customCognitoIdentityId';
       process.env.SLS_COGNITO_IDENTITY_POOL_ID = 'customCognitoIdentityPoolId';
 
-      lambdaProxyContext = createLambdaProxyContext(
+      lambdaProxyContext = createLambdaProxyEvent(
         request,
         options,
         stageVariables,

diff --git a/src/createLambdaProxyContext.js → src/createLambdaProxyEvent.js b/src/createLambdaProxyContext.js → src/createLambdaProxyEvent.js
@@ -12,7 +12,7 @@ const {
  Mimicks the request context object
  http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html
  */
-module.exports = function createLambdaProxyContext(
+module.exports = function createLambdaProxyEvent(
   request,
   options,
   stageVariables,

diff --git a/src/renderVelocityTemplateObject.js b/src/renderVelocityTemplateObject.js
@@ -23,7 +23,7 @@ function renderVelocityString(velocityString, context) {
     // Quick args explanation:
     // { escape: false } --> otherwise would escape &, < and > chars with html (&amp;, &lt; and &gt;)
     // render(context, null, true) --> null: no custom macros; true: silent mode, just like APIG
-    new Compile(parse(velocityString), { escape: false }).render(
+    new Compile(parse(velocityString), { escape: true }).render(
       context,
       null,
       true,