Merge pull request #2005 from alphagov/org-admin-alerts-feature-flag

Add org_admin_alerts_enabled feature flag

Author: SamJamCul

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

@@ -26,6 +26,7 @@ module "forms_admin" {
   act_as_user_enabled               = var.forms_admin_settings.act_as_user_enabled
   welsh_enabled                     = var.forms_admin_settings.welsh_enabled
   daily_submission_emails_enabled   = var.forms_admin_settings.daily_submission_emails_enabled
+  org_admin_alerts_enabled          = var.forms_admin_settings.org_admin_alerts_enabled
   enable_mailchimp_sync             = var.forms_admin_settings.synchronize_to_mailchimp
   enable_organisations_sync         = var.forms_admin_settings.synchronize_orgs_from_govuk
   deploy_account_id                 = var.deploy_account_id

infra/deployments/forms/inputs.tf

@@ -141,6 +141,7 @@ variable "forms_admin_settings" {
     act_as_user_enabled             = bool
     welsh_enabled                   = bool
     daily_submission_emails_enabled = bool
+    org_admin_alerts_enabled        = bool
     govuk_app_domain                = string
     synchronize_to_mailchimp        = bool
     synchronize_orgs_from_govuk     = bool

infra/deployments/forms/tfvars/dev.tfvars

@@ -80,6 +80,7 @@ forms_admin_settings = {
   act_as_user_enabled             = true
   welsh_enabled                   = true
   daily_submission_emails_enabled = true
+  org_admin_alerts_enabled        = true
   govuk_app_domain                = "integration.publishing.service.gov.uk"
   synchronize_to_mailchimp        = false
   synchronize_orgs_from_govuk     = false

infra/deployments/forms/tfvars/production.tfvars

@@ -136,6 +136,7 @@ forms_admin_settings = {
   act_as_user_enabled             = false
   welsh_enabled                   = true
   daily_submission_emails_enabled = false
+  org_admin_alerts_enabled        = false
   govuk_app_domain                = "publishing.service.gov.uk"
   synchronize_to_mailchimp        = true
   synchronize_orgs_from_govuk     = true

infra/deployments/forms/tfvars/staging.tfvars

@@ -45,6 +45,7 @@ forms_admin_settings = {
   act_as_user_enabled             = true
   welsh_enabled                   = true
   daily_submission_emails_enabled = false
+  org_admin_alerts_enabled        = false
   govuk_app_domain                = "staging.publishing.service.gov.uk"
   synchronize_to_mailchimp        = false
   synchronize_orgs_from_govuk     = false

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

@@ -43,6 +43,7 @@ forms_admin_settings = {
   act_as_user_enabled             = false
   welsh_enabled                   = true
   daily_submission_emails_enabled = false
+  org_admin_alerts_enabled        = false
   govuk_app_domain                = ""
   synchronize_to_mailchimp        = false
   synchronize_orgs_from_govuk     = false

infra/modules/forms-admin/main.tf

@@ -163,6 +163,10 @@ module "ecs_service" {
     {
       name  = "SETTINGS__FEATURES__DAILY_SUBMISSION_EMAILS_ENABLED",
       value = var.daily_submission_emails_enabled
+    },
+    {
+      name  = "SETTINGS__FEATURES__ORG_ADMIN_ALERTS_ENABLED",
+      value = var.org_admin_alerts_enabled
     }
   ]
 

infra/modules/forms-admin/variables.tf

@@ -102,6 +102,12 @@ variable "daily_submission_emails_enabled" {
   default     = false
 }
 
+variable "org_admin_alerts_enabled" {
+  type        = bool
+  description = "Enables sending alerts to Org Admins about forms they control"
+  default     = false
+}
+
 variable "enable_mailchimp_sync" {
   type        = bool
   description = "Whether to synchronise the MailChimp mailing lists from the forms-admin user data"