Merge branch 'master' into VED-787-OAS-Update

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 --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/id_sync/src/id_sync.py

@@ -6,9 +6,9 @@
 """
 
 from typing import Any, Dict
+from common.aws_lambda_event import AwsLambdaEvent
 from common.clients import logger, STREAM_NAME
 from common.log_decorator import logging_decorator
-from common.aws_lambda_event import AwsLambdaEvent
 from exceptions.id_sync_exception import IdSyncException
 from record_processor import process_record
 

lambdas/id_sync/src/pds_details.py

@@ -2,11 +2,11 @@
     Operations related to PDS (Patient Demographic Service)
 '''
 import tempfile
-from common.clients import logger, secrets_manager_client
-from common.cache import Cache
 from os_vars import get_pds_env
-from common.pds_service import PdsService
 from common.authentication import AppRestrictedAuth, Service
+from common.cache import Cache
+from common.clients import logger, secrets_manager_client
+from common.pds_service import PdsService
 from exceptions.id_sync_exception import IdSyncException
 
 pds_env = get_pds_env()

lambdas/redis_sync/.vscode/settings.json.default

@@ -0,0 +1,27 @@
+{
+    "python.analysis.extraPaths": [
+        "./src"
+    ],
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./",
+        "-p",
+        "test_*.py"
+    ],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true,
+    "pylint.args": [
+        "--init-hook",
+        "import sys; sys.path.append('./src')"
+    ],
+    "[makefile]": {
+        "editor.insertSpaces": false,
+        "editor.detectIndentation": false
+    },
+    "files.trimTrailingWhitespace": true,
+    "[python]": {
+        "files.trimTrailingWhitespace": true
+    },
+    "files.insertFinalNewline": true
+}

redis_sync/Dockerfile lambdas/redis_sync/Dockerfileredis_sync/Dockerfile renamed to lambdas/redis_sync/Dockerfile

@@ -6,20 +6,34 @@ RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:' >> /etc/group && \
     chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
-# Install Poetry as root
-COPY poetry.lock pyproject.toml README.md ./
+# Install Poetry dependencies
+# Copy redis_sync Poetry files
+COPY ./redis_sync/poetry.lock ./redis_sync/pyproject.toml ./
+COPY ./shared/src/common ./src/common
+
+RUN echo "Listing /var/task after source code copy:" && ls -R /var/task
+
+# Install redis_sync dependencies
+WORKDIR /var/task
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
-# -----------------------------
-FROM base AS test
-COPY src src
-COPY tests tests
-RUN poetry install --no-interaction --no-ansi --no-root && \
-    pytest --disable-warnings tests
 
 # -----------------------------
 FROM base AS build
-COPY src .
+
+# Set working directory back to Lambda task root
+WORKDIR /var/task
+
+# Copy shared source code
+COPY ./shared/src/common ./common
+
+# Copy redis_sync source code
+COPY ./redis_sync/src .
+
+# Set correct permissions
 RUN chmod 644 $(find . -type f) && chmod 755 $(find . -type d)
+
 # Build as non-root user
 USER 1001:1001
+
+# Set the Lambda handler
 CMD ["redis_sync.handler"]

lambdas/redis_sync/Makefile

@@ -0,0 +1,16 @@
+TEST_ENV := @PYTHONPATH=src:tests:../shared/src
+
+test:
+	$(TEST_ENV) python -m unittest
+
+coverage-run:
+	$(TEST_ENV) coverage run -m unittest discover -v
+
+coverage-report:
+	$(TEST_ENV) coverage report -m
+
+coverage-html:
+	$(TEST_ENV) coverage html
+
+
+.PHONY: build package