Merge branch 'master' into VED-1029-ea-set-acl

mfjarvis · web-flow · commit 61d0eaa9c011 · 2026-02-20T13:38:26.000Z
diff --git a/infrastructure/account/.terraform.lock.hcl b/infrastructure/account/.terraform.lock.hcl
diff --git a/infrastructure/account/cloudwatch_dashboards.tf b/infrastructure/account/cloudwatch_dashboards.tf
diff --git a/infrastructure/instance/.terraform.lock.hcl b/infrastructure/instance/.terraform.lock.hcl
diff --git a/infrastructure/instance/ack_lambda.tf b/infrastructure/instance/ack_lambda.tf
@@ -18,7 +18,7 @@ resource "aws_ecr_repository" "ack_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "ack_processor_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./ack_backend/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.ack_lambda_repository.name
diff --git a/infrastructure/instance/batch_processor_filter_lambda.tf b/infrastructure/instance/batch_processor_filter_lambda.tf
@@ -17,7 +17,7 @@ resource "aws_ecr_repository" "batch_processor_filter_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "batch_processor_filter_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./batch_processor_filter/Dockerfile"
 
   create_ecr_repo = false
diff --git a/infrastructure/instance/delta.tf b/infrastructure/instance/delta.tf
@@ -16,7 +16,7 @@ resource "aws_ecr_repository" "delta_lambda_repository" {
 
 module "delta_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./delta_backend/Dockerfile"
 
   create_ecr_repo = false
diff --git a/infrastructure/instance/ecs_batch_processor_config.tf b/infrastructure/instance/ecs_batch_processor_config.tf
@@ -27,7 +27,7 @@ resource "aws_ecr_repository" "processing_repository" {
 # Build and Push Docker Image to ECR (Reusing the existing module)
 module "processing_docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version = "8.5.0"
+  version = "8.7.0"
 
   create_ecr_repo  = false
   docker_file_path = "./recordprocessor/Dockerfile"
diff --git a/infrastructure/instance/file_name_processor.tf b/infrastructure/instance/file_name_processor.tf
@@ -17,7 +17,7 @@ resource "aws_ecr_repository" "file_name_processor_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "file_processor_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./filenameprocessor/Dockerfile"
 
   create_ecr_repo = false
diff --git a/infrastructure/instance/forwarder_lambda.tf b/infrastructure/instance/forwarder_lambda.tf
@@ -17,7 +17,7 @@ resource "aws_ecr_repository" "forwarder_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "forwarding_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./recordforwarder/Dockerfile"
 
   create_ecr_repo = false
diff --git a/infrastructure/instance/id_sync_lambda.tf b/infrastructure/instance/id_sync_lambda.tf
@@ -19,7 +19,7 @@ resource "aws_ecr_repository" "id_sync_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "id_sync_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./id_sync/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.id_sync_lambda_repository.name
diff --git a/infrastructure/instance/lambda.tf b/infrastructure/instance/lambda.tf
@@ -16,7 +16,7 @@ resource "aws_ecr_repository" "operation_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version = "8.5.0"
+  version = "8.7.0"
 
   create_ecr_repo  = false
   ecr_repo         = "${local.prefix}-operation-lambda-repo"
diff --git a/infrastructure/instance/mesh_processor.tf b/infrastructure/instance/mesh_processor.tf
@@ -35,7 +35,7 @@ module "mesh_processor_docker_image" {
   count = var.create_mesh_processor ? 1 : 0
 
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./mesh_processor/Dockerfile"
 
   create_ecr_repo = false
diff --git a/infrastructure/instance/redis_sync_lambda.tf b/infrastructure/instance/redis_sync_lambda.tf
@@ -19,7 +19,7 @@ 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.5.0"
+  version          = "8.7.0"
   docker_file_path = "./redis_sync/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.redis_sync_lambda_repository.name
diff --git a/lambdas/backend/src/search_imms_handler.py b/lambdas/backend/src/search_imms_handler.py
@@ -30,7 +30,7 @@ def search_imms(event: APIGatewayProxyEventV1, controller: FhirController):
     )
     parser.add_argument(
         "--immunization.target",
-        help="http://hl7.org/fhir/ValueSet/immunization-target-disease",  # NOSONAR(S5332)
+        help="http://hl7.org/fhir/ValueSet/immunization-target-disease",
         type=str,
         required=True,
         nargs="+",
diff --git a/lambdas/delta_backend/src/extractor.py b/lambdas/delta_backend/src/extractor.py
@@ -14,7 +14,7 @@ class Extractor:
     )
     EXTENSION_URL_SCT_DESC_DISPLAY = "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CodingSCTDescDisplay"
 
-    CODING_SYSTEM_URL_SNOMED = "http://snomed.info/sct"  # NOSONAR(S5332) this is a code system descriptor, not a URL
+    CODING_SYSTEM_URL_SNOMED = "http://snomed.info/sct"
     ODS_ORG_CODE_SYSTEM_URL = "https://fhir.nhs.uk/Id/ods-organization-code"
     DEFAULT_LOCATION = "X99999"
     NHS_NUMBER_SYSTEM_URL = "https://fhir.nhs.uk/Id/nhs-number"
diff --git a/lambdas/id_sync/src/pds_details.py b/lambdas/id_sync/src/pds_details.py
@@ -12,7 +12,7 @@
 from os_vars import get_pds_env
 
 pds_env = get_pds_env()
-safe_tmp_dir = tempfile.mkdtemp(dir="/tmp")  # NOSONAR(S5443)
+safe_tmp_dir = tempfile.mkdtemp(dir="/tmp")
 
 
 # Get Patient details from external service PDS using NHS number from MNS notification
diff --git a/lambdas/mesh_processor/src/converter.py b/lambdas/mesh_processor/src/converter.py
@@ -11,15 +11,13 @@
 
 
 def parse_headers(headers_str: str) -> dict[str, str]:
-    headers = dict(  # NOSONAR(S7494) force this to dict
-        header_str.split(":", 1) for header_str in headers_str.split("\r\n") if ":" in header_str
-    )
+    headers = dict(header_str.split(":", 1) for header_str in headers_str.split("\r\n") if ":" in header_str)
     return {k.strip(): v.strip() for k, v in headers.items()}
 
 
 def parse_header_value(header_value: str) -> tuple[str, dict[str, str]]:
     main_value, *params = header_value.split(";")
-    parsed_params = dict(param.strip().split("=", 1) for param in params)  # NOSONAR(S7494) force this to dict
+    parsed_params = dict(param.strip().split("=", 1) for param in params)
     parsed_params = {k: v.strip('"') for k, v in parsed_params.items()}
     return main_value, parsed_params
 
diff --git a/lambdas/mns_subscription/src/mns_setup.py b/lambdas/mns_subscription/src/mns_setup.py
@@ -12,7 +12,7 @@
 
 def get_mns_service(mns_env: str = "int"):
     boto_config = Config(region_name="eu-west-2")
-    cache = Cache(directory="/tmp")  # NOSONAR(S5443)
+    cache = Cache(directory="/tmp")
     logging.info("Creating authenticator...")
     # TODO: MNS and PDS need separate secrets
     authenticator = AppRestrictedAuth(
diff --git a/lambdas/shared/src/common/models/constants.py b/lambdas/shared/src/common/models/constants.py
@@ -67,7 +67,7 @@ class Urls:
 
     NHS_NUMBER = "https://fhir.nhs.uk/Id/nhs-number"
     VACCINATION_PROCEDURE = "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-VaccinationProcedure"
-    SNOMED = "http://snomed.info/sct"  # NOSONAR(S5332)
+    SNOMED = "http://snomed.info/sct"
     NHS_NUMBER_VERIFICATION_STATUS_STRUCTURE_DEFINITION = (
         "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus"
     )
@@ -76,7 +76,7 @@ class Urls:
     )
     ODS_ORGANIZATION_CODE = "https://fhir.nhs.uk/Id/ods-organization-code"
     URN_SCHOOL_NUMBER = "https://fhir.hl7.org.uk/Id/urn-school-number"
-    NULL_FLAVOUR_CODES = "http://terminology.hl7.org/CodeSystem/v3-NullFlavor"  # NOSONAR(S5332)
+    NULL_FLAVOUR_CODES = "http://terminology.hl7.org/CodeSystem/v3-NullFlavor"
 
 
 class RedisHashKeys:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/immunisation-fhir-api",
   "devDependencies": {
-    "@redocly/cli": "^2.18.2",
+    "@redocly/cli": "^2.19.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "prettier": "^3.8.1"
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -7,11 +7,10 @@ sonar.exclusions=**/proxies/**,**/utilities/scripts/**,**/infrastructure/account
 sonar.coverage.exclusions=lambdas/shared/src/common/models/batch_constants.py
 sonar.python.coverage.reportPaths=backend-coverage.xml,delta-coverage.xml,ack-lambda-coverage.xml,filenameprocessor-coverage.xml,recordforwarder-coverage.xml,recordprocessor-coverage.xml,mesh_processor-coverage.xml,redis_sync-coverage.xml,mns_subscription-coverage.xml,id_sync-coverage.xml,shared-coverage.xml,batchprocessorfilter-coverage.xml
 sonar.cpd.exclusions=**/Dockerfile
-sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls
-sonar.issue.ignore.multicriteria.exclude_snomed_urls.ruleKey=python:S5332
-sonar.issue.ignore.multicriteria.exclude_snomed_urls.resourceKey=**http://snomed\.info/sct**
-sonar.issue.ignore.multicriteria.exclude_hl7_urls.ruleKey=python:S5332
-sonar.issue.ignore.multicriteria.exclude_hl7_urls.resourceKey=**http://terminology\.hl7\.org/CodeSystem/v3-NullFlavor**
-sonar.issue.ignore.multicriteria=e1
-sonar.issue.ignore.multicriteria.e1.ruleKey=python:S5443
-sonar.issue.ignore.multicriteria.e1.resourceKey=**/mns_setup.py
+sonar.issue.ignore.multicriteria=exclude_http_urls,exclude_writable_dirs,exclude_force_dict
+sonar.issue.ignore.multicriteria.exclude_http_urls.ruleKey=python:S5332
+sonar.issue.ignore.multicriteria.exclude_http_urls.resourceKey=**/lambdas/**
+sonar.issue.ignore.multicriteria.exclude_writable_dirs.ruleKey=python:S5443
+sonar.issue.ignore.multicriteria.exclude_writable_dirs.resourceKey=**/lambdas/**
+sonar.issue.ignore.multicriteria.exclude_force_dict.ruleKey=python:S7494
+sonar.issue.ignore.multicriteria.exclude_force_dict.resourceKey=**/lambdas/**
