get rid of custom resource

Author: anthony-nhs

.devcontainer/devcontainer.json

@@ -54,7 +54,6 @@
         "python.testing.pytestEnabled": true,
         "python.testing.pytestArgs": [
           "packages/slackBotFunction",
-          "packages/createIndexFunction"
         ],
         "python.linting.pylintEnabled": false,
         "python.linting.flake8Enabled": true,

.github/workflows/cdk_package_code.yml

@@ -62,7 +62,6 @@ jobs:
       - name: Build Python Lambda Functions
         run: |
           pip3 install -r packages/slackBotFunction/requirements.txt -t packages/slackBotFunction
-          pip3 install -r packages/createIndexFunction/requirements.txt -t packages/createIndexFunction
           pip3 install -r packages/syncKnowledgeBaseFunction/requirements.txt -t packages/syncKnowledgeBaseFunction
 
       - name: 'Tar files'

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

@@ -8,10 +8,6 @@
 			"name": "packages/cdk",
 			"path": "../packages/cdk"
 		},
-		{
-			"name": "packages/createIndexFunction",
-			"path": "../packages/createIndexFunction"
-		},
 		{
 			"name": "packages/slackBotFunction",
 			"path": "../packages/slackBotFunction"

Makefile

@@ -10,7 +10,6 @@ install: install-python install-hooks install-node
 
 install-python:
 	poetry install
-	cd packages/createIndexFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
 	cd packages/slackBotFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
 	cd packages/syncKnowledgeBaseFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
 
@@ -46,15 +45,12 @@ lint-flake8:
 	poetry run flake8 .
 
 test:
-	cd packages/createIndexFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
 	cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
 	cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
 
 clean:
 	rm -rf packages/cdk/coverage
 	rm -rf packages/cdk/lib
-	rm -rf packages/createIndexFunction/coverage
-	rm -rf packages/createIndexFunction/.coverage
 	rm -rf packages/slackBotFunction/coverage
 	rm -rf packages/slackBotFunction/.coverage
 	rm -rf packages/syncKnowledgeBaseFunction/coverage

README.md

@@ -28,11 +28,6 @@ packages/
 │   │   └── RestApiGateway/     # API Gateway specific constructs
 │   ├── resources/              # AWS resource definitions
 │   └── stacks/                 # CDK stack definitions
-├── createIndexFunction/        # Lambda function for OpenSearch index management
-│   ├── app/                    # Application code
-│   │   ├── config/             # Configuration and environment variables
-│   │   └── handler.py          # Lambda handler
-│   └── tests/                  # Unit tests
 ├── slackBotFunction/           # Lambda function for Slack bot integration
 │   ├── app/                    # Application code
 │   │   ├── config/             # Configuration and environment variables

packages/cdk/nagSuppressions.ts

@@ -16,18 +16,6 @@ export const nagSuppressions = (stack: Stack) => {
     ]
   )
 
-  // Suppress wildcard log permissions for CreateIndex Lambda
-  safeAddNagSuppression(
-    stack,
-    "/EpsAssistMeStack/Functions/CreateIndexFunction/LambdaPutLogsManagedPolicy/Resource",
-    [
-      {
-        id: "AwsSolutions-IAM5",
-        reason: "Wildcard permissions are required for log stream access under known paths."
-      }
-    ]
-  )
-
   // Suppress wildcard log permissions for SyncKnowledgeBase Lambda
   safeAddNagSuppression(
     stack,

packages/cdk/resources/Functions.ts

@@ -43,18 +43,6 @@ export class Functions extends Construct {
   constructor(scope: Construct, id: string, props: FunctionsProps) {
     super(scope, id)
 
-    // Lambda function to create OpenSearch vector index
-    const createIndexFunction = new LambdaFunction(this, "CreateIndexFunction", {
-      stackName: props.stackName,
-      functionName: `${props.stackName}-CreateIndexFunction`,
-      packageBasePath: "packages/createIndexFunction",
-      handler: "app.handler.handler",
-      logRetentionInDays: props.logRetentionInDays,
-      logLevel: props.logLevel,
-      environmentVariables: {"INDEX_NAME": props.collectionId},
-      additionalPolicies: [props.createIndexManagedPolicy]
-    })
-
     // Lambda function to handle Slack bot interactions (events and @mentions)
     const slackBotLambda = new LambdaFunction(this, "SlackBotLambda", {
       stackName: props.stackName,
@@ -100,7 +88,6 @@ export class Functions extends Construct {
     })
 
     this.functions = {
-      createIndex: createIndexFunction,
       slackBot: slackBotLambda,
       syncKnowledgeBase: syncKnowledgeBaseFunction
     }

packages/cdk/resources/VectorIndex.ts

@@ -1,68 +1,56 @@
 import {Construct} from "constructs"
-import {Duration} from "aws-cdk-lib"
-import {PolicyStatement} from "aws-cdk-lib/aws-iam"
-import {CfnCollection} from "aws-cdk-lib/aws-opensearchserverless"
-import {AwsCustomResource, PhysicalResourceId, AwsCustomResourcePolicy} from "aws-cdk-lib/custom-resources"
-import {LambdaFunction} from "../constructs/LambdaFunction"
+import {CfnCollection, CfnIndex} from "aws-cdk-lib/aws-opensearchserverless"
 
 export interface VectorIndexProps {
   readonly indexName: string
   readonly collection: CfnCollection
-  readonly createIndexFunction: LambdaFunction
   readonly endpoint: string
 }
 
 export class VectorIndex extends Construct {
-  public readonly vectorIndex: AwsCustomResource
+  public readonly cfnIndex: CfnIndex
 
   constructor(scope: Construct, id: string, props: VectorIndexProps) {
     super(scope, id)
 
-    // Custom resource to manage OpenSearch vector index lifecycle via Lambda
-    this.vectorIndex = new AwsCustomResource(this, "VectorIndex", {
-      installLatestAwsSdk: true,
-      // Create index when stack is deployed
-      onCreate: {
-        service: "Lambda",
-        action: "invoke",
-        parameters: {
-          FunctionName: props.createIndexFunction.function.functionName,
-          InvocationType: "RequestResponse",
-          Payload: JSON.stringify({
-            RequestType: "Create",
-            CollectionName: props.collection.name,
-            IndexName: props.indexName,
-            Endpoint: props.endpoint
-          })
+    const indexMapping: CfnIndex.MappingsProperty = {
+      properties: {
+        "bedrock-knowledge-base-default-vector": {
+          type: "knn_vector",
+          dimension: 1024,
+          method: {
+            name: "hnsw",
+            engine: "faiss",
+            parameters: {},
+            spaceType: "l2"
+          }
         },
-        physicalResourceId: PhysicalResourceId.of(`VectorIndex-${props.indexName}`)
-      },
-      // Delete index when stack is destroyed
-      onDelete: {
-        service: "Lambda",
-        action: "invoke",
-        parameters: {
-          FunctionName: props.createIndexFunction.function.functionName,
-          InvocationType: "RequestResponse",
-          Payload: JSON.stringify({
-            RequestType: "Delete",
-            CollectionName: props.collection.name,
-            IndexName: props.indexName,
-            Endpoint: props.endpoint
-          })
+        "AMAZON_BEDROCK_METADATA": {
+          type: "text",
+          index: false
+        },
+        "AMAZON_BEDROCK_TEXT_CHUNK": {
+          type: "text",
+          index: false
+        }
+      }
+    }
+
+    const cfnIndex = new CfnIndex(this, "MyCfnIndex", {
+      collectionEndpoint: props.endpoint,
+      indexName: props.indexName,
+      mappings: indexMapping,
+      // the properties below are optional
+      settings: {
+        index: {
+          knn: true,
+          knnAlgoParamEfSearch: 512
         }
-      },
-      // Grant permission to invoke the Lambda function
-      policy: AwsCustomResourcePolicy.fromStatements([
-        new PolicyStatement({
-          actions: ["lambda:InvokeFunction"],
-          resources: [props.createIndexFunction.function.functionArn]
-        })
-      ]),
-      timeout: Duration.seconds(60)
+      }
     })
 
     // Ensure collection exists before creating index
-    this.vectorIndex.node.addDependency(props.collection)
+    cfnIndex.node.addDependency(props.collection)
+    this.cfnIndex = cfnIndex
   }
 }

packages/cdk/stacks/EpsAssistMeStack.ts

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