Properly remove TFE variables already defined in variable sets

relaycorp · Jan 11, 2024 · 0913357 · 0913357
1 parent 71ffdb2
commit 0913357
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/tf-modules/environment_workspace/variables.tf b/tf-modules/environment_workspace/variables.tf
@@ -2,13 +2,21 @@ variable "name" {
   description = "Environment name"
 }
 
-variable "shared_infra_gcp_project_id" {}
+variable "shared_infra_gcp_project_id" {
+  default = null // Take from variable set
+}
 variable "gcp_parent_folder" {}
 variable "gcp_billing_account" {}
 
-variable "mongodb_atlas_org_id" {}
-variable "env_mongodb_atlas_public_key" {}
-variable "env_mongodb_atlas_private_key" {}
+variable "mongodb_atlas_org_id" {
+  default = null // Take from variable set
+}
+variable "env_mongodb_atlas_public_key" {
+  default = null // Take from variable set
+}
+variable "env_mongodb_atlas_private_key" {
+  default = null // Take from variable set
+}
 
 variable "tfe_organization" {
   default = "Relaycorp"

diff --git a/tf-workspace/.terraform.lock.hcl b/tf-workspace/.terraform.lock.hcl
diff --git a/tf-workspace/environments.tf b/tf-workspace/environments.tf
@@ -6,11 +6,6 @@ module "env_frankfurt" {
   gcp_parent_folder   = var.gcp_parent_folder
   gcp_billing_account = var.gcp_billing_account
 
-  mongodb_atlas_org_id          = var.mongodb_atlas_org_id
-  env_mongodb_atlas_public_key  = var.env_mongodb_atlas_public_key
-  env_mongodb_atlas_private_key = var.env_mongodb_atlas_private_key
-  shared_infra_gcp_project_id   = data.google_project.main.project_id
-
   depends_on = [google_project_service.iam]
 }