From 54a1fd564fdb07adf0e728742f8cc71c0f132e17 Mon Sep 17 00:00:00 2001
From: TOEL2 <tom.eldridge1@nhs.net>
Date: Fri, 6 Feb 2026 12:03:06 +0000
Subject: [PATCH] (ELI-623) adding logging and auditng to lambda and api
 gateway

---
 .../stacks/api-layer/api_gateway.tf           | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/infrastructure/stacks/api-layer/api_gateway.tf b/infrastructure/stacks/api-layer/api_gateway.tf
index c39cf9f9d..ce56313d1 100644
--- a/infrastructure/stacks/api-layer/api_gateway.tf
+++ b/infrastructure/stacks/api-layer/api_gateway.tf
@@ -56,24 +56,8 @@ resource "aws_api_gateway_stage" "eligibility-signposting-api" {
   # A subscription filter (see csoc_log_forwarding.tf) forwards these logs to CSOC
   access_log_settings {
     destination_arn = module.eligibility_signposting_api_gateway.cloudwatch_destination_arn
-    format          = <<EOF
-                      {
-                        "accountId": "$context.accountId",
-                        "apiId": "$context.apiId",
-                        "api_key": "$context.identity.apiKey",
-                        "caller": "$context.identity.caller",
-                        "httpMethod": "$context.httpMethod",
-                        "ip": "$context.identity.sourceIp",
-                        "protocol": "$context.protocol",
-                        "requestId": "$context.requestId",
-                        "requestTime": "$context.requestTime",
-                        "resourcePath": "$context.resourcePath",
-                        "responseLength": "$context.responseLength",
-                        "stage": "$context.stage",
-                        "status": "$context.status",
-                        "user": "$context.identity.user"
-                      }
-                      EOF
+    format = "{ \"requestId\":\"$context.requestId\", \"ip\": \"$context.identity.sourceIp\", \"caller\":\"$context.identity.caller\", \"user\":\"$context.identity.user\", \"requestTime\":\"$context.requestTime\", \"httpMethod\":\"$context.httpMethod\", \"resourcePath\":\"$context.resourcePath\", \"status\":\"$context.status\", \"protocol\":\"$context.protocol\", \"responseLength\":\"$context.responseLength\", \"accountId\":\"$context.accountId\", \"apiId\":\"$context.apiId\", \"stage\":\"$context.stage\", \"api_key\":\"$context.identity.apiKey\" }"
+
   }
 
   depends_on = [