refactor: adds removal policies for resource recreation

Author: bencegadanyi1-nhs

packages/cdk/resources/OpenSearchResources.ts

@@ -4,12 +4,12 @@ import {
   VectorCollection,
   VectorCollectionStandbyReplicas
 } from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/opensearchserverless"
+import {RemovalPolicy} from "aws-cdk-lib"
 
 export interface OpenSearchResourcesProps {
   readonly stackName: string
   readonly bedrockExecutionRole: Role
   readonly region: string
-  readonly commitId: string
 }
 
 export class OpenSearchResources extends Construct {
@@ -18,17 +18,17 @@ export class OpenSearchResources extends Construct {
   constructor(scope: Construct, id: string, props: OpenSearchResourcesProps) {
     super(scope, id)
 
-    const commitShort = props.commitId.substring(0, 4)
-
     // Create the OpenSearch Serverless collection using L2 construct
     this.collection = new VectorCollection(this, "Collection", {
-      collectionName: `${props.stackName}-${commitShort}-vector-db`,
+      collectionName: `${props.stackName}-vector-db`,
       description: "EPS Assist Vector Store",
       standbyReplicas: VectorCollectionStandbyReplicas.DISABLED
     })
 
     // Grant access to the Bedrock execution role
     this.collection.grantDataAccess(props.bedrockExecutionRole)
 
+    this.collection.applyRemovalPolicy(RemovalPolicy.DESTROY)
+
   }
 }

packages/cdk/resources/VectorIndex.ts

@@ -1,6 +1,7 @@
 import {Construct} from "constructs"
 import {CfnIndex} from "aws-cdk-lib/aws-opensearchserverless"
 import {VectorCollection} from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/opensearchserverless"
+import {RemovalPolicy} from "aws-cdk-lib"
 
 export interface VectorIndexProps {
   readonly indexName: string
@@ -64,5 +65,7 @@ export class VectorIndex extends Construct {
     })
 
     this.cfnIndex = cfnIndex
+
+    this.cfnIndex.applyRemovalPolicy(RemovalPolicy.DESTROY)
   }
 }

packages/cdk/resources/VectorKnowledgeBaseResources.ts

@@ -10,6 +10,7 @@ import {
   ManagedWordFilterType,
   PIIType
 } from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/bedrock"
+import {RemovalPolicy} from "aws-cdk-lib"
 
 // Amazon Titan embedding model for vector generation
 const EMBEDDING_MODEL = "amazon.titan-embed-text-v2:0"
@@ -134,6 +135,8 @@ export class VectorKnowledgeBaseResources extends Construct {
       }
     })
 
+    knowledgeBase.applyRemovalPolicy(RemovalPolicy.DESTROY)
+
     // Create S3 data source for knowledge base documents
     const dataSource = new CfnDataSource(this, "S3DataSource", {
       knowledgeBaseId: knowledgeBase.attrKnowledgeBaseId,

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -80,7 +80,6 @@ export class EpsAssistMeStack extends Stack {
     const openSearchResources = new OpenSearchResources(this, "OpenSearchResources", {
       stackName: props.stackName,
       bedrockExecutionRole: bedrockExecutionRole.role,
-      commitId: props.commitId,
       region
     })