Merge pull request #427 from DFE-Digital/2142-ccbl-migrate-to-gcp-wif…

…-preprod Enable gcp wif in preproduction env
DFE-Digital · Nov 29, 2024 · c7fa38a · c7fa38a
2 parents 1beff34 + 8121f4f
commit c7fa38a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/terraform/aks/config/preproduction.tfvars.json b/terraform/aks/config/preproduction.tfvars.json
@@ -20,5 +20,7 @@
     "preproduction.check-the-childrens-barred-list.education.gov.uk"
   ],
   "azure_enable_backup_storage": false,
-  "enable_logit": true
+  "enable_logit": true,
+  "enable_dfe_analytics_federated_auth": true,
+  "gcp_dataset_name": "ccbl_events_preprod"
 }
diff --git a/terraform/aks/dfe_analytics.tf b/terraform/aks/dfe_analytics.tf
@@ -11,5 +11,5 @@ module "dfe_analytics" {
   namespace             = var.namespace
   service_short         = var.service_short
   environment           = local.app_name_suffix
-  gcp_dataset           = "ccbl_events_${var.config}"
+  gcp_dataset           = var.gcp_dataset_name != null ? var.gcp_dataset_name  : "ccbl_events_${var.config}"
 }
diff --git a/terraform/aks/variables.tf b/terraform/aks/variables.tf
@@ -147,6 +147,12 @@ variable "config" {
   description = "Long name of the environment configuration, e.g. development, staging, production..."
 }
 
+variable "gcp_dataset_name" {
+  description = "Name of the GCP dataset used by Bigquery for an environment. If null will use ccbl_events_{var.config} "
+  type    = string
+  default = null
+}
+
 locals {
   service_name = "check-childrens-barred-list"
   version      = "1.9.7"