return the Lambda request ID instead of DDB request ID

ServerlessOpsIO · Oct 22, 2024 · 029399c · 029399c
1 parent 5550c0c
commit 029399c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/src/handlers/CreateEntity/function.ts b/src/handlers/CreateEntity/function.ts
@@ -10,7 +10,6 @@ import {
     DynamoDBClient,
     PutItemCommand,
     PutItemCommandInput,
-    PutItemCommandOutput,
     DynamoDBServiceException
 } from '@aws-sdk/client-dynamodb'
 import {
@@ -32,8 +31,7 @@ interface Item extends Entity {
     itemType: string
 }
 
-export async function putEntity(entity: Entity): Promise<PutItemCommandOutput> {
-    let output: PutItemCommandOutput
+export async function putEntity(entity: Entity): Promise<void> {
 
     const namespace = entity.metadata.namespace
     const kind = entity.kind.toLowerCase()
@@ -54,7 +52,7 @@ export async function putEntity(entity: Entity): Promise<PutItemCommandOutput> {
 
     try {
         const command = new PutItemCommand(params)
-        output = await DDB_CLIENT.send(command)
+        const output = await DDB_CLIENT.send(command)
         LOGGER.debug('PutItemCommand succeeded', { output })
     } catch (error) {
         LOGGER.error({
@@ -64,13 +62,12 @@ export async function putEntity(entity: Entity): Promise<PutItemCommandOutput> {
         })
         throw error
     }
-
-    return output
 }
 
 
-export async function handler (event: APIGatewayProxyEvent, _: Context): Promise<APIGatewayProxyResult> {
+export async function handler (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> {
     LOGGER.debug('Received event', { event })
+    const event_id = context.awsRequestId
 
     const entity: Entity = JSON.parse(event.body || '{}')   // Already validated body at Gateway
 
@@ -79,7 +76,7 @@ export async function handler (event: APIGatewayProxyEvent, _: Context): Promise
     try {
         const output = await putEntity(entity)
         statusCode = 201
-        body = JSON.stringify({'request_id': output.$metadata.requestId})
+        body = JSON.stringify({'request_id': event_id})
     } catch (error) {
         LOGGER.error("Operation failed", { event })
         const fault = (<DynamoDBServiceException>error).$fault
@@ -97,7 +94,6 @@ export async function handler (event: APIGatewayProxyEvent, _: Context): Promise
         })
     }
 
-
     return {
         statusCode,
         body

diff --git a/src/handlers/DeleteEntity/function.ts b/src/handlers/DeleteEntity/function.ts
@@ -10,7 +10,6 @@ import {
     DynamoDBClient,
     DeleteItemCommand,
     DeleteItemCommandInput,
-    DeleteItemCommandOutput,
     DynamoDBServiceException
 } from '@aws-sdk/client-dynamodb'
 
@@ -24,9 +23,7 @@ export async function deleteEntity(
     namespace: string,
     kind: string,
     name: string
-): Promise<DeleteItemCommandOutput> {
-    let output: DeleteItemCommandOutput
-
+): Promise<void> {
     const params: DeleteItemCommandInput = {
         TableName: DDB_TABLE_NAME,
         Key: {
@@ -37,7 +34,7 @@ export async function deleteEntity(
 
     try {
         const command = new DeleteItemCommand(params)
-        output = await DDB_CLIENT.send(command)
+        const output = await DDB_CLIENT.send(command)
         LOGGER.debug('DeleteItemCommand succeeded', { output })
     } catch (error) {
         LOGGER.error({
@@ -47,13 +44,12 @@ export async function deleteEntity(
         })
         throw error
     }
-
-    return output
 }
 
 
-export async function handler (event: APIGatewayProxyEvent, _: Context): Promise<APIGatewayProxyResult> {
+export async function handler (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> {
     LOGGER.debug('Received event', { event })
+    const event_id = context.awsRequestId
 
     const namespace = event.pathParameters?.namespace as string
     const kind = event.pathParameters?.kind as string
@@ -68,7 +64,7 @@ export async function handler (event: APIGatewayProxyEvent, _: Context): Promise
             name
         )
         statusCode = 200
-        body = JSON.stringify({"request_id": output.$metadata.requestId})
+        body = JSON.stringify({"request_id": event_id})
     } catch (error) {
         LOGGER.error("Operation failed", { event })
         const fault = (<DynamoDBServiceException>error).$fault