Revert "Remove TFE variables already defined in variable sets"

This reverts commit d0691f4.

tf-modules/environment_workspace/variables.tf

@@ -2,9 +2,14 @@ variable "name" {
   description = "Environment name"
 }
 
+variable "shared_infra_gcp_project_id" {}
 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 "tfe_organization" {
   default = "Relaycorp"
 }

tf-workspace/environments.tf

@@ -6,6 +6,11 @@ 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]
 }
 

tf-workspace/tfe.tf

@@ -3,8 +3,8 @@ locals {
 }
 
 resource "tfe_variable_set" "environments" {
-  name          = "Internet Gateway Environments"
-  description   = "Variables shared by all Internet gateway environments"
+  name          = "Public Gateway Environments"
+  description   = "Variables shared by all public gateway environments"
   organization  = local.tfe_organization
   workspace_ids = local.env_workspace_ids
 }