Merge branch 'VED-81-Numner-Update-pipeline-fix' into VED-480-Number-Update-pipeline-fix

Author: JamesW1-NHS

Makefile

@@ -1,6 +1,6 @@
 SHELL=/usr/bin/env bash -euo pipefail
 
-PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = ack_backend backend delta_backend filenameprocessor mesh_processor recordprocessor redis_sync lambdas/id_sync
+PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = ack_backend backend delta_backend filenameprocessor mesh_processor recordprocessor redis_sync lambdas/id_sync lambdas/shared
 PYTHON_PROJECT_DIRS = e2e e2e_batch $(PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS)
 
 #Installs dependencies using poetry.
@@ -41,7 +41,7 @@ build-proxy:
 	scripts/build_proxy.sh
 
 #Files to loop over in release
-_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. specification sandbox terraform scripts $(PYTHON_PROJECT_DIRS)"
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. specification sandbox terraform scripts $(PYTHON_PROJECT_DIRS) $(PYTHON_LAMBDA_DEPENDENCIES)"
 
 
 #Create /dist/ sub-directory and copy files into directory

azure/templates/post-deploy.yml

@@ -56,13 +56,8 @@ steps:
         echo Apigee environment: $APIGEE_ENVIRONMENT
         echo pr_no: $pr_no
 
+        echo "Output dirs"
         ls
-        cd lambdas
-        ls 
-        cd id_sync
-        ls
-        cd ..
-        cd ..
         cd terraform
 
         make init

lambdas/id_sync/Dockerfile

@@ -8,9 +8,8 @@ RUN mkdir -p /home/appuser && \
 
 # Install Poetry dependencies
 # Copy id_sync Poetry files
-COPY id_sync/poetry.lock id_sync/pyproject.toml id_sync/README.md ./
-# Copy shared/src/common to ./src/common
-COPY shared/src/common ./src/common
+COPY ./id_sync/poetry.lock ./id_sync/pyproject.toml ./
+COPY ./shared/src/common ./src/common
 
 RUN echo "Listing /var/task after source code copy:" && ls -R /var/task
 
@@ -25,10 +24,10 @@ FROM base AS build
 WORKDIR /var/task
 
 # Copy shared source code
-COPY ../shared/src/common ./common
+COPY ./shared/src/common ./common
 
 # Copy id_sync source code
-COPY src .
+COPY ./id_sync/src .
 
 # Set correct permissions
 RUN chmod 644 $(find . -type f) && chmod 755 $(find . -type d)

terraform/id_sync_lambda.tf

@@ -1,9 +1,7 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  lambdas_dir        = abspath("${path.root}/../lambdas")
-  shared_dir         = "${local.lambdas_dir}/shared"
-  id_sync_lambda_dir = abspath("${path.root}/../lambdas/id_sync")
-  id_sync_dockerfile = "${local.lambdas_dir}/id_sync.Dockerfile"
+  shared_dir         = abspath("${path.root}/../shared")
+  id_sync_lambda_dir = abspath("${path.root}/../id_sync")
 
   # Get files from both directories
   shared_files         = fileset(local.shared_dir, "**")
@@ -27,7 +25,7 @@ resource "aws_ecr_repository" "id_sync_lambda_repository" {
 module "id_sync_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version          = "8.0.1"
-  docker_file_path = "Dockerfile"
+  docker_file_path = "./id_sync/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.id_sync_lambda_repository.name
   ecr_repo_lifecycle_policy = jsonencode({
@@ -49,7 +47,7 @@ module "id_sync_docker_image" {
 
   platform      = "linux/amd64"
   use_image_tag = false
-  source_path   = local.id_sync_lambda_dir
+  source_path   = abspath("${path.root}/..")
   triggers = {
     dir_sha = local.id_sync_lambda_dir_sha
   }