@emarketeer/ts-microservice-commons 8.0.0 → 8.1.1

package/dist/cdk/cjs/index.js

@@ -830,19 +830,30 @@ class EmLambdaFunction extends constructs.Construct {
 class EmDynamoDBTable extends constructs.Construct {
     constructor(scope, id, config) {
         super(scope, id);
-        const tableName = generateTableName(config.stage, config.serviceName, config.tableName);
+        const tableName = config.rawTableName ?? generateTableName(config.stage, config.serviceName, config.tableName);
         // Create DynamoDB table
         this.table = new awsDynamodb.Table(this, 'Table', {
             tableName,
             partitionKey: config.partitionKey,
             sortKey: config.sortKey,
             billingMode: config.billingMode || awsDynamodb.BillingMode.PAY_PER_REQUEST,
-            pointInTimeRecovery: config.pointInTimeRecovery ?? config.stage === 'prod',
+            pointInTimeRecoverySpecification: {
+                pointInTimeRecoveryEnabled: config.pointInTimeRecovery ?? config.stage === 'prod'
+            },
+            deletionProtection: config.deletionProtection ?? config.stage === 'prod',
             stream: config.stream ? awsDynamodb.StreamViewType.NEW_AND_OLD_IMAGES : undefined,
             timeToLiveAttribute: config.timeToLiveAttribute,
             encryption: awsDynamodb.TableEncryption.AWS_MANAGED,
             removalPolicy: getRemovalPolicy(config.stage)
         });
+        if (config.overrideLogicalId) {
+            const cfnTable = this.table.node.defaultChild;
+            if (!(cfnTable instanceof awsDynamodb.CfnTable)) {
+                throw new Error(`Cannot override table logical ID to "${config.overrideLogicalId}": ` +
+                    'table does not have a CfnTable default child.');
+            }
+            cfnTable.overrideLogicalId(config.overrideLogicalId);
+        }
         // Add Global Secondary Indexes
         if (config.globalSecondaryIndexes) {
             config.globalSecondaryIndexes.forEach(gsi => {
@@ -2221,6 +2232,41 @@ class EmStack extends cdk.Stack {
             })
         });
     }
+    /**
+     * Create a Lambda function consuming messages from an SNS topic via SQS.
+     * Combines `createQueueConsumer()` + `subscribeToTopic()` in one call and
+     * inherits the stack's default function config (env vars, VPC, timeout).
+     *
+     * Prefer this over constructing `TopicQueueConsumer` directly — the raw
+     * constructor bypasses default-config merging.
+     *
+     * @example
+     * ```typescript
+     * this.createTopicQueueConsumer('ProcessInvoices', {
+     *   topic: invoiceTopic,
+     *   subscriptionOptions: { rawMessageDelivery: true },
+     *   handlerPath: 'src/handlers/process-invoices',
+     *   queueName: 'dev-my-service-invoice-queue',
+     *   alarmTopic,
+     * })
+     * ```
+     */
+    createTopicQueueConsumer(id, config) {
+        const { topic, subscriptionOptions, ...queueConfig } = config;
+        const merged = this.mergeConfig(queueConfig);
+        const { functionName } = resolveHandlerPath(merged);
+        return new TopicQueueConsumer(this, id, {
+            ...merged,
+            stage: merged.stage ?? this.stage,
+            serviceName: merged.serviceName ?? this.serviceName,
+            role: merged.role ?? this.sharedRole,
+            topic,
+            subscriptionOptions,
+            ...(this.sharedRole && {
+                serverlessFunctionName: merged.serverlessFunctionName ?? functionName
+            })
+        });
+    }
     /**
      * Create a scheduled Lambda function with an EventBridge rule.
      * Combines `createFunction()` + `EmEventBridgeRule` + `addLambdaTarget()` in one call.
@@ -2360,10 +2406,17 @@ function createRdsVpcConfig(scope, stage, config) {
     const vpc = ec2.Vpc.fromLookup(scope, `RdsVpc-${stage}`, {
         vpcId: config.vpcId
     });
-    const privateSubnets = config.privateSubnetIds.map((subnetId, index) => ec2.Subnet.fromSubnetId(scope, `RdsPrivateSubnet${index}-${stage}`, subnetId));
+    // The imported subnets are only handed to Lambda's VpcConfig. We never read
+    // `subnet.routeTable.routeTableId`, so acknowledge the CDK warning that
+    // `fromSubnetId` emits for imports without route-table metadata.
+    const privateSubnets = config.privateSubnetIds.map((subnetId, index) => {
+        const subnet = ec2.Subnet.fromSubnetId(scope, `RdsPrivateSubnet${index}-${stage}`, subnetId);
+        cdk.Annotations.of(subnet).acknowledgeWarning('@aws-cdk/aws-ec2:noSubnetRouteTableId', 'This construct only passes imported subnets to Lambda VpcConfig and does not require routeTableId metadata.');
+        return subnet;
+    });
     const lambdaSecurityGroup = new ec2.SecurityGroup(scope, `RdsLambdaSecurityGroup-${stage}`, {
         vpc,
-        description: 'Lambda security group for RDS access',
+        description: config.securityGroupDescription ?? 'Lambda security group for RDS access',
         allowAllOutbound: true
     });
     if (config.overrideLogicalIds?.securityGroup) {
@@ -2423,6 +2476,42 @@ const createEmApp = (options) => {
     return { app, stage: rawStage };
 };
 
+/**
+ * Account-level RDS networking constants — the VPC, private subnets, and the
+ * RDS security group that Lambda functions need to reach the shared database
+ * cluster.
+ *
+ * These values are account-level constants: every service deploying into the
+ * eMarketeer AWS account uses the same VPC/subnets/SG per stage. The VPC and
+ * private subnets exist solely to give Lambdas a route to RDS — Lambdas that
+ * don't talk to RDS do not need them.
+ *
+ * Designed to compose with `createRdsVpcConfig()` in `./rds-vpc`:
+ *
+ * ```typescript
+ * const account = getAccountRdsVpcConfig(this.stage)
+ * const vpcConfig = createRdsVpcConfig(this, this.stage, { ...account })
+ * ```
+ */
+function getAccountRdsVpcConfig(stage) {
+    switch (stage) {
+        case 'dev':
+            return {
+                vpcId: 'vpc-d2fd89b5',
+                privateSubnetIds: ['subnet-7c74d81a', 'subnet-de04eb84', 'subnet-e29b26aa'],
+                dbSecurityGroupId: 'sg-711c3f09'
+            };
+        case 'prod':
+            return {
+                vpcId: 'vpc-aeaf41cb',
+                privateSubnetIds: ['subnet-dab14f80', 'subnet-e06ad686', 'subnet-14ea665c'],
+                dbSecurityGroupId: 'sg-427bda39'
+            };
+        default:
+            throw new Error(`Unsupported RDS VPC stage: ${stage}. Only 'dev' and 'prod' are supported.`);
+    }
+}
+
 exports.DEFAULT_LAMBDA_RUNTIME = DEFAULT_LAMBDA_RUNTIME;
 exports.DlqAlarm = DlqAlarm;
 exports.EVENT_PATTERNS = EVENT_PATTERNS;
@@ -2490,6 +2579,7 @@ exports.generateStackName = generateStackName;
 exports.generateStandardTags = generateStandardTags;
 exports.generateTableName = generateTableName;
 exports.generateTopicName = generateTopicName;
+exports.getAccountRdsVpcConfig = getAccountRdsVpcConfig;
 exports.getAlarmThresholds = getAlarmThresholds;
 exports.getComplianceTags = getComplianceTags;
 exports.getCostAllocationTags = getCostAllocationTags;