fix layer

Author: anthony-nhs

.github/workflows/cdk_package_code.yml

@@ -63,8 +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
-          pip3 install -r requirements_slackBotFunction -t packages/slackBotFunction/.dependencies/python
-          pip3 install -r requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction/.dependencies/python
+          pip3 install -r requirements_slackBotFunction -t .dependencies/slackBotFunction/python
+          pip3 install -r requirements_syncKnowledgeBaseFunction -t .dependencies/syncKnowledgeBaseFunction/python
 
       - name: 'Tar files'
         run: |

.gitignore

@@ -33,5 +33,4 @@ cdk.out
 .requirements_slackBotFunction
 .requirements_syncKnowledgeBaseFunction
 .local_config/
-packages/slackBotFunction/.dependencies/
-packages/syncKnowledgeBaseFunction/.dependencies/
+.dependencies/

Makefile

@@ -100,8 +100,8 @@ cdk-deploy: guard-STACK_NAME
 		--context slackBotToken=$$SLACK_BOT_TOKEN \
 		--context slackSigningSecret=$$SLACK_SIGNING_SECRET
 cdk-synth:
-	mkdir -p packages/slackBotFunction/.dependencies
-	mkdir -p packages/syncKnowledgeBaseFunction/.dependencies
+	mkdir -p .dependencies/slackBotFunction
+	mkdir -p .dependencies/SyncKnowledgeBaseFunction
 	mkdir -p .local_config
 	STACK_NAME=epsam \
 	COMMIT_ID=undefined \

packages/cdk/constructs/LambdaFunction.ts

@@ -18,7 +18,6 @@ import {
   Code
 } from "aws-cdk-lib/aws-lambda"
 import {CfnLogGroup, CfnSubscriptionFilter, LogGroup} from "aws-cdk-lib/aws-logs"
-import path from "path"
 
 export interface LambdaFunctionProps {
   readonly stackName: string
@@ -29,6 +28,7 @@ export interface LambdaFunctionProps {
   readonly additionalPolicies?: Array<IManagedPolicy>
   readonly logRetentionInDays: number
   readonly logLevel: string
+  readonly dependencyLocation?: string
 }
 
 // Lambda Insights layer for enhanced monitoring
@@ -116,11 +116,15 @@ export class LambdaFunction extends Construct {
       managedPolicies: requiredPolicies
     })
 
-    const dependencyLayer = new LayerVersion(this, "DependencyLayer", {
-      removalPolicy: RemovalPolicy.DESTROY,
-      code: Code.fromAsset(path.join(props.packageBasePath, ".dependencies")),
-      compatibleArchitectures: [Architecture.X86_64]
-    })
+    const layers = [insightsLambdaLayer]
+    if (props.dependencyLocation) {
+      const dependencyLayer = new LayerVersion(this, "DependencyLayer", {
+        removalPolicy: RemovalPolicy.DESTROY,
+        code: Code.fromAsset(props.dependencyLocation),
+        compatibleArchitectures: [Architecture.X86_64]
+      })
+      layers.push(dependencyLayer)
+    }
 
     // Create Lambda function with Python runtime and monitoring
     const lambdaFunction = new LambdaFunctionResource(this, props.functionName, {
@@ -129,14 +133,14 @@ export class LambdaFunction extends Construct {
       timeout: Duration.seconds(50),
       architecture: Architecture.X86_64,
       handler: props.handler,
-      code: Code.fromAsset(path.join(props.packageBasePath, "app")),
+      code: Code.fromAsset(props.packageBasePath),
       role,
       environment: {
         ...props.environmentVariables,
         POWERTOOLS_LOG_LEVEL: props.logLevel
       },
       logGroup,
-      layers: [insightsLambdaLayer, dependencyLayer]
+      layers: layers
     })
 
     // Suppress CFN guard rules for Lambda function

packages/cdk/resources/Functions.ts

@@ -48,10 +48,11 @@ export class Functions extends Construct {
       stackName: props.stackName,
       functionName: `${props.stackName}-SlackBotFunction`,
       packageBasePath: "packages/slackBotFunction",
-      handler: "handler.handler",
+      handler: "app.handler.handler",
       logRetentionInDays: props.logRetentionInDays,
       logLevel: props.logLevel,
       additionalPolicies: [props.slackBotManagedPolicy],
+      dependencyLocation: ".dependencies/slackBotFunction",
       environmentVariables: {
         "RAG_MODEL_ID": RAG_MODEL_ID,
         "QUERY_REFORMULATION_MODEL_ID": QUERY_REFORMULATION_MODEL_ID,
@@ -77,9 +78,10 @@ export class Functions extends Construct {
       stackName: props.stackName,
       functionName: `${props.stackName}-SyncKnowledgeBaseFunction`,
       packageBasePath: "packages/syncKnowledgeBaseFunction",
-      handler: "handler.handler",
+      handler: "app.handler.handler",
       logRetentionInDays: props.logRetentionInDays,
       logLevel: props.logLevel,
+      dependencyLocation: ".dependencies/syncKnowledgeBaseFunction",
       environmentVariables: {
         "KNOWLEDGEBASE_ID": props.knowledgeBaseId,
         "DATA_SOURCE_ID": props.dataSourceId

scripts/run_sync.sh

@@ -63,10 +63,10 @@ echo "Generating config for ${EPSAM_CONFIG}"
 "$FIX_SCRIPT" "$EPSAM_CONFIG"
 
 echo "Installing dependencies locally"
-poetry export --without-hashes --format=requirements.txt --with slackBotFunction > .requirements_slackBotFunction
-poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > .requirements_syncKnowledgeBaseFunction
-pip3 install -r .requirements_slackBotFunction -t packages/slackBotFunction/.dependencies/python
-pip3 install -r .requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction/.dependencies/python
+poetry export --without-hashes --format=requirements.txt --with slackBotFunction > .dependencies/requirements_slackBotFunction
+poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > .dependencies/requirements_syncKnowledgeBaseFunction
+pip3 install -r .dependencies/requirements_slackBotFunction -t .dependencies/slackBotFunction/python
+pip3 install -r .dependencies/requirements_syncKnowledgeBaseFunction -t .dependencies/syncKnowledgeBaseFunction/python
 
 sync_epsam_app() {
     echo "Starting sync epsam CDK app"