Skip to content

Commit 0c45d7e

Browse files
stevebuxstevebux
committed
CCM-12999 Letter amendments queue
1 parent 4489592 commit 0c45d7e

36 files changed

Lines changed: 544 additions & 37 deletions

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ No requirements.
3838

3939
| Name | Source | Version |
4040
|------|--------|---------|
41+
| <a name="module_allocation_lambda"></a> [allocation\_lambda](#module\_allocation\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
42+
| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-sqs.zip | n/a |
4143
| <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4244
| <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
4345
| <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-eventpub.zip | n/a |
@@ -55,7 +57,7 @@ No requirements.
5557
| <a name="module_post_letters"></a> [post\_letters](#module\_post\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5658
| <a name="module_post_mi"></a> [post\_mi](#module\_post\_mi) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5759
| <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 |
58-
| <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 |
60+
| <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.29/terraform-lambda.zip | n/a |
6163
## Outputs

‎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.letter_status_updates_queue.sqs_queue_arn
2+
event_source_arn = module.supplier_requests_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.letter_status_updates_queue, # ensures queue exists
10-
module.letter_status_update # ensures update handler exists
9+
module.supplier_requests_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.sqs_letter_updates.sqs_queue_arn
2+
event_source_arn = module.amendments_queue.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_allocation.tf‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
module "allocation_lambda" {
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip"
3+
4+
function_name = "allocate_supplier"
5+
description = "Lambda function for allocating supplier"
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+
group = var.group
13+
14+
log_retention_in_days = var.log_retention_in_days
15+
kms_key_arn = module.kms.key_arn
16+
17+
iam_policy_document = {
18+
body = data.aws_iam_policy_document.allocation_lambda.json
19+
}
20+
21+
function_s3_bucket = local.acct.s3_buckets["lambda_function_artefacts"]["id"]
22+
function_code_base_path = local.aws_lambda_functions_dir_path
23+
function_code_dir = "allocation/dist"
24+
function_include_common = true
25+
handler_function_name = "handler"
26+
runtime = "nodejs22.x"
27+
memory = 128
28+
timeout = 29
29+
log_level = var.log_level
30+
31+
force_lambda_code_deploy = var.force_lambda_code_deploy
32+
enable_lambda_insights = false
33+
34+
send_to_firehose = true
35+
log_destination_arn = local.destination_arn
36+
log_subscription_role_arn = local.acct.log_subscription_role_arn
37+
38+
lambda_env_vars = {
39+
QUEUE_URL = module.amendments_queue.sqs_queue_url
40+
}
41+
}
42+
43+
data "aws_iam_policy_document" "allocation_lambda" {
44+
statement {
45+
sid = "KMSPermissions"
46+
effect = "Allow"
47+
48+
actions = [
49+
"kms:Decrypt",
50+
"kms:GenerateDataKey",
51+
]
52+
53+
resources = [
54+
module.kms.key_arn,
55+
]
56+
}
57+
}

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

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

8181
resources = [
82-
module.letter_status_updates_queue.sqs_queue_arn
82+
module.supplier_requests_queue.sqs_queue_arn
8383
]
8484
}
8585
}

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

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

3737
lambda_env_vars = merge(local.common_lambda_env_vars, {
38-
QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url
38+
QUEUE_URL = module.supplier_requests_queue.sqs_queue_url
3939
})
4040
}
4141

@@ -64,7 +64,7 @@ data "aws_iam_policy_document" "patch_letter_lambda" {
6464
]
6565

6666
resources = [
67-
module.letter_status_updates_queue.sqs_queue_arn
67+
module.supplier_requests_queue.sqs_queue_arn
6868
]
6969
}
7070
}

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

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

3737
lambda_env_vars = merge(local.common_lambda_env_vars, {
38-
QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url,
38+
QUEUE_URL = module.supplier_requests_queue.sqs_queue_url,
3939
MAX_LIMIT = var.max_get_limit
4040
})
4141
}
@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "post_letters" {
6565
]
6666

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ data "aws_iam_policy_document" "upsert_letter_lambda" {
7777
]
7878

7979
resources = [
80-
module.sqs_letter_updates.sqs_queue_arn
80+
module.amendments_queue.sqs_queue_arn
8181
]
8282
}
8383
}

infrastructure/terraform/components/api/module_sqs_letter_updates.tf renamed to infrastructure/terraform/components/api/module_sqs_amendments_queue.tf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
module "sqs_letter_updates" {
1+
module "amendments_queue" {
22
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip"
33

44
aws_account_id = var.aws_account_id
55
component = var.component
66
environment = var.environment
77
project = var.project
88
region = var.region
9-
name = "letter-updates"
9+
name = "${local.csi}-amendments-queue"
10+
11+
fifo_queue = true
12+
content_based_deduplication = true
1013

1114
sqs_kms_key_arn = module.kms.key_arn
1215

@@ -38,7 +41,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {
3841
condition {
3942
test = "ArnEquals"
4043
variable = "aws:SourceArn"
41-
values = [module.eventsub.sns_topic.arn]
44+
values = [module.eventsub.sns_topic_event_bus.arn]
4245
}
4346
}
4447

@@ -65,7 +68,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {
6568
condition {
6669
test = "ArnEquals"
6770
variable = "aws:SourceArn"
68-
values = [module.eventsub.sns_topic.arn]
71+
values = [module.eventsub.sns_topic_event_bus.arn]
6972
}
7073
}
7174
}

infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf renamed to infrastructure/terraform/components/api/module_sqs_supplier_requests_queue.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
# Queue to transport update letter status messages
2-
module "letter_status_updates_queue" {
2+
module "supplier_requests_queue" {
33
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
44

5-
name = "letter_status_updates_queue"
5+
name = "${local.csi}-supplier-requests-queue"
66

77
aws_account_id = var.aws_account_id
88
component = var.component
99
environment = var.environment
1010
project = var.project
1111
region = var.region
1212

13+
fifo_queue = true
14+
content_based_deduplication = true
15+
1316
sqs_kms_key_arn = module.kms.key_arn
1417

1518
create_dlq = true

0 commit comments

Comments
 (0)