Modify mns publisher infra to account properly for test queue (#1288)

Author: dlzhry2nhs

infrastructure/instance/dynamodb.tf

@@ -68,8 +68,8 @@ resource "aws_dynamodb_table" "delta-dynamodb-table" {
   name                        = "imms-${local.resource_scope}-delta"
   billing_mode                = "PAY_PER_REQUEST"
   hash_key                    = "PK"
-  stream_enabled              = var.mns_publisher_feature_enabled
-  stream_view_type            = var.mns_publisher_feature_enabled ? "NEW_IMAGE" : null
+  stream_enabled              = true
+  stream_view_type            = "NEW_IMAGE"
   deletion_protection_enabled = !local.is_temp
 
   attribute {

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

@@ -4,6 +4,5 @@ dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 mns_environment                   = "dev"
 error_alarm_notifications_enabled = false
-mns_publisher_feature_enabled     = true
 create_mesh_processor             = false
 has_sub_environment_scope         = true

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

@@ -4,6 +4,5 @@ dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 mns_environment                   = "dev"
 error_alarm_notifications_enabled = false
-mns_publisher_feature_enabled     = true # Switch this off once tested fully e2e in Lambda branch
 create_mesh_processor             = false
 has_sub_environment_scope         = true

infrastructure/instance/environments/preprod/int-blue/variables.tfvars

@@ -4,7 +4,6 @@ dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 mns_environment                   = "int"
 error_alarm_notifications_enabled = true
-mns_publisher_feature_enabled     = true
 
 # mesh no invocation period metric set to 3 days (in seconds) for preprod environment i.e 3 * 24 * 60 * 60
 mesh_no_invocation_period_seconds       = 259200

infrastructure/instance/environments/preprod/int-green/variables.tfvars

@@ -4,7 +4,6 @@ dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 mns_environment                   = "int"
 error_alarm_notifications_enabled = true
-mns_publisher_feature_enabled     = true
 
 # mesh no invocation period metric set to 3 days (in seconds) for preprod environment i.e 3 * 24 * 60 * 60
 mesh_no_invocation_period_seconds       = 259200

infrastructure/instance/environments/prod/blue/variables.tfvars

@@ -5,7 +5,6 @@ mns_account_id                    = "758334270304"
 pds_environment                   = "prod"
 mns_environment                   = "prod"
 error_alarm_notifications_enabled = true
-mns_publisher_feature_enabled     = true
 
 # mesh no invocation period metric set to 1 day (in seconds) for prod environment i.e 1 * 24 * 60 * 60
 mesh_no_invocation_period_seconds       = 86400

infrastructure/instance/environments/prod/green/variables.tfvars

@@ -5,7 +5,6 @@ mns_account_id                    = "758334270304"
 pds_environment                   = "prod"
 mns_environment                   = "prod"
 error_alarm_notifications_enabled = true
-mns_publisher_feature_enabled     = true
 
 # mesh no invocation period metric set to 1 day (in seconds) for prod environment i.e 1 * 24 * 60 * 60
 mesh_no_invocation_period_seconds       = 86400

infrastructure/instance/mns_publisher.tf

@@ -1,10 +1,9 @@
 module "mns_publisher" {
   source = "./modules/mns_publisher"
-  count  = var.mns_publisher_feature_enabled ? 1 : 0
 
   ddb_delta_stream_arn               = aws_dynamodb_table.delta-dynamodb-table.stream_arn
   dynamo_kms_encryption_key_arn      = data.aws_kms_key.existing_dynamo_encryption_key.arn
-  enable_lambda_alarm                = var.error_alarm_notifications_enabled # consider just INT and PROD
+  enable_lambda_alarm                = var.error_alarm_notifications_enabled
   immunisation_account_id            = var.immunisation_account_id
   is_temp                            = local.is_temp
   enable_mns_test_queue              = var.mns_environment == "dev"

infrastructure/instance/modules/mns_publisher/outputs.tf

@@ -0,0 +1,9 @@
+output "mns_test_queue_url" {
+  value       = var.enable_mns_test_queue ? aws_sqs_queue.mns_test_notification[0].url : null
+  description = "URL of the MNS test notifications queue (DEV only)"
+}
+
+output "mns_test_queue_arn" {
+  value       = var.enable_mns_test_queue ? aws_sqs_queue.mns_test_notification[0].arn : null
+  description = "ARN of the MNS test notifications queue (DEV only)"
+}

infrastructure/instance/modules/mns_publisher/sqs_test_publish_mns.tf

@@ -33,13 +33,3 @@ resource "aws_sqs_queue_policy" "mns_test_notification_sqs" {
   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.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.enable_mns_test_queue ? aws_sqs_queue.mns_test_notification[0].arn : null
-  description = "ARN of the MNS test notifications queue"
-}