Use tfvars files for all rds workspaces

Author: samsimpson1

terraform/deployments/tfc-configuration/rds.tf

@@ -45,14 +45,18 @@ module "rds-integration" {
 module "rds-staging" {
   source = "github.com/alphagov/terraform-govuk-tfe-workspacer"
 
-  organization        = var.organization
-  workspace_name      = "rds-staging"
-  workspace_desc      = "This module manages AWS resources for creating RDS databases."
-  workspace_tags      = ["staging", "rds", "eks", "aws"]
-  terraform_version   = var.terraform_version
-  execution_mode      = "remote"
-  working_directory   = "/terraform/deployments/rds/"
-  trigger_patterns    = ["/terraform/deployments/rds/**/*"]
+  organization      = var.organization
+  workspace_name    = "rds-staging"
+  workspace_desc    = "This module manages AWS resources for creating RDS databases."
+  workspace_tags    = ["staging", "rds", "eks", "aws"]
+  terraform_version = var.terraform_version
+  execution_mode    = "remote"
+  working_directory = "/terraform/deployments/rds/"
+  trigger_patterns = [
+    "/terraform/deployments/rds/**/*",
+    "/terraform/variables/staging/common.tfvars",
+    "/terraform/variables/staging/rds.tfvars"
+  ]
   global_remote_state = true
 
   project_name = "govuk-infrastructure"
@@ -71,24 +75,31 @@ module "rds-staging" {
     TF_CLI_ARGS_apply = "-parallelism=30"
   }
 
+  tfvars_files = [
+    "staging/common.tfvars",
+    "staging/rds.tfvars"
+  ]
+
   variable_set_ids = [
-    local.aws_credentials["staging"],
-    module.variable-set-staging.id,
-    module.variable-set-rds-staging.id
+    local.aws_credentials["staging"]
   ]
 }
 
 module "rds-production" {
   source = "github.com/alphagov/terraform-govuk-tfe-workspacer"
 
-  organization        = var.organization
-  workspace_name      = "rds-production"
-  workspace_desc      = "This module manages AWS resources for creating RDS databases."
-  workspace_tags      = ["production", "rds", "eks", "aws"]
-  terraform_version   = var.terraform_version
-  execution_mode      = "remote"
-  working_directory   = "/terraform/deployments/rds/"
-  trigger_patterns    = ["/terraform/deployments/rds/**/*"]
+  organization      = var.organization
+  workspace_name    = "rds-production"
+  workspace_desc    = "This module manages AWS resources for creating RDS databases."
+  workspace_tags    = ["production", "rds", "eks", "aws"]
+  terraform_version = var.terraform_version
+  execution_mode    = "remote"
+  working_directory = "/terraform/deployments/rds/"
+  trigger_patterns = [
+    "/terraform/deployments/rds/**/*",
+    "/terraform/variables/production/common.tfvars",
+    "/terraform/variables/production/rds.tfvars"
+  ]
   global_remote_state = true
 
   project_name = "govuk-infrastructure"
@@ -107,9 +118,12 @@ module "rds-production" {
     TF_CLI_ARGS_apply = "-parallelism=30"
   }
 
+  tfvars_files = [
+    "production/common.tfvars",
+    "production/rds.tfvars"
+  ]
+
   variable_set_ids = [
-    local.aws_credentials["production"],
-    module.variable-set-production.id,
-    module.variable-set-rds-production.id
+    local.aws_credentials["production"]
   ]
 }