Merge branch 'main' into ATO-807

govuk-one-login · Aug 8, 2024 · aac7fc8 · aac7fc8
2 parents 127fb0e + e7bedb9
commit aac7fc8
Show file tree

Hide file tree

Showing 10 changed files with 303 additions and 161 deletions.
diff --git a/backend/api/api.template.yml b/backend/api/api.template.yml
@@ -104,8 +104,8 @@ Conditions:
 
 Globals:
   Function:
-    Timeout: 10
-    Runtime: nodejs20.x
+    Timeout: 15
+    Runtime: nodejs18.x
     PermissionsBoundary: !If [ UsePermissionsBoundary, !Ref PermissionsBoundary, !Ref AWS::NoValue ]
     VpcConfig:
       SecurityGroupIds: [ !ImportValue VPC-VPCEndpointsSecurityGroup ]

diff --git a/backend/api/src/handlers/step-functions/new-client.ts b/backend/api/src/handlers/step-functions/new-client.ts
@@ -2,6 +2,5 @@ import {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from "aws-lambda";
 import {stepFunctionHandler} from "./step-function-handler";
 
 export const newClientHandler = async (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> => {
-    console.info("In newClientHandler() callback from step function. Context (" + JSON.stringify(context) + ")");
-    return stepFunctionHandler(event);
+    return stepFunctionHandler(event, context);
 };
diff --git a/backend/api/src/handlers/step-functions/new-service.ts b/backend/api/src/handlers/step-functions/new-service.ts
@@ -2,6 +2,5 @@ import {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from "aws-lambda";
 import {stepFunctionHandler} from "./step-function-handler";
 
 export const newServiceHandler = async (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> => {
-    console.info("In newServiceHandler() callback from step function. Context (" + JSON.stringify(context) + ")");
-    return stepFunctionHandler(event);
+    return stepFunctionHandler(event, context);
 };
diff --git a/backend/api/src/handlers/step-functions/step-function-handler.ts b/backend/api/src/handlers/step-functions/step-function-handler.ts
@@ -1,10 +1,18 @@
 import {SFNClient, StartSyncExecutionCommand, SyncExecutionStatus} from "@aws-sdk/client-sfn";
-import {APIGatewayProxyEvent, APIGatewayProxyResult} from "aws-lambda";
+import {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from "aws-lambda";
 import * as process from "process";
+import {Logger} from "@aws-lambda-powertools/logger";
+
+export const logger = new Logger({
+    serviceName: "self-service-experience"
+});
 
 const stepFunctionsClient = new SFNClient({region: "eu-west-2"});
 
-export const stepFunctionHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
+export const stepFunctionHandler = async (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> => {
+    logger.addContext(context);
+    logger.info("Starting step function.");
+
     const payload = event?.body ? JSON.parse(event.body as string) : event;
     const stateMachineArn = process.env.STATE_MACHINE_ARN as string;
     const input = JSON.stringify(payload);
@@ -23,11 +31,11 @@ export const stepFunctionHandler = async (event: APIGatewayProxyEvent): Promise<
     } else if (result.status == SyncExecutionStatus.TIMED_OUT) {
         statusCode = 408;
         resultBody = "Function timed out";
-        console.error(resultBody);
+        logger.error(resultBody);
     } else {
         statusCode = 400;
         resultBody = "Function returned error: " + result.error + ", cause: " + result.cause;
-        console.error(resultBody);
+        logger.error(resultBody);
     }
 
     return {statusCode: statusCode, body: resultBody};

diff --git a/backend/api/src/handlers/step-functions/update-client.ts b/backend/api/src/handlers/step-functions/update-client.ts
@@ -2,6 +2,5 @@ import {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from "aws-lambda";
 import {stepFunctionHandler} from "./step-function-handler";
 
 export const doUpdateClientHandler = async (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> => {
-    console.info("In doUpdateClientHandler() callback from step function. Context (" + JSON.stringify(context) + ")");
-    return stepFunctionHandler(event);
+    return stepFunctionHandler(event, context);
 };
diff --git a/backend/api/src/handlers/step-functions/update-service.ts b/backend/api/src/handlers/step-functions/update-service.ts
@@ -2,6 +2,5 @@ import {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from "aws-lambda";
 import {stepFunctionHandler} from "./step-function-handler";
 
 export const doUpdateServiceHandler = async (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> => {
-    console.info("In doUpdateServiceHandler() callback from step function. Context (" + JSON.stringify(context) + ")");
-    return stepFunctionHandler(event);
+    return stepFunctionHandler(event, context);
 };