Add missing 'apiKeyId' to APIGatewayRequestIdentity (#235)

* Add missing 'apiKeyId' to APIGatewayRequestIdentity

* Update apigw tests with 'apiKeyId'

Author: nhibberd

events/apigw.go

@@ -49,6 +49,7 @@ type APIGatewayRequestIdentity struct {
 	CognitoIdentityID             string `json:"cognitoIdentityId"`
 	Caller                        string `json:"caller"`
 	APIKey                        string `json:"apiKey"`
+	APIKeyID                      string `json:"apiKeyId"`
 	AccessKey                     string `json:"accessKey"`
 	SourceIP                      string `json:"sourceIp"`
 	CognitoAuthenticationType     string `json:"cognitoAuthenticationType"`

events/testdata/apigw-request.json

@@ -1,4 +1,4 @@
-{ 
+{
 	"resource": "/{proxy+}",
 	  "path": "/hello/world",
 	  "httpMethod": "POST",
@@ -67,6 +67,7 @@
 			"cognitoIdentityId": "theCognitoIdentityId",
 			"caller": "theCaller",
             "apiKey": "theApiKey",
+            "apiKeyId": "theApiKeyId",
             "accessKey": "ANEXAMPLEOFACCESSKEY",
 			"sourceIp": "192.168.196.186",
 			"cognitoAuthenticationType": "theCognitoAuthenticationType",
@@ -79,7 +80,7 @@
 			"principalId": "admin",
 			"clientId": 1,
 			"clientName": "Exata"
-		},	
+		},
 		"resourcePath": "/{proxy+}",
 		"httpMethod": "POST",
 		"apiId": "gy415nuibc"

events/testdata/apigw-restapi-openapi-request.json

@@ -68,6 +68,7 @@
       "cognitoIdentityId": "theCognitoIdentityId",
       "caller": "theCaller",
       "apiKey": "theApiKey",
+      "apiKeyId": "theApiKeyId",
       "accessKey": "ANEXAMPLEOFACCESSKEY",
       "sourceIp": "192.168.196.186",
       "cognitoAuthenticationType": "theCognitoAuthenticationType",

events/testdata/apigw-websocket-request.json

@@ -72,6 +72,7 @@
       "cognitoIdentityId": "theCognitoIdentityId",
       "caller": "theCaller",
       "apiKey": "theApiKey",
+      "apiKeyId": "theApiKeyId",
       "accessKey": "ANEXAMPLEOFACCESSKEY",
       "sourceIp": "192.168.196.186",
       "cognitoAuthenticationType": "theCognitoAuthenticationType",