use queue url to trigger notification to SQS

Author: motola

infrastructure/instance/mns_publisher.tf

@@ -11,7 +11,7 @@ module "mns_publisher" {
   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
   mns_publisher_resource_name_prefix = "${local.resource_scope}-mns-outbound-events"
-  mns_test_notifcation_name_prefix   = "${local.resource_scope}-mns-test-notification"
+  mns_test_notification_name_prefix  = "${local.resource_scope}-mns-test-notification"
   secrets_manager_policy_path        = "${local.policy_path}/secret_manager.json"
   account_id                         = data.aws_caller_identity.current.account_id
   pds_environment                    = var.pds_environment

infrastructure/instance/modules/mns_publisher/sqs_test_publish_mns.tf

@@ -1,6 +1,8 @@
-# Main queue for MNS notification testing
+# TODO: Remove when MNS platform authorizes imms-vaccinations-1 event type
+# Temporary SQS queue for testing MNS notifications until MNS HTTP endpoint is available
+
 resource "aws_sqs_queue" "mns_test_notification" {
-  name                       = "${var.mns_test_notifcation_name_prefix}-queue"
+  name                       = "${var.mns_test_notification_name_prefix}-queue"
   fifo_queue                 = false
   kms_master_key_id          = aws_kms_key.mns_outbound_events.arn
   visibility_timeout_seconds = 300

infrastructure/instance/modules/mns_publisher/variables.tf

@@ -104,7 +104,7 @@ variable "secrets_manager_policy_path" {
   description = "Path to the IAM policy JSON template for Secrets Manager access (e.g., ./policies/secret_manager.json)."
 }
 
-variable "mns_test_notifcation_name_prefix" {
+variable "mns_test_notification_name_prefix" {
   type        = string
   description = "The prefix for the name of resources for testing mns notification"
 }

lambdas/mns_publisher/src/mns_test_queue.py

@@ -9,6 +9,8 @@
 sqs_client = boto3.client("sqs", region_name="eu-west-2")
 
 
+# TODO: Remove when MNS platform authorizes imms-vaccinations-1 event type
+# Temporary function to send MNS to SQS Queue for testing MNS notifications until MNS HTTP endpoint is available
 def send_notification_to_test_queue(mns_payload: dict) -> None:
     """
     Send MNS notification payload to test SQS queue as fallback.

lambdas/mns_publisher/src/process_records.py

@@ -11,6 +11,7 @@
 from mns_test_queue import send_notification_to_test_queue
 
 mns_env = os.getenv("MNS_ENV", "int")
+MNS_TEST_QUEUE_URL = os.getenv("MNS_TEST_QUEUE_URL")
 
 
 def process_records(records: list[SQSMessage]) -> dict[str, list]:
@@ -63,12 +64,14 @@ def process_record(record: SQSMessage, mns_service: MnsService) -> None:
         },
     )
 
-    try:
+    # TODO: Remove when MNS platform authorizes imms-vaccinations-1 event type
+    # Temporary SQS queue for testing MNS notifications until MNS HTTP endpoint is available
+    if MNS_TEST_QUEUE_URL:
+        send_notification_to_test_queue(mns_notification_payload)
+        logger.info("Notification Successfully sent to SQS", extra={"notification_id": notification_id})
+    else:
         mns_service.publish_notification(mns_notification_payload)
         logger.info("Successfully created MNS notification", extra={"mns_notification_id": notification_id})
-    except Exception:
-        send_notification_to_test_queue(mns_notification_payload)
-        raise
 
 
 def extract_trace_ids(record: SQSMessage) -> Tuple[str, str | None]: