Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/deployments/forms/forms-runner/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ 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
}
1 change: 1 addition & 0 deletions infra/deployments/forms/inputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ 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
})
}

Expand Down
1 change: 1 addition & 0 deletions infra/deployments/forms/tfvars/dev.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ 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 = false
}
scheduled_smoke_tests_settings = {
enable_scheduled_smoke_tests = true
Expand Down
1 change: 1 addition & 0 deletions infra/deployments/forms/tfvars/production.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ 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 = false
}
scheduled_smoke_tests_settings = {
enable_scheduled_smoke_tests = true
Expand Down
1 change: 1 addition & 0 deletions infra/deployments/forms/tfvars/staging.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ 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 = false
}
scheduled_smoke_tests_settings = {
enable_scheduled_smoke_tests = true
Expand Down
1 change: 1 addition & 0 deletions infra/deployments/forms/tfvars/user-research.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ 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 = false
}
scheduled_smoke_tests_settings = {
enable_scheduled_smoke_tests = false
Expand Down
6 changes: 5 additions & 1 deletion infra/modules/forms-runner/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ 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
},
]

secrets = [
Expand Down
6 changes: 6 additions & 0 deletions infra/modules/forms-runner/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ 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"
Expand Down
Loading