Skip to content

Commit d7356d2

Browse files
Namitha-PrabhuNamitha-Prabhu
committed
Merge branch 'main' into feature/CCM-13382-AddTests 
2 parents d290606 + 689913f commit d7356d2

20 files changed

Lines changed: 1136 additions & 243 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ No requirements.
8282
| <a name="module_sqs_alarms"></a> [sqs\_alarms](#module\_sqs\_alarms) | ../../modules/alarms-sqs | n/a |
8383
| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
8484
| <a name="module_sqs_supplier_allocator"></a> [sqs\_supplier\_allocator](#module\_sqs\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
85+
| <a name="module_sqs_supplier_config"></a> [sqs\_supplier\_config](#module\_sqs\_supplier\_config) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
8586
| <a name="module_supplier_allocator"></a> [supplier\_allocator](#module\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip | n/a |
87+
| <a name="module_supplier_config_ingress"></a> [supplier\_config\_ingress](#module\_supplier\_config\_ingress) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
8688
| <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 |
8789
| <a name="module_update_letter_queue"></a> [update\_letter\_queue](#module\_update\_letter\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip | n/a |
8890
| <a name="module_upsert_letter"></a> [upsert\_letter](#module\_upsert\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip | n/a |

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
resource "aws_lambda_event_source_mapping" "supplier_config_ingress" {
2+
event_source_arn = module.sqs_supplier_config.sqs_queue_arn
3+
function_name = module.supplier_config_ingress.function_name
4+
batch_size = 10
5+
maximum_batching_window_in_seconds = 5
6+
function_response_types = [
7+
"ReportBatchItemFailures"
8+
]
9+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ locals {
2121
letter_updates_transformer = module.letter_updates_transformer.function_name
2222
mi_updates_transformer = module.mi_updates_transformer.function_name
2323
supplier_allocator = module.supplier_allocator.function_name
24+
supplier_config_ingress = module.supplier_config_ingress.function_name
2425
}
2526

2627
sqs_alarm_targets = {
2728
sqs_letter_updates = module.sqs_letter_updates.sqs_queue_name
2829
amendments_queue = module.amendments_queue.sqs_queue_name
2930
letter_status_updates_queue = module.letter_status_updates_queue.sqs_queue_name
3031
sqs_supplier_allocator = module.sqs_supplier_allocator.sqs_queue_name
32+
sqs_supplier_config = module.sqs_supplier_config.sqs_queue_name
3133
}
3234
}

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
module "supplier_config_ingress" {
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
3+
4+
function_name = "supplier-config-ingress"
5+
description = "Persist supplier config changes"
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.supplier_config_ingress_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 = "supplier-config-ingress/dist"
24+
function_include_common = true
25+
handler_function_name = "supplierConfigHandler"
26+
runtime = "nodejs22.x"
27+
memory = 512
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+
log_destination_arn = local.destination_arn
35+
log_subscription_role_arn = local.acct.log_subscription_role_arn
36+
37+
lambda_env_vars = merge(local.common_lambda_env_vars, {})
38+
}
39+
40+
data "aws_iam_policy_document" "supplier_config_ingress_lambda" {
41+
statement {
42+
sid = "KMSPermissions"
43+
effect = "Allow"
44+
45+
actions = [
46+
"kms:Decrypt",
47+
"kms:GenerateDataKey",
48+
]
49+
50+
resources = [
51+
module.kms.key_arn,
52+
]
53+
}
54+
55+
statement {
56+
sid = "AllowSQSRead"
57+
effect = "Allow"
58+
59+
actions = [
60+
"sqs:ReceiveMessage",
61+
"sqs:DeleteMessage",
62+
"sqs:GetQueueAttributes"
63+
]
64+
65+
resources = [
66+
module.sqs_supplier_config.sqs_queue_arn
67+
]
68+
}
69+
70+
statement {
71+
sid = "AllowConfigDynamoDBWrite"
72+
effect = "Allow"
73+
74+
actions = [
75+
"dynamodb:UpdateItem",
76+
]
77+
78+
resources = [
79+
aws_dynamodb_table.supplier-configuration.arn,
80+
]
81+
}
82+
}

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
module "sqs_supplier_config" {
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/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 = "supplier-config"
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.supplier_config_queue_policy.json
17+
}
18+
19+
data "aws_iam_policy_document" "supplier_config_queue_policy" {
20+
version = "2012-10-17"
21+
22+
statement {
23+
sid = "AllowSNSPermissions"
24+
effect = "Allow"
25+
26+
principals {
27+
type = "Service"
28+
identifiers = ["sns.amazonaws.com"]
29+
}
30+
31+
actions = [
32+
"sqs:SendMessage",
33+
"sqs:ListQueueTags",
34+
"sqs:GetQueueUrl",
35+
"sqs:GetQueueAttributes",
36+
]
37+
38+
resources = [
39+
"arn:aws:sqs:${var.region}:${var.aws_account_id}:${var.project}-${var.environment}-${var.component}-supplier-config-queue"
40+
]
41+
42+
condition {
43+
test = "ArnEquals"
44+
variable = "aws:SourceArn"
45+
values = [module.eventsub.sns_topic.arn]
46+
}
47+
}
48+
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
resource "aws_sns_topic_subscription" "eventsub_sqs_supplier_config" {
2+
topic_arn = module.eventsub.sns_topic.arn
3+
protocol = "sqs"
4+
endpoint = module.sqs_supplier_config.sqs_queue_arn
5+
raw_message_delivery = true
6+
7+
filter_policy_scope = "MessageBody"
8+
filter_policy = jsonencode({
9+
type = [{ prefix = "uk.nhs.notify.supplier-config" }]
10+
})
11+
}

0 commit comments

Comments
 (0)