From f131590aa7f0345f147c3134119b7a44989507f6 Mon Sep 17 00:00:00 2001
From: Mark Sailes <msailes@amazon.co.uk>
Date: Wed, 3 Aug 2022 12:53:34 +0100
Subject: [PATCH] Adding missing attributes to APIGatewayProxyRequestEvent

---
 .../APIGatewayProxyRequestEvent.java          | 26 ++++++++++++++-----
 .../api_gateway_proxy_request_event.json      | 20 +++++++++-----
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java
index 61c3b3c2..4d6dd629 100644
--- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java
@@ -72,23 +72,35 @@ public static class ProxyRequestContext implements Serializable, Cloneable {
 
         private String accountId;
 
-        private String stage;
+        private String apiId;
 
-        private String resourceId;
+        private Map<String, Object> authorizer;
 
-        private String requestId;
+        private String domainName;
 
-        private RequestIdentity identity;
+        private String domainPrefix;
 
-        private String resourcePath;
+        private String extendedRequestId;
 
         private String httpMethod;
 
-        private String apiId;
+        private RequestIdentity identity;
 
         private String path;
 
-        private Map<String, Object> authorizer;
+        private String protocol;
+
+        private String requestId;
+
+        private String requestTime;
+
+        private Long requestTimeEpoch;
+
+        private String resourceId;
+
+        private String resourcePath;
+
+        private String stage;
 
         @Override
         public ProxyRequestContext clone() {
diff --git a/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json b/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json
index d9a26151..c5be58a0 100644
--- a/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json
+++ b/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json
@@ -23,11 +23,12 @@
     "proxy": "hello"
   },
   "requestContext": {
-    "path": "/{proxy+}",
     "accountId": "123456789012",
-    "resourceId": "nl9h80",
-    "stage": "test-invoke-stage",
-    "requestId": "test-invoke-request",
+    "apiId": "id",
+    "domainName": "id.execute-api.us-east-1.amazonaws.com",
+    "domainPrefix": "id",
+    "extendedRequestId": "request-id",
+    "httpMethod": "GET",
     "identity": {
       "cognitoIdentityPoolId": "",
       "accountId": "123456789012",
@@ -42,9 +43,14 @@
       "userAgent": "Apache-HttpClient/4.5.x (Java/1.8.0_131)",
       "user": "AIDAJTIRKKKER4HCKVJZG"
     },
-    "resourcePath": "/{proxy+}",
-    "httpMethod": "POST",
-    "apiId": "r275xc9bmd"
+    "path": "/my/path",
+    "protocol": "HTTP/1.1",
+    "requestId": "id=",
+    "requestTime": "04/Mar/2020:19:15:17 +0000",
+    "requestTimeEpoch": 1583349317135,
+    "resourceId": "123456",
+    "resourcePath": "/my/path",
+    "stage": "$default"
   },
   "resource": "/{proxy+}",
   "httpMethod": "GET",