enable test queue only in dev

Author: motola

infrastructure/instance/environments/dev/internal-dev/variables.tfvars

@@ -2,6 +2,7 @@ environment                       = "dev"
 immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
+enable_mns_test_queue             = true
 mns_environment                   = "int"
 error_alarm_notifications_enabled = true
 create_mesh_processor             = false

infrastructure/instance/environments/dev/internal-qa/variables.tfvars

@@ -2,6 +2,7 @@ environment                       = "dev"
 immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
+enable_mns_test_queue             = true
 mns_environment                   = "int"
 error_alarm_notifications_enabled = false
 mns_publisher_feature_enabled     = true

infrastructure/instance/environments/dev/pr/variables.tfvars

@@ -2,6 +2,7 @@ environment                       = "dev"
 immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
+enable_mns_test_queue             = true
 mns_environment                   = "int"
 error_alarm_notifications_enabled = false
 mns_publisher_feature_enabled     = true # Switch this off once tested fully e2e in Lambda branch

infrastructure/instance/environments/dev/ref/variables.tfvars

@@ -2,6 +2,7 @@ environment                       = "dev"
 immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "ref"
+enable_mns_test_queue             = true
 mns_environment                   = "int"
 error_alarm_notifications_enabled = true
 create_mesh_processor             = false

infrastructure/instance/mns_publisher.tf

@@ -14,6 +14,7 @@ module "mns_publisher" {
   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
+  enable_mns_test_queue              = var.enable_mns_test_queue
   pds_environment                    = var.pds_environment
   mns_environment                    = var.mns_environment
 

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.url
+      MNS_TEST_QUEUE_URL     = aws_sqs_queue.mns_test_notification[1].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,7 +1,5 @@
-# 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" {
+  count                      = var.enable_mns_test_queue ? 1 : 0
   name                       = "${var.mns_test_notification_name_prefix}-queue"
   fifo_queue                 = false
   message_retention_seconds  = 86400
@@ -24,23 +22,23 @@ data "aws_iam_policy_document" "mns_test_notification_sqs_policy" {
     ]
 
     resources = [
-      aws_sqs_queue.mns_test_notification.arn
+      aws_sqs_queue.mns_test_notification[0].arn
     ]
   }
 }
 
 resource "aws_sqs_queue_policy" "mns_test_notification_sqs" {
-  queue_url = aws_sqs_queue.mns_test_notification.id
+  queue_url = aws_sqs_queue.mns_test_notification[0].id
   policy    = data.aws_iam_policy_document.mns_test_notification_sqs_policy.json
 }
 
 output "mns_test_queue_url" {
-  value       = aws_sqs_queue.mns_test_notification.url
+  value       = aws_sqs_queue.mns_test_notification[0].url
   description = "URL of the MNS test notifications queue"
 }
 
 output "mns_test_queue_arn" {
-  value       = aws_sqs_queue.mns_test_notification.arn
+  value       = aws_sqs_queue.mns_test_notification[0].arn
   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
 }

infrastructure/instance/variables.tf

@@ -97,6 +97,12 @@ variable "mns_publisher_feature_enabled" {
   type        = bool
 }
 
+variable "enable_mns_test_queue" {
+  description = "Enable test SQS queue for MNS notifications (dev only)"
+  type        = bool
+  default     = false
+}
+
 variable "has_sub_environment_scope" {
   description = "True if the sub-environment is a standalone environment, e.g. internal-dev. False if it is part of a blue-green split, e.g. int-green."
   type        = bool

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

@@ -1,9 +1,12 @@
 import json
+import os
 
 import boto3
 
 from common.clients import logger
 
+REGION_NAME = os.getenv("AWS_REGION", "eu-west-2")
+
 
 class MockMnsService:
     def __init__(self, queue_url):
@@ -12,7 +15,7 @@ def __init__(self, queue_url):
         logger.info(f"MockMnsService initialized with queue: {queue_url}")
 
     def _get_sqs_client(self):
-        return boto3.client("sqs", region_name="eu-west-2")
+        return boto3.client("sqs", region_name=REGION_NAME)
 
     def publish_notification(self, mns_payload: dict) -> None:
         """