diff --git a/infra/deployments/forms/forms-admin/main.tf b/infra/deployments/forms/forms-admin/main.tf index b7a7416e6..8a5432473 100644 --- a/infra/deployments/forms/forms-admin/main.tf +++ b/infra/deployments/forms/forms-admin/main.tf @@ -28,7 +28,6 @@ module "forms_admin" { enable_mailchimp_sync = var.forms_admin_settings.synchronize_to_mailchimp deploy_account_id = var.deploy_account_id repeatable_page_enabled = var.forms_admin_settings.repeatable_page_enabled - branch_routing_enabled = var.forms_admin_settings.branch_routing_enabled vpc_id = data.terraform_remote_state.forms_environment.outputs.vpc_id vpc_cidr_block = data.terraform_remote_state.forms_environment.outputs.vpc_cidr_block private_subnet_ids = data.terraform_remote_state.forms_environment.outputs.private_subnet_ids diff --git a/infra/deployments/forms/inputs.tf b/infra/deployments/forms/inputs.tf index 6566f5f13..1883a39b9 100644 --- a/infra/deployments/forms/inputs.tf +++ b/infra/deployments/forms/inputs.tf @@ -148,7 +148,6 @@ variable "forms_admin_settings" { govuk_app_domain = string synchronize_to_mailchimp = bool repeatable_page_enabled = bool - branch_routing_enabled = bool }) nullable = false } diff --git a/infra/deployments/forms/tfvars/dev.tfvars b/infra/deployments/forms/tfvars/dev.tfvars index 47ba7ee34..14422bdbe 100644 --- a/infra/deployments/forms/tfvars/dev.tfvars +++ b/infra/deployments/forms/tfvars/dev.tfvars @@ -77,7 +77,6 @@ forms_admin_settings = { govuk_app_domain = "integration.publishing.service.gov.uk" synchronize_to_mailchimp = false repeatable_page_enabled = true - branch_routing_enabled = true } forms_api_settings = { cpu = 256 diff --git a/infra/deployments/forms/tfvars/production.tfvars b/infra/deployments/forms/tfvars/production.tfvars index e0db7098e..c2664b0bc 100644 --- a/infra/deployments/forms/tfvars/production.tfvars +++ b/infra/deployments/forms/tfvars/production.tfvars @@ -113,7 +113,6 @@ forms_admin_settings = { govuk_app_domain = "publishing.service.gov.uk" synchronize_to_mailchimp = true repeatable_page_enabled = true - branch_routing_enabled = false } forms_api_settings = { cpu = 512 diff --git a/infra/deployments/forms/tfvars/staging.tfvars b/infra/deployments/forms/tfvars/staging.tfvars index 9385531ba..013b269f7 100644 --- a/infra/deployments/forms/tfvars/staging.tfvars +++ b/infra/deployments/forms/tfvars/staging.tfvars @@ -42,7 +42,6 @@ forms_admin_settings = { govuk_app_domain = "staging.publishing.service.gov.uk" synchronize_to_mailchimp = false repeatable_page_enabled = true - branch_routing_enabled = false } forms_api_settings = { cpu = 256 diff --git a/infra/deployments/forms/tfvars/user-research.tfvars b/infra/deployments/forms/tfvars/user-research.tfvars index fdca6b224..b7b02867a 100644 --- a/infra/deployments/forms/tfvars/user-research.tfvars +++ b/infra/deployments/forms/tfvars/user-research.tfvars @@ -40,7 +40,6 @@ forms_admin_settings = { govuk_app_domain = "" synchronize_to_mailchimp = false repeatable_page_enabled = true - branch_routing_enabled = true } forms_api_settings = { cpu = 256 diff --git a/infra/modules/forms-admin/main.tf b/infra/modules/forms-admin/main.tf index 86914aad7..c2dd7ae3b 100644 --- a/infra/modules/forms-admin/main.tf +++ b/infra/modules/forms-admin/main.tf @@ -174,10 +174,6 @@ module "ecs_service" { { name = "SETTINGS__FEATURES__REPEATABLE_PAGE_ENABLED", value = var.repeatable_page_enabled - }, - { - name = "SETTINGS__FEATURES__BRANCH_ROUTING", - value = var.branch_routing_enabled } ] diff --git a/infra/modules/forms-admin/variables.tf b/infra/modules/forms-admin/variables.tf index a96ef364f..f233e6986 100644 --- a/infra/modules/forms-admin/variables.tf +++ b/infra/modules/forms-admin/variables.tf @@ -100,12 +100,6 @@ variable "repeatable_page_enabled" { default = false } -variable "branch_routing_enabled" { - type = bool - description = "Enables creating routes for branching questions" - default = false -} - variable "enable_mailchimp_sync" { type = bool description = "Whether to synchronise the MailChimp mailing lists from the forms-admin user data"