Skip to content

Revert "Merge pull request #1119 from alphagov/ldeb-add-feature-flag-branching #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasiles merged 1 commit into from
Jan 30, 2025
Merged

Revert "Merge pull request #1119 from alphagov/ldeb-add-feature-flag-branching #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion infra/deployments/forms/forms-admin/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/dev.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/production.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/staging.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/user-research.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions infra/modules/forms-admin/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]

Expand Down
6 changes: 0 additions & 6 deletions infra/modules/forms-admin/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down