Skip to content

Commit 3f1846f

Browse files
stevebuxstevebux
committed
revert changes to find error
1 parent 9473260 commit 3f1846f

10 files changed

Lines changed: 104 additions & 10 deletions

‎infrastructure/terraform/components/api/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ No requirements.
4949
| <a name="module_get_status"></a> [get\_status](#module\_get\_status) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
5050
| <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-kms.zip | n/a |
5151
| <a name="module_letter_status_update"></a> [letter\_status\_update](#module\_letter\_status\_update) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
52+
| <a name="module_letter_status_updates_queue"></a> [letter\_status\_updates\_queue](#module\_letter\_status\_updates\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
5253
| <a name="module_letter_updates_transformer"></a> [letter\_updates\_transformer](#module\_letter\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
5354
| <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
5455
| <a name="module_patch_letter"></a> [patch\_letter](#module\_patch\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
5556
| <a name="module_post_letters"></a> [post\_letters](#module\_post\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
5657
| <a name="module_post_mi"></a> [post\_mi](#module\_post\_mi) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
5758
| <a name="module_s3bucket_test_letters"></a> [s3bucket\_test\_letters](#module\_s3bucket\_test\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
59+
| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip | n/a |
5860
| <a name="module_supplier_requests_queue"></a> [supplier\_requests\_queue](#module\_supplier\_requests\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
5961
| <a name="module_supplier_ssl"></a> [supplier\_ssl](#module\_supplier\_ssl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-ssl.zip | n/a |
6062
| <a name="module_upsert_letter"></a> [upsert\_letter](#module\_upsert\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |

‎infrastructure/terraform/components/api/event_source_mapping_status_updates_to_handler.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
resource "aws_lambda_event_source_mapping" "status_updates_sqs_to_status_update_handler" {
2-
event_source_arn = module.supplier_requests_queue.sqs_queue_arn
2+
event_source_arn = module.letter_status_updates_queue.sqs_queue_arn
33
function_name = module.letter_status_update.function_arn
44
batch_size = 10
55
maximum_batching_window_in_seconds = 1
66
scaling_config { maximum_concurrency = 10 }
77

88
depends_on = [
9-
module.supplier_requests_queue, # ensures queue exists
10-
module.letter_status_update # ensures update handler exists
9+
module.letter_status_updates_queue, # ensures queue exists
10+
module.letter_status_update # ensures update handler exists
1111
]
1212
}

‎infrastructure/terraform/components/api/lambda_event_source_mapping_upsert_letter.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "aws_lambda_event_source_mapping" "upsert_letter" {
2-
event_source_arn = module.amendments_queue.sqs_queue_arn
2+
event_source_arn = module.sqs_letter_updates.sqs_queue_arn
33
function_name = module.upsert_letter.function_name
44
batch_size = 10
55
maximum_batching_window_in_seconds = 5

‎infrastructure/terraform/components/api/module_lambda_letter_status_update.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ data "aws_iam_policy_document" "letter_status_update" {
8080
]
8181

8282
resources = [
83-
module.supplier_requests_queue.sqs_queue_arn
83+
module.letter_status_updates_queue.sqs_queue_arn
8484
]
8585
}
8686
}

‎infrastructure/terraform/components/api/module_lambda_patch_letter.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module "patch_letter" {
3636
log_subscription_role_arn = local.acct.log_subscription_role_arn
3737

3838
lambda_env_vars = merge(local.common_lambda_env_vars, {
39-
QUEUE_URL = module.supplier_requests_queue.sqs_queue_url
39+
QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url
4040
})
4141
}
4242

@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "patch_letter_lambda" {
6565
]
6666

6767
resources = [
68-
module.supplier_requests_queue.sqs_queue_arn
68+
module.letter_status_updates_queue.sqs_queue_arn
6969
]
7070
}
7171
}

‎infrastructure/terraform/components/api/module_lambda_post_letters.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module "post_letters" {
3636
log_subscription_role_arn = local.acct.log_subscription_role_arn
3737

3838
lambda_env_vars = merge(local.common_lambda_env_vars, {
39-
QUEUE_URL = module.supplier_requests_queue.sqs_queue_url,
39+
QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url,
4040
MAX_LIMIT = var.max_get_limit
4141
})
4242
}
@@ -66,7 +66,7 @@ data "aws_iam_policy_document" "post_letters" {
6666
]
6767

6868
resources = [
69-
module.supplier_requests_queue.sqs_queue_arn
69+
module.letter_status_updates_queue.sqs_queue_arn
7070
]
7171
}
7272
}

‎infrastructure/terraform/components/api/module_lambda_upsert_letter.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ data "aws_iam_policy_document" "upsert_letter_lambda" {
8383
]
8484

8585
resources = [
86-
module.amendments_queue.sqs_queue_arn
86+
module.sqs_letter_updates.sqs_queue_arn
8787
]
8888
}
8989
}

‎infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Queue to transport update letter status messages
2+
module "letter_status_updates_queue" {
3+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
4+
5+
name = "letter_status_updates_queue"
6+
7+
aws_account_id = var.aws_account_id
8+
component = var.component
9+
environment = var.environment
10+
project = var.project
11+
region = var.region
12+
13+
sqs_kms_key_arn = module.kms.key_arn
14+
15+
create_dlq = true
16+
}

‎infrastructure/terraform/components/api/module_sqs_letter_updates.tf‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
module "sqs_letter_updates" {
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip"
3+
4+
aws_account_id = var.aws_account_id
5+
component = var.component
6+
environment = var.environment
7+
project = var.project
8+
region = var.region
9+
name = "letter-updates"
10+
11+
sqs_kms_key_arn = module.kms.key_arn
12+
13+
visibility_timeout_seconds = 60
14+
15+
create_dlq = true
16+
sqs_policy_overload = data.aws_iam_policy_document.letter_updates_queue_policy.json
17+
}
18+
19+
data "aws_iam_policy_document" "letter_updates_queue_policy" {
20+
version = "2012-10-17"
21+
statement {
22+
sid = "AllowSNSToSendMessage"
23+
effect = "Allow"
24+
25+
principals {
26+
type = "Service"
27+
identifiers = ["sns.amazonaws.com"]
28+
}
29+
30+
actions = [
31+
"sqs:SendMessage"
32+
]
33+
34+
resources = [
35+
"arn:aws:sqs:${var.region}:${var.aws_account_id}:${var.project}-${var.environment}-${var.component}-letter-updates-queue"
36+
]
37+
38+
condition {
39+
test = "ArnEquals"
40+
variable = "aws:SourceArn"
41+
values = [module.eventsub.sns_topic.arn]
42+
}
43+
}
44+
45+
statement {
46+
sid = "AllowSNSPermissions"
47+
effect = "Allow"
48+
49+
principals {
50+
type = "Service"
51+
identifiers = ["sns.amazonaws.com"]
52+
}
53+
54+
actions = [
55+
"sqs:SendMessage",
56+
"sqs:ListQueueTags",
57+
"sqs:GetQueueUrl",
58+
"sqs:GetQueueAttributes",
59+
]
60+
61+
resources = [
62+
"arn:aws:sqs:${var.region}:${var.aws_account_id}:${var.project}-${var.environment}-${var.component}-letter-updates-queue"
63+
]
64+
65+
condition {
66+
test = "ArnEquals"
67+
variable = "aws:SourceArn"
68+
values = [module.eventsub.sns_topic.arn]
69+
}
70+
}
71+
}

‎infrastructure/terraform/components/api/sns_topic_subscription_eventsub_sqs_letter_updates.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resource "aws_sns_topic_subscription" "eventsub_sqs_letter_updates" {
2+
topic_arn = module.eventsub.sns_topic.arn
3+
protocol = "sqs"
4+
endpoint = module.sqs_letter_updates.sqs_queue_arn
5+
}

0 commit comments

Comments
 (0)