From a7becbffc0bd5c34c1c759f87445d0e974ae1aa7 Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Tue, 20 May 2025 15:24:31 +0100 Subject: [PATCH] Remove SES_SUBMISSIONS feature flag --- infra/deployments/forms/forms-runner/main.tf | 1 - infra/deployments/forms/inputs.tf | 1 - infra/deployments/forms/tfvars/dev.tfvars | 1 - infra/deployments/forms/tfvars/production.tfvars | 1 - infra/deployments/forms/tfvars/staging.tfvars | 1 - infra/deployments/forms/tfvars/user-research.tfvars | 1 - infra/modules/forms-runner/main.tf | 4 ---- infra/modules/forms-runner/variables.tf | 6 ------ 8 files changed, 16 deletions(-) diff --git a/infra/deployments/forms/forms-runner/main.tf b/infra/deployments/forms/forms-runner/main.tf index 7c02c8e9f..6bec2f877 100644 --- a/infra/deployments/forms/forms-runner/main.tf +++ b/infra/deployments/forms/forms-runner/main.tf @@ -67,5 +67,4 @@ module "forms_runner" { send_logs_to_cyber = var.send_logs_to_cyber bounces_and_complaints_kms_key_arn = data.terraform_remote_state.forms_ses.outputs.submission_email_bounces_and_complaints_kms_key_arn deliveries_kms_key_arn = data.terraform_remote_state.forms_ses.outputs.submission_email_successful_deliveries_kms_key_arn - ses_submissions_enabled = var.forms_runner_settings.ses_submissions_enabled } diff --git a/infra/deployments/forms/inputs.tf b/infra/deployments/forms/inputs.tf index f19cba1ae..2aad64f30 100644 --- a/infra/deployments/forms/inputs.tf +++ b/infra/deployments/forms/inputs.tf @@ -183,7 +183,6 @@ variable "forms_runner_settings" { allow_human_readonly_roles_to_assume_submissions_to_runner_role = bool ses_submission_email_from_email_address = string ses_submission_email_reply_to_email_address = string - ses_submissions_enabled = bool }) } diff --git a/infra/deployments/forms/tfvars/dev.tfvars b/infra/deployments/forms/tfvars/dev.tfvars index 47448da10..c9eb6cb3f 100644 --- a/infra/deployments/forms/tfvars/dev.tfvars +++ b/infra/deployments/forms/tfvars/dev.tfvars @@ -106,7 +106,6 @@ forms_runner_settings = { allow_human_readonly_roles_to_assume_submissions_to_runner_role = true ses_submission_email_from_email_address = "no-reply@dev.forms.service.gov.uk" ses_submission_email_reply_to_email_address = "no-reply@dev.forms.service.gov.uk" - ses_submissions_enabled = true } scheduled_smoke_tests_settings = { enable_scheduled_smoke_tests = true diff --git a/infra/deployments/forms/tfvars/production.tfvars b/infra/deployments/forms/tfvars/production.tfvars index 1e88c12b1..700dc68b8 100644 --- a/infra/deployments/forms/tfvars/production.tfvars +++ b/infra/deployments/forms/tfvars/production.tfvars @@ -150,7 +150,6 @@ forms_runner_settings = { allow_human_readonly_roles_to_assume_submissions_to_runner_role = false ses_submission_email_from_email_address = "no-reply@forms.service.gov.uk" ses_submission_email_reply_to_email_address = "no-reply@forms.service.gov.uk" - ses_submissions_enabled = true } scheduled_smoke_tests_settings = { enable_scheduled_smoke_tests = true diff --git a/infra/deployments/forms/tfvars/staging.tfvars b/infra/deployments/forms/tfvars/staging.tfvars index 0735dc048..6e132bc2c 100644 --- a/infra/deployments/forms/tfvars/staging.tfvars +++ b/infra/deployments/forms/tfvars/staging.tfvars @@ -71,7 +71,6 @@ forms_runner_settings = { allow_human_readonly_roles_to_assume_submissions_to_runner_role = false ses_submission_email_from_email_address = "no-reply@staging.forms.service.gov.uk" ses_submission_email_reply_to_email_address = "no-reply@staging.forms.service.gov.uk" - ses_submissions_enabled = true } scheduled_smoke_tests_settings = { enable_scheduled_smoke_tests = true diff --git a/infra/deployments/forms/tfvars/user-research.tfvars b/infra/deployments/forms/tfvars/user-research.tfvars index a7cc802af..96d374714 100644 --- a/infra/deployments/forms/tfvars/user-research.tfvars +++ b/infra/deployments/forms/tfvars/user-research.tfvars @@ -69,7 +69,6 @@ forms_runner_settings = { ses_submission_email_reply_to_email_address = "no-reply@research.forms.service.gov.uk" allow_human_readonly_roles_to_assume_submissions_to_s3_role = false allow_human_readonly_roles_to_assume_submissions_to_runner_role = false - ses_submissions_enabled = true } scheduled_smoke_tests_settings = { enable_scheduled_smoke_tests = false diff --git a/infra/modules/forms-runner/main.tf b/infra/modules/forms-runner/main.tf index 90ba7ca00..5b300ddcc 100644 --- a/infra/modules/forms-runner/main.tf +++ b/infra/modules/forms-runner/main.tf @@ -194,10 +194,6 @@ module "ecs_service" { name = "SETTINGS__SES_SUBMISSION_EMAIL__REPLY_TO_EMAIL_ADDRESS", value = var.ses_submission_email_reply_to_email_address }, - { - name = "SETTINGS__FEATURES__SES_SUBMISSIONS", - value = var.ses_submissions_enabled - }, { name = "KMS_KEY_ID", value = aws_kms_alias.active_record_alias.name diff --git a/infra/modules/forms-runner/variables.tf b/infra/modules/forms-runner/variables.tf index bbadc6c36..ad37d211a 100644 --- a/infra/modules/forms-runner/variables.tf +++ b/infra/modules/forms-runner/variables.tf @@ -86,12 +86,6 @@ variable "api_v2_enabled" { default = false } -variable "ses_submissions_enabled" { - type = bool - description = "Use AWS SES for all submission emails when enabled." - default = false -} - variable "additional_submissions_to_s3_role_assumers" { type = list(string) description = "A list of role ARNs which are also allowed to assume the role for submissions to s3"