From 0dd50f57d7c6eb77d41b4636f773b29bbb1e78c3 Mon Sep 17 00:00:00 2001
From: hrodmn <henry.rodman@gmail.com>
Date: Mon, 3 Nov 2025 13:10:23 -0600
Subject: [PATCH] fix: add stage to the export names in DpsStacItemGenerator

---
 cdk/PgStacInfra.ts                           |  1 +
 cdk/constructs/DpsStacItemGenerator/index.ts | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cdk/PgStacInfra.ts b/cdk/PgStacInfra.ts
index 60568f6..569a656 100644
--- a/cdk/PgStacInfra.ts
+++ b/cdk/PgStacInfra.ts
@@ -505,6 +505,7 @@ export class PgStacInfra extends Stack {
             dpsStacItemGenConfig.allowedAccountBucketPairs,
           vpc,
           subnetSelection: apiSubnetSelection,
+          stage,
         },
       );
 
diff --git a/cdk/constructs/DpsStacItemGenerator/index.ts b/cdk/constructs/DpsStacItemGenerator/index.ts
index ccbcfb7..f41fe1a 100644
--- a/cdk/constructs/DpsStacItemGenerator/index.ts
+++ b/cdk/constructs/DpsStacItemGenerator/index.ts
@@ -104,6 +104,16 @@ export interface DpsStacItemGeneratorProps {
     bucketArn: string;
   }>;
   readonly roleArn: string;
+
+  /**
+   * Deployment stage for naming resources and exports.
+   *
+   * Used to create unique export names for each deployment stage,
+   * allowing multiple stage deployments in the same account.
+   *
+   * @default "default"
+   */
+  readonly stage?: string;
 }
 
 export class DpsStacItemGenerator extends Construct {
@@ -143,6 +153,7 @@ export class DpsStacItemGenerator extends Construct {
     const timeoutSeconds = props.lambdaTimeoutSeconds ?? 120;
     const batchSize = props.batchSize ?? 10;
     const lambdaRuntime = props.lambdaRuntime ?? lambda.Runtime.PYTHON_3_12;
+    const stage = props.stage ?? "default";
 
     // Create dead letter queue
     this.deadLetterQueue = new sqs.Queue(this, "DeadLetterQueue", {
@@ -210,25 +221,25 @@ export class DpsStacItemGenerator extends Construct {
     new CfnOutput(this, "TopicArn", {
       value: this.topic.topicArn,
       description: "ARN of the DpsStacItemGenerator SNS Topic",
-      exportName: "dps-stac-item-generator-topic-arn",
+      exportName: `dps-stac-item-generator-topic-arn-${stage}`,
     });
 
     new CfnOutput(this, "QueueUrl", {
       value: this.queue.queueUrl,
       description: "URL of the DpsStacItemGenerator SQS Queue",
-      exportName: "dps-stac-item-generator-queue-url",
+      exportName: `dps-stac-item-generator-queue-url-${stage}`,
     });
 
     new CfnOutput(this, "DeadLetterQueueUrl", {
       value: this.deadLetterQueue.queueUrl,
       description: "URL of the DpsStacItemGenerator Dead Letter Queue",
-      exportName: "dps-stac-item-generator-deadletter-queue-url",
+      exportName: `dps-stac-item-generator-deadletter-queue-url-${stage}`,
     });
 
     new CfnOutput(this, "FunctionName", {
       value: this.lambdaFunction.functionName,
       description: "Name of the DpsStacItemGenerator Lambda Function",
-      exportName: "dps-stac-item-generator-function-name",
+      exportName: `dps-stac-item-generator-function-name-${stage}`,
     });
   }