Skip to content

Commit

Permalink
Merge pull request #287 from nationalarchives/remove-template-environ…
Browse files Browse the repository at this point in the history 
…ment-variables

Remove the templateId from the notifications environment variable
  • Loading branch information
@annielh
annielh authored Aug 6, 2024
2 parents 114ee63 + 5221beb commit 07de40a
Showing 1 changed file with 22 additions and 50 deletions.
72 changes: 22 additions & 50 deletions lambda/notifications.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,17 @@ resource "aws_lambda_function" "notifications_lambda_function" {
tags = var.common_tags
environment {
variables = {
SLACK_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_notifications_webhook"].ciphertext_blob
SLACK_JUDGMENT_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_judgment_webhook"].ciphertext_blob
SLACK_STANDARD_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_standard_webhook"].ciphertext_blob
SLACK_TDR_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_tdr_webhook"].ciphertext_blob
SLACK_EXPORT_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_export_webhook"].ciphertext_blob
TO_EMAIL = aws_kms_ciphertext.environment_vars_notifications["to_email"].ciphertext_blob
DA_EVENT_BUS = aws_kms_ciphertext.environment_vars_notifications["da_event_bus"].ciphertext_blob
TRANSFER_COMPLETE_TEMPLATE_ID = aws_kms_ciphertext.environment_vars_notifications["transfer_complete_template_id"].ciphertext_blob
METADATA_REVIEW_REQUESTED_TB_TEMPLATE_ID = aws_kms_ciphertext.environment_vars_notifications["metadata_review_requested_tb_template_id"].ciphertext_blob
METADATA_REVIEW_REQUESTED_DTA_TEMPLATE_ID = aws_kms_ciphertext.environment_vars_notifications["metadata_review_requested_dta_template_id"].ciphertext_blob
METADATA_REVIEW_REJECTED_TEMPLATE_ID = aws_kms_ciphertext.environment_vars_notifications["metadata_review_rejected_template_id"].ciphertext_blob
METADATA_REVIEW_APPROVED_TEMPLATE_ID = aws_kms_ciphertext.environment_vars_notifications["metadata_review_approved_template_id"].ciphertext_blob
GOV_UK_NOTIFY_API_KEY = aws_kms_ciphertext.environment_vars_notifications["gov_uk_notify_api_key"].ciphertext_blob
SEND_GOV_UK_NOTIFICATIONS = aws_kms_ciphertext.environment_vars_notifications["send_gov_uk_notifications"].ciphertext_blob
TDR_INBOX_EMAIL = aws_kms_ciphertext.environment_vars_notifications["tdr_inbox_email"].ciphertext_blob
SLACK_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_notifications_webhook"].ciphertext_blob
SLACK_JUDGMENT_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_judgment_webhook"].ciphertext_blob
SLACK_STANDARD_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_standard_webhook"].ciphertext_blob
SLACK_TDR_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_tdr_webhook"].ciphertext_blob
SLACK_EXPORT_WEBHOOK = aws_kms_ciphertext.environment_vars_notifications["slack_export_webhook"].ciphertext_blob
TO_EMAIL = aws_kms_ciphertext.environment_vars_notifications["to_email"].ciphertext_blob
DA_EVENT_BUS = aws_kms_ciphertext.environment_vars_notifications["da_event_bus"].ciphertext_blob
GOV_UK_NOTIFY_API_KEY = aws_kms_ciphertext.environment_vars_notifications["gov_uk_notify_api_key"].ciphertext_blob
SEND_GOV_UK_NOTIFICATIONS = aws_kms_ciphertext.environment_vars_notifications["send_gov_uk_notifications"].ciphertext_blob
TDR_INBOX_EMAIL = aws_kms_ciphertext.environment_vars_notifications["tdr_inbox_email"].ciphertext_blob
ENVIRONMENT = aws_kms_ciphertext.environment_vars_notifications["environment"].ciphertext_blob
}
}

Expand All @@ -47,21 +43,17 @@ resource "aws_lambda_function" "notifications_lambda_function" {

resource "aws_kms_ciphertext" "environment_vars_notifications" {
for_each = local.count_notifications == 0 ? {} : {
slack_tdr_webhook = data.aws_ssm_parameter.slack_webhook[0].value,
slack_judgment_webhook = data.aws_ssm_parameter.slack_judgment_webhook[0].value,
slack_standard_webhook = data.aws_ssm_parameter.slack_standard_webhook[0].value,
slack_notifications_webhook = data.aws_ssm_parameter.slack_notifications_webhook[0].value,
slack_export_webhook = data.aws_ssm_parameter.slack_export_webhook[0].value,
to_email = "[email protected]",
da_event_bus = var.da_event_bus_arn
transfer_complete_template_id = data.aws_ssm_parameter.gov_uk_transfer_complete_template_id[0].value
metadata_review_requested_tb_template_id = data.aws_ssm_parameter.gov_uk_metadata_review_requested_tb_template_id[0].value
metadata_review_requested_dta_template_id = data.aws_ssm_parameter.gov_uk_metadata_review_requested_dta_template_id[0].value
metadata_review_rejected_template_id = data.aws_ssm_parameter.gov_uk_metadata_review_rejected_template_id[0].value
metadata_review_approved_template_id = data.aws_ssm_parameter.gov_uk_metadata_review_approved_template_id[0].value
gov_uk_notify_api_key = data.aws_ssm_parameter.gov_uk_notify_api_key[0].value
send_gov_uk_notifications = local.environment == "prod"
tdr_inbox_email = local.environment == "prod" ? "[email protected]" : "[email protected]"
slack_tdr_webhook = data.aws_ssm_parameter.slack_webhook[0].value,
slack_judgment_webhook = data.aws_ssm_parameter.slack_judgment_webhook[0].value,
slack_standard_webhook = data.aws_ssm_parameter.slack_standard_webhook[0].value,
slack_notifications_webhook = data.aws_ssm_parameter.slack_notifications_webhook[0].value,
slack_export_webhook = data.aws_ssm_parameter.slack_export_webhook[0].value,
to_email = "[email protected]",
da_event_bus = var.da_event_bus_arn
gov_uk_notify_api_key = data.aws_ssm_parameter.gov_uk_notify_api_key[0].value
send_gov_uk_notifications = local.environment == "prod"
tdr_inbox_email = local.environment == "prod" ? "[email protected]" : "[email protected]"
environment = local.environment
}
# This lambda is created by the tdr-terraform-backend project as it only exists in the management account so we can't use any KMS keys
# created by the terraform environments project as they won't exist when we first run the backend project.
Expand Down Expand Up @@ -100,26 +92,6 @@ data "aws_ssm_parameter" "slack_export_webhook" {
name = "/${local.environment}/slack/export/webhook"
}

data "aws_ssm_parameter" "gov_uk_transfer_complete_template_id" {
count = local.count_notifications
name = "/${local.environment}/gov_uk_notify/transfer_complete_template_id"
}

data "aws_ssm_parameter" "gov_uk_metadata_review_requested_tb_template_id" {
count = local.count_notifications
name = "/${local.environment}/gov_uk_notify/metadata_review_requested_tb_template_id"
}

data "aws_ssm_parameter" "gov_uk_metadata_review_requested_dta_template_id" {
count = local.count_notifications
name = "/${local.environment}/gov_uk_notify/metadata_review_requested_dta_template_id"
}

data "aws_ssm_parameter" "gov_uk_metadata_review_rejected_template_id" {
count = local.count_notifications
name = "/${local.environment}/gov_uk_notify/metadata_review_rejected_template_id"
}

data "aws_ssm_parameter" "gov_uk_metadata_review_approved_template_id" {
count = local.count_notifications
name = "/${local.environment}/gov_uk_notify/metadata_review_approved_template_id"
Expand Down

0 comments on commit 07de40a

Please sign in to comment.