Merge branch 'VED-81-Number-Update' into VED-480-Number-Update-terraform

JamesW1-NHS · JamesW1-NHS · commit aae2c94b8580 · 2025-07-21T11:35:20.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -73,7 +73,6 @@ updates:
     directories:
       - "/grafana/non-prod/terraform"
       - "/infra"
-      - "/mesh-infra"
       - "/terraform"
       - "/terraform_aws_backup/**"
     schedule:
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -140,6 +140,7 @@ jobs:
           PYTHONPATH: ${{ env.SHARED_PATH }}
         continue-on-error: true
         run: |
+            echo "shared coverage - Current directory: $(pwd)"
             poetry env use 3.11
             poetry install
             poetry run coverage run -m unittest discover || echo "shared tests failed" >> ../../failed_tests.txt
@@ -152,14 +153,21 @@ jobs:
           PYTHONPATH: ${{ env.LAMBDA_PATH }}/id_sync/src:${{ env.LAMBDA_PATH }}/id_sync/tests:${{ env.SHARED_PATH }}
         continue-on-error: true
         run: |
+            echo "id_sync coverage - Current directory: $(pwd)"
             poetry env use 3.11
             poetry install
             poetry run coverage run -m unittest discover || echo "id_sync tests failed" >> ../../failed_tests.txt
             poetry run coverage xml -o ../../id_sync-coverage.xml
+            #check files created
+            if [ ! -f ../../id_sync-coverage.xml ]; then
+              echo "id_sync-coverage.xml not found, exiting with error"
+            fi
 
       - name: Run Test Failure Summary
         id: check_failure
         run: |
+          echo "Checking for test failures..."
+          ls *-coverage.xml
           if [ -s failed_tests.txt ]; then
             echo "The following tests failed:"
             cat failed_tests.txt
diff --git a/README.md b/README.md
@@ -46,7 +46,6 @@ See https://nhsd-confluence.digital.nhs.uk/display/APM/Glossary.
 | `terraform_old`        | Old tf code used to create INT to mimic prod. |
 | `terraform_sandbox`    | Sandbox environment for testing infrastructure changes. |
 | `terraform_aws_backup` | Streamlined backup processing with AWS. |
-| `mesh-infra`           | Infrastructure setup for Imms batch MESH integration. |
 | `proxies`              | Apigee API proxy definitions. |
 ---
 
diff --git a/infra/.terraform.lock.hcl b/infra/.terraform.lock.hcl
diff --git a/infra/environments/int/variables.tfvars b/infra/environments/int/variables.tfvars
@@ -7,3 +7,5 @@ dspp_admin_role          = "root"
 environment              = "int"
 parent_route53_zone_name = "int.vds.platform.nhs.uk"
 child_route53_zone_name  = "imms.int.vds.platform.nhs.uk"
+mesh_mailbox_id          = "X26OT303"
+mesh_dlq_mailbox_id      = "X26OT304"
diff --git a/infra/environments/non-prod/variables.tfvars b/infra/environments/non-prod/variables.tfvars
@@ -7,3 +7,8 @@ dspp_admin_role          = "root"
 environment              = "dev"
 parent_route53_zone_name = "dev.vds.platform.nhs.uk"
 child_route53_zone_name  = "imms.dev.vds.platform.nhs.uk"
+# TODO - null these out once we're using the int account
+# mesh_mailbox_id          = null
+# mesh_dlq_mailbox_id      = null
+mesh_mailbox_id          = "X26OT303"
+mesh_dlq_mailbox_id      = "X26OT304"
diff --git a/infra/environments/prod/variables.tfvars b/infra/environments/prod/variables.tfvars
@@ -7,3 +7,5 @@ dspp_admin_role          = "root"
 environment              = "prod"
 parent_route53_zone_name = "prod.vds.platform.nhs.uk"
 child_route53_zone_name  = "imms.prod.vds.platform.nhs.uk"
+mesh_mailbox_id          = "X26HC138"
+mesh_dlq_mailbox_id      = null
diff --git a/infra/mesh.tf b/infra/mesh.tf
@@ -0,0 +1,15 @@
+# MESH Client Module - conditionally created based on environment configuration
+module "mesh" {
+  count  = var.mesh_mailbox_id != null ? 1 : 0
+  source = "git::https://github.com/nhsdigital/terraform-aws-mesh-client.git//module?ref=v2.1.5"
+
+  name_prefix                    = "imms-${var.environment}"
+  account_id                     = var.imms_account_id
+  mesh_env                       = var.environment == "prod"? "production" : "integration"
+  subnet_ids                     = toset([])
+  mailbox_ids                    = [var.mesh_mailbox_id]
+
+  compress_threshold             = 1 * 1024 * 1024
+  get_message_max_concurrency    = 10
+  handshake_schedule             = "rate(24 hours)"
+}
diff --git a/infra/variables.tf b/infra/variables.tf
@@ -16,3 +16,9 @@ variable "build_agent_account_id" {
 variable "environment" {
   default = "non-prod"
 }
+variable "mesh_mailbox_id" {
+  default = null
+}
+variable "mesh_dlq_mailbox_id" {
+  default = null
+}
diff --git a/lambdas/id_sync/Dockerfile b/lambdas/id_sync/Dockerfile
@@ -6,15 +6,37 @@ RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:' >> /etc/group && \
     chown -R 1001:1001 /home/appuser && pip install "poetry~=1.5.0"
 
-# Install Poetry as root
-COPY poetry.lock pyproject.toml README.md ./
+# Install Poetry dependencies
+# Copy shared Poetry files first
+COPY shared/poetry.lock shared/pyproject.toml shared/README.md ./shared/
+# Copy id_sync Poetry files
+COPY id_sync/poetry.lock id_sync/pyproject.toml id_sync/README.md ./
+
+# Install shared dependencies first
+WORKDIR /var/task/shared
+RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
+
+# Install id_sync dependencies
+WORKDIR /var/task
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
 
 # -----------------------------
 FROM base AS build
-COPY src .
-COPY ../shared/src/common ./common
+
+# Set working directory back to Lambda task root
+WORKDIR /var/task
+
+# Copy shared source code
+COPY shared/src/common ./common
+
+# Copy id_sync source code
+COPY id_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 ["id_sync.handler"]
diff --git a/lambdas/id_sync/Makefile b/lambdas/id_sync/Makefile
@@ -1,16 +1,16 @@
 TEST_ENV := @PYTHONPATH=src:tests:../shared/src
 
 test:
-    $(TEST_ENV) python -m unittest
+	$(TEST_ENV) python -m unittest
 
 coverage-run:
-    $(TEST_ENV) coverage run -m unittest discover -v
+	$(TEST_ENV) coverage run -m unittest discover -v
 
 coverage-report:
-    $(TEST_ENV) coverage report -m
+	$(TEST_ENV) coverage report -m
 
 coverage-html:
-    $(TEST_ENV) coverage html
+	$(TEST_ENV) coverage html
 
 
 .PHONY: build package
diff --git a/lambdas/id_sync/pyproject.toml b/lambdas/id_sync/pyproject.toml
@@ -14,7 +14,7 @@ authors = ["s.wates <stephen.wates1@nhs.net>"]
 readme = "README.md"
 packages = [
     {include = "src"},
-    {include = "common", from = "../shared/src/common"}
+    {include = "common", from = "../shared/src"}
 ]
 
 [tool.poetry.dependencies]
diff --git a/lambdas/id_sync/src/id_sync.py b/lambdas/id_sync/src/id_sync.py
@@ -1,5 +1,5 @@
 from common.clients import logger
-from clients import STREAM_NAME
+from common.clients import STREAM_NAME
 from common.log_decorator import logging_decorator
 from record_processor import process_record
 
diff --git a/lambdas/shared/pyproject.toml b/lambdas/shared/pyproject.toml
@@ -13,8 +13,8 @@ description = ""
 authors = ["s.wates <stephen.wates1@nhs.net>"]
 readme = "README.md"
 packages = [
-    {include = "src"},
-    {include = "common", from = "src"}
+    {include = "common", from = "src"},
+    {include = "aws", from = "src"}
 ]
 
 [tool.poetry.dependencies]
diff --git a/lambdas/shared/src/common/sqs_event.py b/lambdas/shared/src/common/sqs_event.py
@@ -0,0 +1,15 @@
+from typing import List, Dict, Any
+from common.sqs_event_record import SQSEventRecord
+
+
+class SQSEvent:
+    def __init__(self, records: List[SQSEventRecord]):
+        self.records = records
+
+    @classmethod
+    def from_event(cls, event: Dict[str, Any]):
+        records = [SQSEventRecord.from_dict(record) for record in event.get('Records', [])]
+        return cls(records=records)
+
+    def __repr__(self):
+        return f"<SQSEvent records={len(self.records)}>"
diff --git a/lambdas/shared/src/common/sqs_event_record.py b/lambdas/shared/src/common/sqs_event_record.py
@@ -0,0 +1,33 @@
+from typing import Dict, Any
+
+
+class SQSEventRecord:
+    def __init__(self, message_id: str, receipt_handle: str, body: str, attributes: Dict[str, str],
+                 message_attributes: Dict[str, Any], md5_of_body: str, event_source: str,
+                 event_source_arn: str, aws_region: str):
+        self.message_id = message_id
+        self.receipt_handle = receipt_handle
+        self.body = body
+        self.attributes = attributes
+        self.message_attributes = message_attributes
+        self.md5_of_body = md5_of_body
+        self.event_source = event_source
+        self.event_source_arn = event_source_arn
+        self.aws_region = aws_region
+
+    @classmethod
+    def from_dict(cls, record: Dict[str, Any]):
+        return cls(
+            message_id=record['messageId'],
+            receipt_handle=record['receiptHandle'],
+            body=record['body'],
+            attributes=record.get('attributes', {}),
+            message_attributes=record.get('messageAttributes', {}),
+            md5_of_body=record['md5OfBody'],
+            event_source=record['eventSource'],
+            event_source_arn=record['eventSourceARN'],
+            aws_region=record['awsRegion']
+        )
+
+    def __repr__(self):
+        return f"<SQSEventRecord id={self.message_id}>"
diff --git a/lambdas/shared/tests/test_common/test_sqs_event.py b/lambdas/shared/tests/test_common/test_sqs_event.py
@@ -0,0 +1,57 @@
+import unittest
+from unittest.mock import patch, MagicMock
+from common.sqs_event import SQSEvent
+
+
+class TestSQSEvent(unittest.TestCase):
+
+    def setUp(self):
+        self.sample_event = {
+            "Records": [
+                {
+                    "messageId": "abc-123",
+                    "receiptHandle": "SomeHandle",
+                    "body": "{\"foo\": \"bar\"}",
+                    "attributes": {},
+                    "messageAttributes": {},
+                    "md5OfBody": "dummyhash",
+                    "eventSource": "aws:sqs",
+                    "eventSourceARN": "arn:aws:sqs:region:acct:queue",
+                    "awsRegion": "us-east-1"
+                }
+            ]
+        }
+
+    @patch('common.sqs_event.SQSEventRecord')
+    def test_from_event_creates_correct_number_of_records(self, mock_record_class):
+        # Arrange
+        mock_record_instance = MagicMock()
+        mock_record_class.from_dict.return_value = mock_record_instance
+
+        # Act
+        event = SQSEvent.from_event(self.sample_event)
+
+        # Assert
+        self.assertEqual(len(event.records), 1)
+        self.assertIs(event.records[0], mock_record_instance)
+        mock_record_class.from_dict.assert_called_once_with(self.sample_event["Records"][0])
+
+    @patch('common.sqs_event.SQSEventRecord')
+    def test_from_event_handles_empty_records(self, mock_record_class):
+        # Act
+        event = SQSEvent.from_event({"Records": []})
+
+        # Assert
+        self.assertEqual(len(event.records), 0)
+        mock_record_class.from_dict.assert_not_called()
+
+    def test_repr(self):
+        # Simulate a dummy record object
+        dummy_event = SQSEvent(records=["fake_record_1", "fake_record_2"])
+        repr_str = repr(dummy_event)
+        self.assertIn("SQSEvent", repr_str)
+        self.assertIn("records=2", repr_str)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/lambdas/shared/tests/test_common/test_sqs_event_record.py b/lambdas/shared/tests/test_common/test_sqs_event_record.py
diff --git a/mesh-infra/main.tf b/mesh-infra/main.tf
diff --git a/sonar-project.properties b/sonar-project.properties
diff --git a/terraform/id_sync_lambda.tf b/terraform/id_sync_lambda.tf
diff --git a/terraform/mesh_processor.tf b/terraform/mesh_processor.tf
diff --git a/terraform/variables.tf b/terraform/variables.tf
