remove indexwaiter

Author: anthony-nhs

.github/workflows/cdk_package_code.yml

@@ -63,10 +63,8 @@ jobs:
         run: |
           poetry export --without-hashes --format=requirements.txt --with slackBotFunction > requirements_slackBotFunction
           poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > requirements_syncKnowledgeBaseFunction
-          poetry export --without-hashes --format=requirements.txt --with indexWaiter > requirements_indexWaiter
           pip3 install -r requirements_slackBotFunction -t packages/slackBotFunction
           pip3 install -r requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction
-          pip3 install -r requirements_indexWaiter -t packages/indexWaiter
 
       - name: 'Tar files'
         run: |

.vscode/eps-assist-me.code-workspace

@@ -15,19 +15,14 @@
 		{
 			"name": "packages/syncKnowledgeBaseFunction",
 			"path": "../packages/syncKnowledgeBaseFunction"
-		},
-		{
-			"name": "packages/indexWaiter",
-			"path": "../packages/indexWaiter"
 		}
 	],
 	"settings": {
 		"jest.disabledWorkspaceFolders": [
 			"eps-assist-me",
 			"packages/cdk",
 			"packages/slackBotFunction",
-			"packages/syncKnowledgeBaseFunction",
-			"packages/indexWaiter"
+			"packages/syncKnowledgeBaseFunction"
 		],
 		"files.exclude": {
 			"packages/": true

packages/cdk/nagSuppressions.ts

@@ -104,18 +104,6 @@ export const nagSuppressions = (stack: Stack) => {
     ]
   )
 
-  // Suppress IAM wildcard permissions for waiter on event role policy
-  safeAddNagSuppression(
-    stack,
-    "/EpsAssistMeStack/VectorIndex/IndexWaiterProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource",
-    [
-      {
-        id: "AwsSolutions-IAM5",
-        reason: "Lambda needs access to all OpenSearch collections and indexes to create and manage indexes."
-      }
-    ]
-  )
-
   // Suppress wildcard permissions for SlackBot policy
   safeAddNagSuppression(
     stack,
@@ -166,17 +154,6 @@ export const nagSuppressions = (stack: Stack) => {
     ]
   )
 
-  safeAddNagSuppression(
-    stack,
-    "/EpsAssistMeStack/VectorIndex/IndexWaiterProvider/framework-onEvent/ServiceRole/Resource",
-    [
-      {
-        id: "AwsSolutions-IAM4",
-        reason: "Waiter function on event using managed policies is fine"
-      }
-    ]
-  )
-
   // Suppress AWS managed policy usage in BucketNotificationsHandler (wildcard for any hash)
   const bucketNotificationHandlers = stack.node.findAll().filter(node =>
     node.node.id.startsWith("BucketNotificationsHandler")

packages/cdk/resources/VectorIndex.ts

@@ -1,24 +1,14 @@
 import {Construct} from "constructs"
 import {CfnCollection, CfnIndex} from "aws-cdk-lib/aws-opensearchserverless"
-import {CustomResource} from "aws-cdk-lib"
-import {ManagedPolicy, PolicyStatement} from "aws-cdk-lib/aws-iam"
-import {Provider} from "aws-cdk-lib/custom-resources"
-import {LambdaFunction} from "../constructs/LambdaFunction"
 
 export interface VectorIndexProps {
   readonly indexName: string
   readonly collection: CfnCollection
   readonly endpoint: string
-  readonly account: string
-  readonly region: string
-  readonly stackName: string
-  readonly logRetentionInDays: number
-  readonly logLevel: string
 }
 
 export class VectorIndex extends Construct {
   public readonly cfnIndex: CfnIndex
-  public readonly indexReady: CustomResource
 
   constructor(scope: Construct, id: string, props: VectorIndexProps) {
     super(scope, id)
@@ -71,58 +61,6 @@ export class VectorIndex extends Construct {
       }
     })
 
-    //const collectionArn = `arn:aws:aoss:${props.region}:${props.account}:collection/${props.collection.name}`
-    // eslint-disable-next-line max-len
-    // const indexArn = `arn:aws:aoss:${props.region}:${props.account}:index/${props.collection.name}/${props.indexName}`
-
-    //const collectionArn = "aoss:collection/*"
-    const indexArn = `arn:aws:aoss:${props.region}:${props.account}:collection/${props.collection.attrId}`
-    const getCollectionPolicy = new PolicyStatement({
-      actions: [
-        "aoss:BatchGetCollection"
-      ],
-      resources: ["*"]
-    })
-    const getIndexPolicy = new PolicyStatement({
-      actions: [
-        "aoss:GetIndex"
-      ],
-      resources: [indexArn]
-    })
-    const waiterFnManagedPolicy = new ManagedPolicy(this, "waiterFnManagedPolicy", {
-      description: "Policy for Bedrock Knowledge Base to access S3 and OpenSearch",
-      statements: [
-        getCollectionPolicy,
-        getIndexPolicy
-      ]
-    })
-
-    const waiterFn = new LambdaFunction(this, "waiterLambda", {
-      stackName: props.stackName,
-      functionName: `${props.stackName}-VectorIndexWaiter`,
-      packageBasePath: "packages/indexWaiter",
-      handler: "index_waiter.handler",
-      logRetentionInDays: props.logRetentionInDays,
-      logLevel: props.logLevel,
-      additionalPolicies: [waiterFnManagedPolicy]
-    })
-
-    const provider = new Provider(this, "IndexWaiterProvider", {
-      onEventHandler: waiterFn.function
-    })
-
-    const indexReady = new CustomResource(this, "IndexReady", {
-      serviceToken: provider.serviceToken,
-      properties: {
-        Endpoint: props.endpoint,
-        IndexName: props.indexName
-      }
-    })
-    // Ensure collection exists before creating index
-    cfnIndex.node.addDependency(props.collection)
-    indexReady.node.addDependency(cfnIndex)
-
     this.cfnIndex = cfnIndex
-    this.indexReady = indexReady
   }
 }

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -137,17 +137,11 @@ export class EpsAssistMeStack extends Stack {
     const vectorIndex = new VectorIndex(this, "VectorIndex", {
       indexName: VECTOR_INDEX_NAME,
       collection: openSearchResources.collection.collection,
-      endpoint,
-      region: this.region,
-      account: this.account,
-      stackName: props.stackName,
-      logRetentionInDays: logRetentionInDays,
-      logLevel: logLevel
+      endpoint
     })
 
     // Ensure knowledge base waits for vector index
     vectorKB.knowledgeBase.node.addDependency(vectorIndex.cfnIndex)
-    vectorKB.knowledgeBase.node.addDependency(vectorIndex.indexReady)
 
     // Add S3 notification to trigger sync Lambda function
     new S3LambdaNotification(this, "S3LambdaNotification", {