Skip to content

Commit 6cf6c1e

Browse files
simonlabareresimonlabarere
committed
CCM-12616: Address review comments
1 parent dfa4b24 commit 6cf6c1e

4 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎infrastructure/terraform/components/dl/cloudwatch_event_rule_mesh_inbox_message_downloaded.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ resource "aws_cloudwatch_event_rule" "mesh_inbox_message_downloaded" {
1212
})
1313
}
1414

15-
resource "aws_cloudwatch_event_target" "create-ttl-target" {
15+
resource "aws_cloudwatch_event_target" "create_ttl_target" {
1616
rule = aws_cloudwatch_event_rule.mesh_inbox_message_downloaded.name
1717
arn = module.sqs_ttl.sqs_queue_arn
18-
target_id = "create-ttl-target"
18+
target_id = "create_ttl_target"
1919
event_bus_name = aws_cloudwatch_event_bus.main.name
2020
}
2121

22-
resource "aws_cloudwatch_event_target" "pdm-uploader-target" {
22+
resource "aws_cloudwatch_event_target" "pdm_uploader_target" {
2323
rule = aws_cloudwatch_event_rule.mesh_inbox_message_downloaded.name
2424
arn = module.sqs_pdm_uploader.sqs_queue_arn
25-
target_id = "pdm-uploader-target"
25+
target_id = "pdm_uploader_target"
2626
event_bus_name = aws_cloudwatch_event_bus.main.name
2727
}
2828

29-
resource "aws_cloudwatch_event_target" "mesh-acknowledge-target" {
29+
resource "aws_cloudwatch_event_target" "mesh_cknowledge_target" {
3030
rule = aws_cloudwatch_event_rule.mesh_inbox_message_downloaded.name
3131
arn = module.sqs_mesh_acknowledge.sqs_queue_arn
32-
target_id = "mesh-acknowledge-target"
32+
target_id = "mesh_acknowledge_target"
3333
event_bus_name = aws_cloudwatch_event_bus.main.name
3434
}

‎infrastructure/terraform/components/dl/locals.tf‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
locals {
2-
aws_lambda_functions_dir_path = "../../../../lambdas"
3-
log_destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
42
apim_access_token_ssm_parameter_name = "/${var.component}/${var.environment}/apim/access_token"
53
apim_api_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/api_key"
6-
apim_private_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/private_key"
74
apim_keystore_s3_bucket = "nhs-${var.aws_account_id}-${var.region}-${var.environment}-${var.component}-static-assets"
8-
ssm_prefix = "/${var.component}/${var.environment}"
9-
ssm_mesh_prefix = "${local.ssm_prefix}/mesh"
10-
ssm_senders_prefix = "${local.ssm_prefix}/senders"
11-
unscanned_files_bucket = local.acct.additional_s3_buckets["digital-letters_unscanned-files"]["id"]
12-
mock_mesh_endpoint = "s3://${module.s3bucket_non_pii_data.bucket}/mock-mesh"
13-
root_domain_name = "${var.environment}.${local.acct.route53_zone_names["digital-letters"]}"
14-
root_domain_id = local.acct.route53_zone_ids["digital-letters"]
15-
ttl_shard_count = 3
5+
apim_private_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/private_key"
6+
aws_lambda_functions_dir_path = "../../../../lambdas"
167
deploy_pdm_mock = var.enable_pdm_mock
178
firehose_output_path_prefix = "kinesis-firehose-output"
9+
log_destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
10+
mock_mesh_endpoint = "s3://${module.s3bucket_non_pii_data.bucket}/mock-mesh"
1811
pii_retention_config = {
1912
current_days = var.pii_data_retention_policy_days,
2013
non_current_days = 14
2114
}
15+
root_domain_id = local.acct.route53_zone_ids["digital-letters"]
16+
root_domain_name = "${var.environment}.${local.acct.route53_zone_names["digital-letters"]}"
17+
ssm_mesh_prefix = "${local.ssm_prefix}/mesh"
18+
ssm_prefix = "/${var.component}/${var.environment}"
19+
ssm_senders_prefix = "${local.ssm_prefix}/senders"
20+
ttl_shard_count = 3
21+
unscanned_files_bucket = local.acct.additional_s3_buckets["digital-letters_unscanned-files"]["id"]
2222
}

‎infrastructure/terraform/components/dl/module_lambda_mesh_acknowledge.tf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module "mesh_acknowledge" {
22
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

4-
function_name = "mesh-acknowledge"
5-
description = "A lambda function for acknowledging MESH messages"
4+
function_name = "mesh-acknowledge"
5+
description = "A lambda function for acknowledging MESH messages"
66
aws_account_id = var.aws_account_id
77
component = local.component
88
environment = var.environment
@@ -35,14 +35,14 @@ module "mesh_acknowledge" {
3535
log_subscription_role_arn = local.acct.log_subscription_role_arn
3636

3737
lambda_env_vars = {
38-
DLQ_URL = module.sqs_mesh_acknowledge.sqs_dlq_url
39-
ENVIRONMENT = var.environment
40-
EVENT_PUBLISHER_DLQ_URL = module.sqs_event_publisher_errors.sqs_queue_url
41-
EVENT_PUBLISHER_EVENT_BUS_ARN = aws_cloudwatch_event_bus.main.arn
42-
MOCK_MESH_BUCKET = module.s3bucket_non_pii_data.bucket
43-
SSM_MESH_PREFIX = "${local.ssm_mesh_prefix}"
44-
SSM_SENDERS_PREFIX = "${local.ssm_senders_prefix}"
45-
USE_MESH_MOCK = var.enable_mock_mesh ? "true" : "false"
38+
DLQ_URL = module.sqs_mesh_acknowledge.sqs_dlq_url
39+
ENVIRONMENT = var.environment
40+
EVENT_PUBLISHER_DLQ_URL = module.sqs_event_publisher_errors.sqs_queue_url
41+
EVENT_PUBLISHER_EVENT_BUS_ARN = aws_cloudwatch_event_bus.main.arn
42+
MOCK_MESH_BUCKET = module.s3bucket_non_pii_data.bucket
43+
SSM_MESH_PREFIX = "${local.ssm_mesh_prefix}"
44+
SSM_SENDERS_PREFIX = "${local.ssm_senders_prefix}"
45+
USE_MESH_MOCK = var.enable_mock_mesh ? "true" : "false"
4646
}
4747

4848
}

‎infrastructure/terraform/components/dl/module_lambda_mesh_download.tf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ module "mesh_download" {
3737
log_subscription_role_arn = local.acct.log_subscription_role_arn
3838

3939
lambda_env_vars = {
40-
DOWNLOAD_METRIC_NAME = "mesh-download-successful-downloads"
41-
DOWNLOAD_METRIC_NAMESPACE = "dl-mesh-download"
42-
ENVIRONMENT = var.environment
43-
EVENT_PUBLISHER_DLQ_URL = module.sqs_event_publisher_errors.sqs_queue_url
44-
EVENT_PUBLISHER_EVENT_BUS_ARN = aws_cloudwatch_event_bus.main.arn
45-
PII_BUCKET = module.s3bucket_pii_data.bucket
46-
SSM_MESH_PREFIX = "${local.ssm_mesh_prefix}"
47-
SSM_SENDERS_PREFIX = "${local.ssm_senders_prefix}"
48-
USE_MESH_MOCK = var.enable_mock_mesh ? "true" : "false"
40+
DOWNLOAD_METRIC_NAME = "mesh-download-successful-downloads"
41+
DOWNLOAD_METRIC_NAMESPACE = "dl-mesh-download"
42+
ENVIRONMENT = var.environment
43+
EVENT_PUBLISHER_DLQ_URL = module.sqs_event_publisher_errors.sqs_queue_url
44+
EVENT_PUBLISHER_EVENT_BUS_ARN = aws_cloudwatch_event_bus.main.arn
45+
PII_BUCKET = module.s3bucket_pii_data.bucket
46+
SSM_MESH_PREFIX = "${local.ssm_mesh_prefix}"
47+
SSM_SENDERS_PREFIX = "${local.ssm_senders_prefix}"
48+
USE_MESH_MOCK = var.enable_mock_mesh ? "true" : "false"
4949
}
5050

5151
}

0 commit comments

Comments
 (0)