@certenza/aws-cdk-infrastructure-commons 2.4.0 → 2.4.2

package/dist/src/apigateway.d.ts

@@ -31,6 +31,14 @@ declare const createApiGateway: (scope: Construct, apiName: string, domainName:
  * @returns The HTTP API Gateway
  */
 declare const createHttpApiGateway: (scope: Construct, apiName: string, domainName: string, hostedZoneId: string, zoneName: string, defaultAuthorizer?: apigatewayv2.IHttpRouteAuthorizer) => apigatewayv2.HttpApi;
+/**
+ * Creates an HTTP API Gateway Lambda endpoint
+ * @param method - The HTTP method for the endpoint (POST, GET, PUT, DELETE, PATCH, OPTIONS, HEAD)
+ * @param path - The path for the endpoint (e.g., "/messages")
+ * @param lambdaFunction - The Lambda function to integrate
+ * @param api - The HTTP API Gateway to add the endpoint to
+ * @returns The HTTP API Gateway Lambda endpoint
+ */
 declare const createHttpApiGatewayLambdaEndpoint: (method: "POST" | "GET" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD", path: string, lambdaFunction: lambda.IFunction, api: apigatewayv2.HttpApi) => apigatewayv2.IHttpRoute[];
 /**
  * Creates an HTTP API Gateway SQS endpoint
@@ -38,7 +46,7 @@ declare const createHttpApiGatewayLambdaEndpoint: (method: "POST" | "GET" | "PUT
  * @param path - The path for the endpoint (e.g., "/messages")
  * @param queue - The SQS queue to integrate with
  * @param api - The HTTP API Gateway to add the endpoint to
- * @returns The route configuration
+ * @returns The HTTP API Gateway SQS endpoint
  */
 declare const createHttpApiGatewaySQSEndpoint: (method: "POST" | "GET" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD", path: string, queue: sqs.IQueue, api: apigatewayv2.HttpApi) => apigatewayv2.IHttpRoute[];
 export { createApiGateway, createHttpApiGateway, createHttpApiGatewayLambdaEndpoint, createHttpApiGatewaySQSEndpoint, getApiGatewayDomainName, };

package/dist/src/apigateway.js

@@ -126,6 +126,9 @@ const createHttpApiGateway = (scope, apiName, domainName, hostedZoneId, zoneName
         description: `Public HTTP API Gateway for ${apiName}`,
         defaultDomainMapping: {
             domainName: apiDomainName,
+            // Explicitly set mappingKey to empty string for root path mapping
+            // to avoid "undefined" appearing in resource names
+            mappingKey: "",
         },
         defaultAuthorizer: defaultAuthorizer ?? new aws_apigatewayv2_authorizers_1.HttpIamAuthorizer(),
     });
@@ -162,11 +165,28 @@ const getHttpMethod = (method) => {
             return apigatewayv2.HttpMethod.HEAD;
     }
 };
+/**
+ * Creates an HTTP API Gateway Lambda endpoint
+ * @param method - The HTTP method for the endpoint (POST, GET, PUT, DELETE, PATCH, OPTIONS, HEAD)
+ * @param path - The path for the endpoint (e.g., "/messages")
+ * @param lambdaFunction - The Lambda function to integrate
+ * @param api - The HTTP API Gateway to add the endpoint to
+ * @returns The HTTP API Gateway Lambda endpoint
+ */
 const createHttpApiGatewayLambdaEndpoint = (method, path, lambdaFunction, api) => {
+    // Create a unique ID by combining path and method to avoid construct ID conflicts
+    // when the same Lambda function is used for multiple routes
+    // Path and method are concrete strings (not tokens), so this is safe
+    // Handle path parameters like {userId} by removing curly braces
+    const sanitizedPath = path
+        .replace(/\{([^}]+)\}/g, "$1")
+        .replace(/\//g, "-")
+        .replace(/^-/, "")
+        .replace(/-$/, "") || "root";
     return api.addRoutes({
         path: path,
         methods: [getHttpMethod(method)],
-        integration: new apigatewayv2_integrations.HttpLambdaIntegration(lambdaFunction.functionName, lambdaFunction),
+        integration: new apigatewayv2_integrations.HttpLambdaIntegration(`${method}-${sanitizedPath}`, lambdaFunction),
     });
 };
 exports.createHttpApiGatewayLambdaEndpoint = createHttpApiGatewayLambdaEndpoint;
@@ -176,18 +196,32 @@ exports.createHttpApiGatewayLambdaEndpoint = createHttpApiGatewayLambdaEndpoint;
  * @param path - The path for the endpoint (e.g., "/messages")
  * @param queue - The SQS queue to integrate with
  * @param api - The HTTP API Gateway to add the endpoint to
- * @returns The route configuration
+ * @returns The HTTP API Gateway SQS endpoint
  */
 const createHttpApiGatewaySQSEndpoint = (method, path, queue, api) => {
     // Grant API Gateway service permission to send messages to SQS
     // This matches the behavior of createSQSApiGatewayIntegration
     // For HTTP API Gateway v2, we grant permissions directly to the service principal
     queue.grantSendMessages(new iam.ServicePrincipal("apigateway.amazonaws.com"));
+    // Create a unique ID by combining path and method to avoid construct ID conflicts
+    // when the same queue is used for multiple routes
+    // Path and method are concrete strings (not tokens), so this is safe
+    // Handle path parameters like {userId} by removing curly braces
+    const sanitizedPath = path
+        .replace(/\{([^}]+)\}/g, "$1")
+        .replace(/\//g, "-")
+        .replace(/^-/, "")
+        .replace(/-$/, "") || "root";
     return api.addRoutes({
         path: path,
         methods: [getHttpMethod(method)],
-        integration: new apigatewayv2_integrations.HttpSqsIntegration(queue.queueName, {
+        integration: new apigatewayv2_integrations.HttpSqsIntegration(`${method}-${sanitizedPath}`, {
             queue: queue,
+            // Configure parameter mapping to use the entire request body as the message body
+            // By default, it expects $request.body.MessageBody, but we want to send the whole body
+            parameterMapping: apigatewayv2.ParameterMapping.fromObject({
+                MessageBody: apigatewayv2.MappingValue.custom("$request.body"),
+            }),
         }),
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@certenza/aws-cdk-infrastructure-commons",
-    "version": "2.4.0",
+    "version": "2.4.2",
     "description": "Common infrastructure reusable utilities and resources for Certenza projects",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",