terraform and code changes on mns_publish

Author: motola

infrastructure/instance/mns_publisher.tf

@@ -7,6 +7,7 @@ module "mns_publisher" {
   enable_lambda_alarm                = var.error_alarm_notifications_enabled # consider just INT and PROD
   immunisation_account_id            = var.immunisation_account_id
   is_temp                            = local.is_temp
+  enable_mns_test_queue              = var.mns_environment == "dev"
   resource_scope                     = local.resource_scope
   imms_base_path                     = strcontains(var.sub_environment, "pr-") ? "immunisation-fhir-api/FHIR/R4-${var.sub_environment}" : "immunisation-fhir-api/FHIR/R4"
   lambda_kms_encryption_key_arn      = data.aws_kms_key.existing_lambda_encryption_key.arn

infrastructure/instance/modules/mns_publisher/mns_publisher_lambda.tf

@@ -192,7 +192,7 @@ resource "aws_lambda_function" "mns_publisher_lambda" {
   environment {
     variables = {
       SPLUNK_FIREHOSE_NAME   = var.splunk_firehose_stream_name
-      MNS_TEST_QUEUE_URL     = aws_sqs_queue.mns_test_notification[0].url
+      MNS_TEST_QUEUE_URL     = var.enable_mns_test_queue ? aws_sqs_queue.mns_test_notification[0].url : ""
       IMMUNIZATION_ENV       = var.resource_scope,
       IMMUNIZATION_BASE_PATH = var.imms_base_path
       PDS_ENV                = var.pds_environment

infrastructure/instance/modules/mns_publisher/sqs_test_publish_mns.tf

@@ -1,5 +1,5 @@
 resource "aws_sqs_queue" "mns_test_notification" {
-  count                      = var.mns_environment == "dev" ? 1 : 0
+  count                      = var.enable_mns_test_queue ? 1 : 0
   name                       = "${var.mns_test_notification_name_prefix}-queue"
   fifo_queue                 = false
   message_retention_seconds  = 86400
@@ -8,7 +8,7 @@ resource "aws_sqs_queue" "mns_test_notification" {
 
 
 data "aws_iam_policy_document" "mns_test_notification_sqs_policy" {
-  count = var.mns_environment == "dev" ? 1 : 0
+  count = var.enable_mns_test_queue ? 1 : 0
   statement {
     sid    = "mns-test-notification-allow-lambda-access"
     effect = "Allow"
@@ -29,18 +29,17 @@ data "aws_iam_policy_document" "mns_test_notification_sqs_policy" {
 }
 
 resource "aws_sqs_queue_policy" "mns_test_notification_sqs" {
-  count     = var.mns_environment == "dev" ? 1 : 0
+  count     = var.enable_mns_test_queue ? 1 : 0
   queue_url = aws_sqs_queue.mns_test_notification[0].id
   policy    = data.aws_iam_policy_document.mns_test_notification_sqs_policy[0].json
 }
 
 output "mns_test_queue_url" {
-  value       = var.mns_environment == "dev" ? aws_sqs_queue.mns_test_notification[0].url : null
+  value       = var.enable_mns_test_queue ? aws_sqs_queue.mns_test_notification[0].url : null
   description = "URL of the MNS test notifications queue"
 }
 
 output "mns_test_queue_arn" {
-  value       = var.mns_environment == "dev" ? aws_sqs_queue.mns_test_notification[0].arn : 0
+  value       = var.enable_mns_test_queue ? aws_sqs_queue.mns_test_notification[0].arn : null
   description = "ARN of the MNS test notifications queue"
-}
-
+}

infrastructure/instance/modules/mns_publisher/variables.tf

@@ -107,4 +107,10 @@ variable "secrets_manager_policy_path" {
 variable "mns_test_notification_name_prefix" {
   type        = string
   description = "The prefix for the name of resources for testing mns notification"
+}
+
+variable "enable_mns_test_queue" {
+  description = "Enable test SQS queue for MNS notifications (dev only)"
+  type        = bool
+  default     = false
 }

lambdas/mns_publisher/src/constants.py

@@ -1,33 +1,5 @@
-from typing import TypedDict
-
 # Static constants for the MNS notification creation process
 SPEC_VERSION = "1.0"
 IMMUNISATION_TYPE = "imms-vaccinations-1"
 
-
-# Fields from the incoming SQS message that forms part of the base schema and filtering attributes for MNS notifications
-class FilteringData(TypedDict):
-    """MNS notification filtering attributes."""
-
-    generalpractitioner: str | None
-    sourceorganisation: str
-    sourceapplication: str
-    subjectage: int
-    immunisationtype: str
-    action: str
-
-
-class MnsNotificationPayload(TypedDict):
-    """CloudEvents-compliant MNS notification payload."""
-
-    specversion: str
-    id: str
-    source: str
-    type: str
-    time: str
-    subject: str
-    dataref: str
-    filtering: FilteringData
-
-
 DYNAMO_DB_TYPE_DESCRIPTORS = ("S", "N", "BOOL", "M", "L")

lambdas/mns_publisher/src/create_notification.py

@@ -6,10 +6,11 @@
 
 from aws_lambda_typing.events.sqs import SQSMessage
 
+from common.api_clients.constants import MnsNotificationPayload
 from common.api_clients.get_pds_details import pds_get_patient_details
 from common.clients import logger
 from common.get_service_url import get_service_url
-from constants import DYNAMO_DB_TYPE_DESCRIPTORS, IMMUNISATION_TYPE, SPEC_VERSION, MnsNotificationPayload
+from constants import DYNAMO_DB_TYPE_DESCRIPTORS, IMMUNISATION_TYPE, SPEC_VERSION
 
 IMMUNIZATION_ENV = os.getenv("IMMUNIZATION_ENV")
 IMMUNIZATION_BASE_PATH = os.getenv("IMMUNIZATION_BASE_PATH")

lambdas/shared/src/common/api_clients/constants.py

@@ -1,3 +1,5 @@
+from typing import TypedDict
+
 """Constants used by API clients"""
 
 
@@ -8,3 +10,28 @@ class Constants:
     DEFAULT_API_CLIENTS_TIMEOUT = 5
     API_CLIENTS_MAX_RETRIES = 2
     API_CLIENTS_BACKOFF_SECONDS = 0.5
+
+
+# Fields from the incoming SQS message that forms part of the base schema and filtering attributes for MNS notifications
+class FilteringData(TypedDict):
+    """MNS notification filtering attributes."""
+
+    generalpractitioner: str | None
+    sourceorganisation: str
+    sourceapplication: str
+    subjectage: int
+    immunisationtype: str
+    action: str
+
+
+class MnsNotificationPayload(TypedDict):
+    """CloudEvents-compliant MNS notification payload."""
+
+    specversion: str
+    id: str
+    source: str
+    type: str
+    time: str
+    subject: str
+    dataref: str
+    filtering: FilteringData

lambdas/shared/src/common/api_clients/mock_mns_service.py

@@ -3,6 +3,7 @@
 
 import boto3
 
+from common.api_clients.constants import MnsNotificationPayload
 from common.clients import logger
 
 REGION_NAME = os.getenv("AWS_REGION", "eu-west-2")
@@ -11,13 +12,10 @@
 class MockMnsService:
     def __init__(self, queue_url):
         self.queue_url = queue_url
-        self.sqs_client = self._get_sqs_client()
+        self.sqs_client = boto3.client("sqs", region_name=REGION_NAME)
         logger.info(f"MockMnsService initialized with queue: {queue_url}")
 
-    def _get_sqs_client(self):
-        return boto3.client("sqs", region_name=REGION_NAME)
-
-    def publish_notification(self, mns_payload: dict) -> None:
+    def publish_notification(self, mns_payload: MnsNotificationPayload) -> None:
         """
         Send MNS notification payload to test SQS queue as fallback.
         Args: payload: MNS notification payload