Skip to content

Commit d93cbf4

Browse files
Add ses_submissions feature flag
1 parent 515f2de commit d93cbf4

8 files changed

Lines changed: 17 additions & 2 deletions

File tree

infra/deployments/forms/forms-runner/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ module "forms_runner" {
6767
send_logs_to_cyber = var.send_logs_to_cyber
6868
bounces_and_complaints_kms_key_arn = data.terraform_remote_state.forms_ses.outputs.submission_email_bounces_and_complaints_kms_key_arn
6969
deliveries_kms_key_arn = data.terraform_remote_state.forms_ses.outputs.submission_email_successful_deliveries_kms_key_arn
70-
70+
ses_submissions_enabled = var.forms_runner_settings.ses_submissions_enabled
7171
}

infra/deployments/forms/inputs.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ variable "forms_runner_settings" {
189189
allow_human_readonly_roles_to_assume_submissions_to_runner_role = bool
190190
ses_submission_email_from_email_address = string
191191
ses_submission_email_reply_to_email_address = string
192+
ses_submissions_enabled = bool
192193
})
193194
}
194195

infra/deployments/forms/tfvars/dev.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ forms_runner_settings = {
106106
allow_human_readonly_roles_to_assume_submissions_to_runner_role = true
107107
ses_submission_email_from_email_address = "no-reply@dev.forms.service.gov.uk"
108108
ses_submission_email_reply_to_email_address = "no-reply@dev.forms.service.gov.uk"
109+
ses_submissions_enabled = false
109110
}
110111
scheduled_smoke_tests_settings = {
111112
enable_scheduled_smoke_tests = true

infra/deployments/forms/tfvars/production.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ forms_runner_settings = {
150150
allow_human_readonly_roles_to_assume_submissions_to_runner_role = false
151151
ses_submission_email_from_email_address = "no-reply@forms.service.gov.uk"
152152
ses_submission_email_reply_to_email_address = "no-reply@forms.service.gov.uk"
153+
ses_submissions_enabled = false
153154
}
154155
scheduled_smoke_tests_settings = {
155156
enable_scheduled_smoke_tests = true

infra/deployments/forms/tfvars/staging.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ forms_runner_settings = {
7171
allow_human_readonly_roles_to_assume_submissions_to_runner_role = false
7272
ses_submission_email_from_email_address = "no-reply@staging.forms.service.gov.uk"
7373
ses_submission_email_reply_to_email_address = "no-reply@staging.forms.service.gov.uk"
74+
ses_submissions_enabled = false
7475
}
7576
scheduled_smoke_tests_settings = {
7677
enable_scheduled_smoke_tests = true

infra/deployments/forms/tfvars/user-research.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ forms_runner_settings = {
6969
ses_submission_email_reply_to_email_address = "no-reply@research.forms.service.gov.uk"
7070
allow_human_readonly_roles_to_assume_submissions_to_s3_role = false
7171
allow_human_readonly_roles_to_assume_submissions_to_runner_role = false
72+
ses_submissions_enabled = false
7273
}
7374
scheduled_smoke_tests_settings = {
7475
enable_scheduled_smoke_tests = false

infra/modules/forms-runner/main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@ module "ecs_service" {
190190
{
191191
name = "SETTINGS__SES_SUBMISSION_EMAIL__REPLY_TO_EMAIL_ADDRESS",
192192
value = var.ses_submission_email_reply_to_email_address
193-
}
193+
},
194+
{
195+
name = "SETTINGS__FEATURES__SES_SUBMISSIONS",
196+
value = var.ses_submissions_enabled
197+
},
194198
]
195199

196200
secrets = [

infra/modules/forms-runner/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ variable "api_v2_enabled" {
8686
default = false
8787
}
8888

89+
variable "ses_submissions_enabled" {
90+
type = bool
91+
description = "Use AWS SES for all submission emails when enabled."
92+
default = false
93+
}
94+
8995
variable "additional_submissions_to_s3_role_assumers" {
9096
type = list(string)
9197
description = "A list of role ARNs which are also allowed to assume the role for submissions to s3"

0 commit comments

Comments
 (0)