Set required property names dynamically

Author: kris-szlapa

packages/cdk/resources/OpenSearchResources.ts

@@ -3,8 +3,9 @@ import {OpenSearchCollection} from "../constructs/OpenSearchCollection"
 import {Role} from "aws-cdk-lib/aws-iam"
 
 export interface OpenSearchResourcesProps {
-  bedrockExecutionRole: Role
-  account: string
+  readonly stackName: string
+  readonly bedrockExecutionRole: Role
+  readonly account: string
 }
 
 export class OpenSearchResources extends Construct {
@@ -15,7 +16,7 @@ export class OpenSearchResources extends Construct {
 
     // OpenSearch Serverless collection with vector search capabilities
     this.collection = new OpenSearchCollection(this, "OsCollection", {
-      collectionName: "eps-assist-vector-db",
+      collectionName: `${props.stackName}-vector-db`,
       principals: [
         props.bedrockExecutionRole.roleArn, // Bedrock Knowledge Base access
         `arn:aws:iam::${props.account}:root` // Account root access

packages/cdk/resources/Storage.ts

@@ -2,11 +2,15 @@ import {Construct} from "constructs"
 import {Key} from "aws-cdk-lib/aws-kms"
 import {S3Bucket} from "../constructs/S3Bucket"
 
+export interface StorageProps {
+  readonly stackName: string
+}
+
 export class Storage extends Construct {
   public readonly kbDocsBucket: S3Bucket
   public readonly kbDocsKey: Key
 
-  constructor(scope: Construct, id: string) {
+  constructor(scope: Construct, id: string, props: StorageProps) {
     super(scope, id)
 
     // Create customer-managed KMS key for knowledge base document encryption
@@ -17,7 +21,7 @@ export class Storage extends Construct {
 
     // Create S3 bucket for knowledge base documents with encryption
     this.kbDocsBucket = new S3Bucket(this, "DocsBucket", {
-      bucketName: "Docs",
+      bucketName: `${props.stackName}-Docs`,
       kmsKey: this.kbDocsKey,
       versioned: true
     })

packages/cdk/resources/VectorKnowledgeBaseResources.ts

@@ -7,10 +7,11 @@ import {CfnKnowledgeBase, CfnGuardrail, CfnDataSource} from "aws-cdk-lib/aws-bed
 const EMBEDDING_MODEL = "amazon.titan-embed-text-v2:0"
 
 export interface VectorKnowledgeBaseProps {
-  docsBucket: Bucket
-  bedrockExecutionRole: Role
-  collectionArn: string
-  vectorIndexName: string
+  readonly stackName: string
+  readonly docsBucket: Bucket
+  readonly bedrockExecutionRole: Role
+  readonly collectionArn: string
+  readonly vectorIndexName: string
 }
 
 export class VectorKnowledgeBaseResources extends Construct {
@@ -22,7 +23,7 @@ export class VectorKnowledgeBaseResources extends Construct {
 
     // Create Bedrock guardrail for content filtering
     this.guardrail = new CfnGuardrail(this, "Guardrail", {
-      name: "eps-assist-guardrail",
+      name: `${props.stackName}-guardrail`,
       description: "Guardrail for EPS Assist Me Slackbot",
       blockedInputMessaging: "Your input was blocked.",
       blockedOutputsMessaging: "Your output was blocked.",
@@ -54,7 +55,7 @@ export class VectorKnowledgeBaseResources extends Construct {
 
     // Create vector knowledge base for document retrieval
     this.knowledgeBase = new CfnKnowledgeBase(this, "VectorKB", {
-      name: "eps-assist-kb",
+      name: `${props.stackName}-kb`,
       description: "Knowledge base for EPS Assist Me Slackbot",
       roleArn: props.bedrockExecutionRole.roleArn,
       knowledgeBaseConfiguration: {
@@ -82,7 +83,7 @@ export class VectorKnowledgeBaseResources extends Construct {
     // Create S3 data source for knowledge base documents
     new CfnDataSource(this, "S3DataSource", {
       knowledgeBaseId: this.knowledgeBase.attrKnowledgeBaseId,
-      name: "eps-assist-s3-datasource",
+      name: `${props.stackName}-s3-datasource`,
       dataSourceConfiguration: {
         type: "S3",
         s3Configuration: {

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -51,7 +51,9 @@ export class EpsAssistMeStack extends Stack {
     // - Storage needs to exist first so IamResources can reference the S3 bucket for policies
     // - IamResources creates the Bedrock role that needs S3 access permissions
     // - KMS permissions are added manually after both constructs exist
-    const storage = new Storage(this, "Storage")
+    const storage = new Storage(this, "Storage", {
+      stackName: props.stackName
+    })
 
     // Create IAM Resources
     const iamResources = new IamResources(this, "IamResources", {
@@ -64,6 +66,7 @@ export class EpsAssistMeStack extends Stack {
 
     // Create OpenSearch Resources
     const openSearchResources = new OpenSearchResources(this, "OpenSearchResources", {
+      stackName: props.stackName,
       bedrockExecutionRole: iamResources.bedrockExecutionRole,
       account
     })
@@ -101,6 +104,7 @@ export class EpsAssistMeStack extends Stack {
 
     // Create VectorKnowledgeBase construct after vector index
     const vectorKB = new VectorKnowledgeBaseResources(this, "VectorKB", {
+      stackName: props.stackName,
       docsBucket: storage.kbDocsBucket.bucket,
       bedrockExecutionRole: iamResources.bedrockExecutionRole,
       collectionArn: `arn:aws:aoss:${region}:${account}:collection/${openSearchResources.collection.collection.attrId}`,