terraform, sonar, github

Author: JamesW1-NHS

.github/dependabot.yml

@@ -58,7 +58,7 @@ updates:
       - "/filenameprocessor"
       - "/mesh_processor"
       - "/recordprocessor"
-      - "/redis_sync"
+      - "/lambdas/redis_sync"
       - "/lambdas/id_sync"
       - "/lambdas/shared"
       - "/mns_subscription"

.github/workflows/sonarcloud.yml

@@ -135,15 +135,15 @@ jobs:
           poetry run coverage xml -o ../mns_subscription-coverage.xml
 
       - name: Run unittest with redis_sync
-        working-directory: redis_sync
+        working-directory: lambdas/redis_sync
         id: redis_sync
         env:
-          PYTHONPATH: ${{ github.workspace }}/redis_sync/src:${{ github.workspace }}/redis_sync/tests
+          PYTHONPATH: ${{ env.LAMBDA_PATH }}/redis_sync/src:${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
             poetry install
-            poetry run coverage run -m unittest discover || echo "redis_sync tests failed" >> ../failed_tests.txt
-            poetry run coverage xml -o ../redis_sync-coverage.xml
+            poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover || echo "redis_sync tests failed" >> ../../failed_tests.txt
+            poetry run coverage xml -o ../../redis_sync-coverage.xml
 
       - name: Run unittest with shared
         working-directory: lambdas/shared

Makefile

@@ -1,6 +1,6 @@
 SHELL=/usr/bin/env bash -euo pipefail
 
-PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = ack_backend backend batch_processor_filter delta_backend filenameprocessor mesh_processor recordprocessor redis_sync lambdas/id_sync lambdas/shared mns_subscription
+PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = ack_backend backend batch_processor_filter delta_backend filenameprocessor mesh_processor recordprocessor lambdas/redis_sync lambdas/id_sync lambdas/shared mns_subscription
 PYTHON_PROJECT_DIRS = e2e e2e_batch $(PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS)
 
 #Installs dependencies using poetry.

immunisation-fhir-api.code-workspace

@@ -28,7 +28,7 @@
 			"path": "e2e_batch"
 		},
         {
-            "path": "redis_sync"
+            "path": "lambdas/redis_sync"
         },
 		{
             "path": "mns_subscription"

lambdas/.coveragerc

@@ -6,3 +6,6 @@ omit =
     id_sync/tests/*
     id_sync/tests/*/*
     id_sync/tests/*/*/*
+    redis_sync/tests/*
+    redis_sync/tests/*/*
+    redis_sync/tests/*/*/*

terraform/redis_sync_lambda.tf

@@ -1,8 +1,16 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  redis_sync_lambda_dir     = abspath("${path.root}/../redis_sync")
-  redis_sync_lambda_files   = fileset(local.redis_sync_lambda_dir, "**")
+  shared_dir         = abspath("${path.root}/../shared")
+  redis_sync_lambda_dir = abspath("${path.root}/../redis_sync")
+
+  # Get files from both directories
+  shared_files         = fileset(local.shared_dir, "**")
+  redis_sync_lambda_files = fileset(local.redis_sync_lambda_dir, "**")
+
+  # Calculate SHA for both directories
+  shared_dir_sha            = sha1(join("", [for f in local.shared_files : filesha1("${local.shared_dir}/${f}")]))
   redis_sync_lambda_dir_sha = sha1(join("", [for f in local.redis_sync_lambda_files : filesha1("${local.redis_sync_lambda_dir}/${f}")]))
+  redis_sync_lambda_name    = "${local.short_prefix}-redis_sync_lambda"
 }
 
 resource "aws_ecr_repository" "redis_sync_lambda_repository" {
@@ -15,11 +23,11 @@ resource "aws_ecr_repository" "redis_sync_lambda_repository" {
 
 # Module for building and pushing Docker image to ECR
 module "redis_sync_docker_image" {
-  source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version = "8.0.1"
-
-  create_ecr_repo = false
-  ecr_repo        = aws_ecr_repository.redis_sync_lambda_repository.name
+  source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
+  version          = "8.0.1"
+  docker_file_path = "./redis_sync/Dockerfile"
+  create_ecr_repo  = false
+  ecr_repo         = aws_ecr_repository.redis_sync_lambda_repository.name
   ecr_repo_lifecycle_policy = jsonencode({
     "rules" : [
       {