support for HTTP api gateway (#274)

* support for HTTP api gateway

* payload keys and struct rename

* field adds

* APIGatewayV2HTTPRequest struct name update

* de-serialization test case for new v2 http

* log update

* Remove RouteID - it's not present in the payload

* test case update

* Update apigw.go

* Update apigw.go

Had a chat with one of the gateway devs, who pointed out that the shape of Authorizer wouldn't be extensible for future shapes of authorizers

* Update apigw.go

* Update apigw_test.go

* Update apigw-v2-request.json

* Update apigw.go

Co-authored-by: Shashank Sachan <thinkesta@gmail.com>
Co-authored-by: Bryan Moffatt <bmoffatt@users.noreply.github.com>

Author: 3 people

events/apigw.go

@@ -42,6 +42,48 @@ type APIGatewayProxyRequestContext struct {
 	APIID         string                    `json:"apiId"` // The API Gateway rest API Id
 }
 
+// APIGatewayV2HTTPRequest contains data coming from the new HTTP API Gateway
+type APIGatewayV2HTTPRequest struct {
+	Version               string                         `json:"version"`
+	RouteKey              string                         `json:"routeKey"`
+	RawPath               string                         `json:"rawPath"`
+	RawQueryString        string                         `json:"rawQueryString"`
+	Cookies               []string                       `json:"cookies"`
+	Headers               map[string]string              `json:"headers"`
+	QueryStringParameters map[string]string              `json:"queryStringParameters"`
+	PathParameters        map[string]string              `json:"pathParameters"`
+	RequestContext        APIGatewayV2HTTPRequestContext `json:"requestContext"`
+	StageVariables        map[string]string              `json:"stageVariables"`
+	Body                  string                         `json:"body"`
+	IsBase64Encoded       bool                           `json:"isBase64Encoded"`
+}
+
+// APIGatewayV2HTTPRequestContext contains the information to identify the AWS account and resources invoking the Lambda function.
+type APIGatewayV2HTTPRequestContext struct {
+	RouteKey   string `json:"routeKey"`
+	AccountID  string `json:"accountId"`
+	Stage      string `json:"stage"`
+	RequestID  string `json:"requestId"`
+	Authorizer struct {
+		JWT struct {
+			Claims map[string]string `json:"claims"`
+			Scopes []string          `json:"scopes"`
+		} `json:"jwt"`
+	} `json:"authorizer"`
+	APIID        string `json:"apiId"` // The API Gateway HTTP API Id
+	DomainName   string `json:"domainName"`
+	DomainPrefix string `json:"domainPrefix"`
+	Time         string `json:"time"`
+	TimeEpoch    int64  `json:"timeEpoch"`
+	HTTP         struct {
+		Method    string `json:"method"`
+		Path      string `json:"path"`
+		Protocol  string `json:"protocol"`
+		SourceIP  string `json:"sourceIp"`
+		UserAgent string `json:"userAgent"`
+	} `json:"http"`
+}
+
 // APIGatewayRequestIdentity contains identity information for the request caller.
 type APIGatewayRequestIdentity struct {
 	CognitoIdentityPoolID         string `json:"cognitoIdentityPoolId"`

events/apigw_test.go

@@ -209,3 +209,32 @@ func TestApiGatewayRestApiOpenApiRequestMarshaling(t *testing.T) {
 
 	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
+
+func TestApiGatewayV2HTTPRequestMarshaling(t *testing.T) {
+
+	// read json from file
+	inputJSON, err := ioutil.ReadFile("./testdata/apigw-v2-request.json")
+	if err != nil {
+		t.Errorf("could not open test file. details: %v", err)
+	}
+
+	// de-serialize into Go object
+	var inputEvent APIGatewayV2HTTPRequest
+	if err := json.Unmarshal(inputJSON, &inputEvent); err != nil {
+		t.Errorf("could not unmarshal event. details: %v", err)
+	}
+
+	// validate custom authorizer context
+	authContext := inputEvent.RequestContext.Authorizer
+	if authContext.JWT.Claims["claim1"] != "value1" {
+		t.Errorf("could not extract authorizer claim from JWT: %v", authContext)
+	}
+
+	// serialize to json
+	outputJSON, err := json.Marshal(inputEvent)
+	if err != nil {
+		t.Errorf("could not marshal event. details: %v", err)
+	}
+
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
+}

events/testdata/apigw-v2-request.json

@@ -0,0 +1,57 @@
+{
+    "version": "2.0",
+    "routeKey": "$default",
+    "rawPath": "/my/path",
+    "rawQueryString": "parameter1=value1&parameter1=value2&parameter2=value",
+    "cookies": [
+        "cookie1",
+        "cookie2"
+    ],
+    "headers": {
+        "Header1": "value1",
+        "Header2": "value2"
+    },
+    "queryStringParameters": {
+        "parameter1": "value1,value2",
+        "parameter2": "value"
+    },
+    "pathParameters": {
+        "proxy": "hello/world"
+    },
+    "requestContext": {
+        "routeKey": "$default",
+        "accountId": "123456789012",
+        "stage": "$default",
+        "requestId": "id",
+        "authorizer": {
+            "jwt": {
+                "claims": {
+                    "claim1": "value1",
+                    "claim2": "value2"
+                },
+                "scopes": [
+                    "scope1",
+                    "scope2"
+                ]
+            }
+        },
+        "apiId": "api-id",
+        "domainName": "id.execute-api.us-east-1.amazonaws.com",
+        "domainPrefix": "id",
+        "time": "12/Mar/2020:19:03:58+0000",
+        "timeEpoch": 1583348638390,
+        "http": {
+            "method": "GET",
+            "path": "/my/path",
+            "protocol": "HTTP/1.1",
+            "sourceIp": "IP",
+            "userAgent": "agent"
+        }
+    },
+    "stageVariables": {
+        "stageVariable1": "value1",
+        "stageVariable2": "value2"
+    },
+    "body": "{\r\n\t\"a\": 1\r\n}",
+    "isBase64Encoded": false
+}