try using a 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
-          pip3 install -r requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction
+          pip3 install -r requirements_slackBotFunction -t packages/slackBotFunction/.dependencies
+          pip3 install -r requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction/.dependencies
 
       - name: 'Tar files'
         run: |

.gitignore

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

Makefile

@@ -98,17 +98,18 @@ cdk-deploy: guard-STACK_NAME
 		--context slackBotToken=$$SLACK_BOT_TOKEN \
 		--context slackSigningSecret=$$SLACK_SIGNING_SECRET
 cdk-synth:
-	npx cdk synth \
+	mkdir -p .local_config
+	STACK_NAME=epsam \
+	COMMIT_ID=undefined \
+	VERSION_NUMBER=undefined \
+	SLACK_BOT_TOKEN=dummy_token \
+	SLACK_SIGNING_SECRET=dummy_secret \
+	LOG_RETENTION_IN_DAYS=30 \
+	LOG_LEVEL=debug \
+		 ./.github/scripts/fix_cdk_json.sh .local_config/epsam.config.json
+	CONFIG_FILE_NAME=.local_config/epsam.config.json npx cdk synth \
 		--quiet \
-		--app "npx ts-node --prefer-ts-exts packages/cdk/bin/EpsAssistMeApp.ts" \
-		--context accountId=123456789012 \
-		--context stackName=epsam \
-		--context versionNumber=undefined \
-		--context commitId=undefined \
-		--context logRetentionInDays=30 \
-		--context slackBotToken=dummy \
-		--context slackSigningSecret=dummy \
-		--context cfnDriftDetectionGroup=dummy
+		--app "npx ts-node --prefer-ts-exts packages/cdk/bin/EpsAssistMeApp.ts"
 
 cdk-diff:
 	npx cdk diff \
@@ -119,23 +120,8 @@ cdk-diff:
 		--context commitId=$$COMMIT_ID \
 		--context logRetentionInDays=$$LOG_RETENTION_IN_DAYS
 
-cdk-watch: guard-STACK_NAME
-	REQUIRE_APPROVAL="$${REQUIRE_APPROVAL:-any-change}" && \
-	VERSION_NUMBER="$${VERSION_NUMBER:-undefined}" && \
-	COMMIT_ID="$${COMMIT_ID:-undefined}" && \
-		npx cdk deploy \
-		--app "npx ts-node --prefer-ts-exts packages/cdk/bin/EpsAssistMeApp.ts" \
-		--watch \
-		--all \
-		--ci true \
-		--require-approval $${REQUIRE_APPROVAL} \
-		--context accountId=$$ACCOUNT_ID \
-		--context stackName=$$STACK_NAME \
-		--context versionNumber=$$VERSION_NUMBER \
-		--context commitId=$$COMMIT_ID \
-		--context logRetentionInDays=$$LOG_RETENTION_IN_DAYS \
-		--context slackBotToken=$$SLACK_BOT_TOKEN \
-		--context slackSigningSecret=$$SLACK_SIGNING_SECRET
+cdk-watch:
+	./scripts/run_sync.sh
 
 sync-docs: 
 	./scripts/sync_docs.sh

cdk.context.json

@@ -0,0 +1,5 @@
+{
+  "acknowledged-issue-numbers": [
+    34892
+  ]
+}

packages/cdk/constructs/LambdaFunction.ts

@@ -18,6 +18,7 @@ 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
@@ -115,6 +116,12 @@ 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]
+    })
+
     // Create Lambda function with Python runtime and monitoring
     const lambdaFunction = new LambdaFunctionResource(this, props.functionName, {
       runtime: Runtime.PYTHON_3_13,
@@ -129,7 +136,7 @@ export class LambdaFunction extends Construct {
         POWERTOOLS_LOG_LEVEL: props.logLevel
       },
       logGroup,
-      layers: [insightsLambdaLayer]
+      layers: [insightsLambdaLayer, dependencyLayer]
     })
 
     // Suppress CFN guard rules for Lambda function

scripts/run_sync.sh

@@ -65,8 +65,8 @@ echo "Generating config for ${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
-pip3 install -r .requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction
+pip3 install -r .requirements_slackBotFunction -t packages/slackBotFunction/.dependencies
+pip3 install -r .requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction/.dependencies
 
 sync_epsam_app() {
     echo "Starting sync epsam CDK app"
@@ -82,4 +82,4 @@ sync_epsam_app() {
 }
 
 
-(trap 'kill 0' SIGINT; sync_epsam_app)
+# (trap 'kill 0' SIGINT; sync_epsam_app)