Skip to content

Commit ed2f83c

Browse files
jameslinnelljameslinnell
committed
[NDR-255] Revert MNS index changes
1 parent 1f8ee07 commit ed2f83c

3 files changed

Lines changed: 23 additions & 19 deletions

File tree

‎infrastructure/lambda-mns-notification.tf‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
module "mns-notification-lambda" {
2+
count = 1
23
source = "./modules/lambda"
34
name = "MNSNotificationLambda"
45
handler = "handlers.mns_notification_handler.lambda_handler"
56
iam_role_policy_documents = [
6-
module.sqs-mns-notification-queue.sqs_read_policy_document,
7-
module.sqs-mns-notification-queue.sqs_write_policy_document,
7+
module.sqs-mns-notification-queue[0].sqs_read_policy_document,
8+
module.sqs-mns-notification-queue[0].sqs_write_policy_document,
89
module.lloyd_george_reference_dynamodb_table.dynamodb_write_policy_document,
910
module.lloyd_george_reference_dynamodb_table.dynamodb_read_policy_document,
1011
aws_iam_policy.ssm_access_policy.policy,
1112
module.ndr-app-config.app_config_policy,
12-
aws_iam_policy.kms_mns_lambda_access.policy,
13+
aws_iam_policy.kms_mns_lambda_access[0].policy,
1314
]
1415
kms_deletion_window = var.kms_deletion_window
1516
rest_api_id = null
@@ -20,7 +21,7 @@ module "mns-notification-lambda" {
2021
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
2122
WORKSPACE = terraform.workspace
2223
LLOYD_GEORGE_DYNAMODB_NAME = "${terraform.workspace}_${var.lloyd_george_dynamodb_table_name}"
23-
MNS_NOTIFICATION_QUEUE_URL = module.sqs-mns-notification-queue.sqs_url
24+
MNS_NOTIFICATION_QUEUE_URL = module.sqs-mns-notification-queue[0].sqs_url
2425
PDS_FHIR_IS_STUBBED = local.is_sandbox
2526
}
2627
is_gateway_integration_needed = false
@@ -29,26 +30,26 @@ module "mns-notification-lambda" {
2930
}
3031

3132
resource "aws_lambda_event_source_mapping" "mns_notification_lambda" {
32-
event_source_arn = module.sqs-mns-notification-queue.endpoint
33-
function_name = module.mns-notification-lambda.lambda_arn
33+
event_source_arn = module.sqs-mns-notification-queue[0].endpoint
34+
function_name = module.mns-notification-lambda[0].lambda_arn
3435
}
3536

3637
module "mns-notification-alarm" {
3738
source = "./modules/lambda_alarms"
38-
lambda_function_name = module.mns-notification-lambda.function_name
39-
lambda_timeout = module.mns-notification-lambda.timeout
39+
lambda_function_name = module.mns-notification-lambda[0].function_name
40+
lambda_timeout = module.mns-notification-lambda[0].timeout
4041
lambda_name = "mns_notification_handler"
4142
namespace = "AWS/Lambda"
42-
alarm_actions = [module.mns-notification-alarm-topic.arn]
43-
ok_actions = [module.mns-notification-alarm-topic.arn]
43+
alarm_actions = [module.mns-notification-alarm-topic[0].arn]
44+
ok_actions = [module.mns-notification-alarm-topic[0].arn]
4445
}
4546

4647
module "mns-notification-alarm-topic" {
4748
source = "./modules/sns"
4849
sns_encryption_key_id = module.sns_encryption_key.id
4950
topic_name = "mns-notification-topic"
5051
topic_protocol = "lambda"
51-
topic_endpoint = module.mns-notification-lambda.lambda_arn
52+
topic_endpoint = module.mns-notification-lambda[0].lambda_arn
5253
delivery_policy = jsonencode({
5354
"Version" : "2012-10-17",
5455
"Statement" : [
@@ -72,6 +73,7 @@ module "mns-notification-alarm-topic" {
7273
}
7374

7475
resource "aws_iam_policy" "kms_mns_lambda_access" {
76+
count = 1
7577
name = "${terraform.workspace}_mns_notification_lambda_access_policy"
7678
description = "KMS policy to allow lambda to read and write MNS SQS messages"
7779

@@ -84,7 +86,7 @@ resource "aws_iam_policy" "kms_mns_lambda_access" {
8486
"kms:GenerateDataKey"
8587
]
8688
Effect = "Allow"
87-
Resource = module.mns_encryption_key.kms_arn
89+
Resource = module.mns_encryption_key[0].kms_arn
8890
},
8991
]
9092
})

‎infrastructure/mns.tf‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ data "aws_ssm_parameter" "mns_lambda_role" {
44

55

66
module "mns_encryption_key" {
7+
count = 1
78
source = "./modules/kms"
89
kms_key_name = "alias/mns-notification-encryption-key-kms-${terraform.workspace}"
910
kms_key_description = "Custom KMS Key to enable server side encryption for mns subscriptions"
@@ -16,6 +17,7 @@ module "mns_encryption_key" {
1617
}
1718

1819
module "sqs-mns-notification-queue" {
20+
count = 1
1921
source = "./modules/sqs"
2022
name = "mns-notification-queue"
2123
max_size_message = 256 * 1024 # allow message size up to 256 KB
@@ -25,14 +27,14 @@ module "sqs-mns-notification-queue" {
2527
max_visibility = 901
2628
delay = 60
2729
enable_sse = null
28-
kms_master_key_id = module.mns_encryption_key.id
30+
kms_master_key_id = module.mns_encryption_key[0].id
2931
enable_dlq = true
3032
dlq_visibility_timeout = 0
3133
max_receive_count = 3
3234
}
3335

3436
resource "aws_sqs_queue_policy" "mns_sqs_access" {
35-
queue_url = module.sqs-mns-notification-queue.sqs_url
37+
queue_url = module.sqs-mns-notification-queue[0].sqs_url
3638

3739
policy = jsonencode({
3840
Version = "2012-10-17"
@@ -43,7 +45,7 @@ resource "aws_sqs_queue_policy" "mns_sqs_access" {
4345
AWS = data.aws_ssm_parameter.mns_lambda_role.value
4446
},
4547
Action = "SQS:SendMessage",
46-
Resource = module.sqs-mns-notification-queue.sqs_arn
48+
Resource = module.sqs-mns-notification-queue[0].sqs_arn
4749
}
4850
]
4951
})
@@ -62,7 +64,7 @@ resource "aws_cloudwatch_metric_alarm" "msn_dlq_new_message" {
6264
alarm_actions = [module.mns-dlq-alarm-topic.arn]
6365

6466
dimensions = {
65-
QueueName = module.sqs-mns-notification-queue.dlq_name
67+
QueueName = module.sqs-mns-notification-queue[0].dlq_name
6668
}
6769
}
6870

@@ -93,5 +95,5 @@ module "mns-dlq-alarm-topic" {
9395
}
9496
]
9597
})
96-
depends_on = [module.sqs-mns-notification-queue]
98+
depends_on = [module.sqs-mns-notification-queue[0]]
9799
}

‎infrastructure/sqs_alarms.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ locals {
55
"stitching_main" = module.sqs-stitching-queue.sqs_name
66
"lg_bulk_main" = module.sqs-lg-bulk-upload-metadata-queue.sqs_name
77
"lg_inv_main" = module.sqs-lg-bulk-upload-invalid-queue.sqs_name
8-
"mns_main" = module.sqs-mns-notification-queue.sqs_name
8+
"mns_main" = module.sqs-mns-notification-queue[0].sqs_name
99
# dead-letter queues
1010
"nrl_dlq" = module.sqs-nrl-queue.dlq_name
1111
"stitching_dlq" = module.sqs-stitching-queue.dlq_name
12-
"mns_dlq" = module.sqs-mns-notification-queue.dlq_name
12+
"mns_dlq" = module.sqs-mns-notification-queue[0].dlq_name
1313
}
1414

1515

0 commit comments

Comments
 (0)