Use sensitive variables module to create variable sets

alphagov · Jan 30, 2025 · babb38b · babb38b
1 parent 8646b36
commit babb38b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 35 deletions.
diff --git a/terraform/deployments/govuk-publishing-infrastructure/wafs.tf b/terraform/deployments/govuk-publishing-infrastructure/wafs.tf
@@ -5,7 +5,7 @@
 
 module "infrastructure-sensitive_wafs" {
   source  = "app.terraform.io/govuk/infrastructure-sensitive/govuk//modules/wafs"
-  version = "0.0.7"
+  version = "0.0.9"
 
   cache_public_base_rate_limit   = var.cache_public_base_rate_limit
   cache_public_base_rate_warning = var.cache_public_base_rate_warning

diff --git a/terraform/deployments/tfc-configuration/govuk-publishing-infrastructure.tf b/terraform/deployments/tfc-configuration/govuk-publishing-infrastructure.tf
@@ -28,7 +28,8 @@ module "govuk-publishing-infrastructure-integration" {
     "gcp-credentials-integration",
     "common",
     "common-integration",
-    "amazonmq-integration"
+    "amazonmq-integration",
+    "sensitive-waf-integration"
   ]
 }
 
@@ -61,7 +62,8 @@ module "govuk-publishing-infrastructure-staging" {
     "gcp-credentials-staging",
     "common",
     "common-staging",
-    "amazonmq-staging"
+    "amazonmq-staging",
+    "sensitive-waf-staging"
   ]
 }
 
@@ -94,6 +96,7 @@ module "govuk-publishing-infrastructure-production" {
     "gcp-credentials-production",
     "common",
     "common-production",
-    "amazonmq-production"
+    "amazonmq-production",
+    "sensitive-waf-production"
   ]
 }
diff --git a/terraform/deployments/tfc-configuration/variables-common.tf b/terraform/deployments/tfc-configuration/variables-common.tf
@@ -10,9 +10,3 @@ module "variable-set-common" {
     }]
   }
 }
-
-
-module "sensitive-variables" {
-  source  = "app.terraform.io/govuk/infrastructure-sensitive/govuk//modules/variables"
-  version = "0.0.9"
-}
diff --git a/terraform/deployments/tfc-configuration/variables-sensitive.tf b/terraform/deployments/tfc-configuration/variables-sensitive.tf
@@ -1,26 +1,4 @@
-module "variables-sensitive" {
-  source  = "alexbasista/workspacer/tfe"
-  version = "0.12.0"
-
-  organization        = var.organization
-  workspace_name      = "variables-sensitive"
-  workspace_desc      = "This module manages sensitive variables for Terraform Cloud workspaces."
-  workspace_tags      = ["tfc", "variables", "sensitive"]
-  terraform_version   = var.terraform_version
-  execution_mode      = "remote"
-  working_directory   = "/"
-  trigger_patterns    = ["/**/*"]
-  global_remote_state = true
-
-  project_name = "govuk-infrastructure"
-  vcs_repo = {
-    identifier     = "alphagov/govuk-infrastructure-sensitive"
-    branch         = "main"
-    oauth_token_id = data.tfe_oauth_client.github.oauth_token_id
-  }
-
-  team_access = {
-    "GOV.UK Non-Production (r/o)" = "read"
-    "GOV.UK Production"           = "write"
-  }
+module "sensitive-variables" {
+  source  = "app.terraform.io/govuk/infrastructure-sensitive/govuk//modules/variables"
+  version = "0.0.9"
 }