wip support for albs #80

Author: jeremydaly

test/requests.js

@@ -25,10 +25,13 @@ describe('Request Tests:', function() {
   describe('API Gateway Proxy Event', function() {
     it('Standard event', async function() {
       let _event = require('./sample-event-apigateway1.json')
-      let result = await new Promise(r => api.run(_event,{},(e,res) => { r(res) }))
+      let _context = require('./sample-context-apigateway1.json')
+      let result = await new Promise(r => api.run(_event,_context,(e,res) => { r(res) }))
       let body = JSON.parse(result.body)
+      // console.log(body);
       expect(result.headers).to.deep.equal({ 'content-type': 'application/json' })
       expect(body).to.have.property('request')
+      expect(body.request.id).is.not.null
       expect(body.request.userAgent).to.equal('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36 OPR/39.0.2256.48')
       expect(body.request).to.have.property('requestContext')
       expect(body.request.ip).to.equal('192.168.100.1')
@@ -42,16 +45,17 @@ describe('Request Tests:', function() {
       expect(body.request.query.qs2).to.equal('bar')
       expect(body.request.multiValueQuery.qs2).to.deep.equal(['foo','bar'])
       expect(body.request.multiValueQuery.qs3).to.deep.equal(['bat','baz'])
-
     })
 
     it('Missing X-Forwarded-For (sourceIp fallback)', async function() {
       let _event = require('./sample-event-apigateway1.json')
+      let _context = require('./sample-context-apigateway1.json')
       delete _event.headers['X-Forwarded-For'] // remove the header
-      let result = await new Promise(r => api.run(_event,{},(e,res) => { r(res) }))
+      let result = await new Promise(r => api.run(_event,_context,(e,res) => { r(res) }))
       let body = JSON.parse(result.body)
       expect(result.headers).to.deep.equal({ 'content-type': 'application/json' })
       expect(body).to.have.property('request')
+      expect(body.request.id).is.not.null
       expect(body.request.userAgent).to.equal('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36 OPR/39.0.2256.48')
       expect(body.request).to.have.property('requestContext')
       expect(body.request.ip).to.equal('192.168.100.12')
@@ -69,4 +73,30 @@ describe('Request Tests:', function() {
     })
   })
 
+  describe('ALB Event', function() {
+    it('Standard event', async function() {
+      let _event = require('./sample-event-alb1.json')
+      let _context = require('./sample-context-alb1.json')
+      let result = await new Promise(r => api.run(_event,_context,(e,res) => { r(res) }))
+      let body = JSON.parse(result.body)
+      //console.log(body);
+      expect(result.headers).to.deep.equal({ 'content-type': 'application/json' })
+      expect(body).to.have.property('request')
+      expect(body.request.id).is.not.null
+      expect(body.request.userAgent).to.equal('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36 OPR/39.0.2256.48')
+      expect(body.request).to.have.property('requestContext')
+      expect(body.request.ip).to.equal('192.168.100.1')
+      expect(body.request.isBase64Encoded).to.equal(true)
+      expect(body.request.clientType).to.equal('unknown')
+      expect(body.request.clientCountry).to.equal('unknown')
+      expect(body.request.route).to.equal('/test/hello')
+      expect(body.request.query.qs1).to.equal('foo')
+      // expect(body.request.query.qs2).to.equal('bar')
+      // expect(body.request.multiValueQuery.qs2).to.deep.equal(['foo','bar'])
+      // expect(body.request.multiValueQuery.qs3).to.deep.equal(['bat','baz'])
+
+    })
+
+  })
+
 }) // end Request tests

test/sample-context-alb1.json

@@ -0,0 +1,11 @@
+{
+  "callbackWaitsForEmptyEventLoop": true,
+  "logGroupName": "/aws/lambda/test-alb",
+  "logStreamName": "2018/12/22/[$LATEST]21a094d27de15adeaceaf073140d5aca",
+  "functionName": "test-alb",
+  "memoryLimitInMB": "1024",
+  "functionVersion": "$LATEST",
+  "invokeid": "59327015-07f1-11e9-a63e-9f9eb869059e",
+  "awsRequestId": "59327015-07f1-11e9-a63e-9f9eb869059e",
+  "invokedFunctionArn": "arn:aws:lambda:us-east-1:XXXXXXXXXX:function:test-alb"
+}

test/sample-context-apigateway1.json

@@ -0,0 +1,11 @@
+{
+  "callbackWaitsForEmptyEventLoop": false,
+  "logGroupName": "/aws/lambda/test-apigateway",
+  "logStreamName": "2018/12/22/[$LATEST]21a094d27de15adeaceaf073140d5aca",
+  "functionName": "test-alb",
+  "memoryLimitInMB": "1024",
+  "functionVersion": "$LATEST",
+  "invokeid": "59327015-07f1-11e9-a63e-9f9eb869059e",
+  "awsRequestId": "59327015-07f1-11e9-a63e-9f9eb869059e",
+  "invokedFunctionArn": "arn:aws:lambda:us-east-1:XXXXXXXXXX:function:test-apigateway"
+}

test/sample-event-alb1.json

@@ -0,0 +1,26 @@
+{
+  "requestContext": {
+    "elb": {
+      "targetGroupArn": "arn:aws:elasticloadbalancing:us-east-1:XXXXXXXXXX:targetgroup/Test-ALB-Lambda/XXXXXXX"
+    }
+  },
+  "httpMethod": "GET",
+  "path": "/test/hello",
+  "queryStringParameters": {
+    "qs1": "foo"
+  },
+  "headers": {
+    "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+    "accept-encoding": "br, gzip, deflate",
+    "accept-language": "en-us",
+    "cookie": "",
+    "host": "wt6mne2s9k.execute-api.us-west-2.amazonaws.com",
+    "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36 OPR/39.0.2256.48",
+    "x-amzn-trace-id": "Root=1-5c1db69f-XXXXXXXXXXX",
+    "x-forwarded-for": "192.168.100.1",
+    "x-forwarded-port": "443",
+    "x-forwarded-proto": "https"
+  },
+  "body": "",
+  "isBase64Encoded": true
+}