remove unnecesary gcp_project_id in root module

hashicorp · Nov 22, 2023 · 6dec8e2 · 6dec8e2
1 parent 84d4fab
commit 6dec8e2
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 55 deletions.
diff --git a/examples/active-active-proxy/main.tf b/examples/active-active-proxy/main.tf
@@ -36,7 +36,6 @@ module "test_proxy" {
 module "active_active_proxy" {
   source = "../../"
 
-  gcp_project_id              = var.gcp_project_id
   ca_certificate_secret_id    = var.ca_certificate_secret_id
   distribution                = "rhel"
   dns_zone_name               = var.dns_zone_name

diff --git a/examples/existing-network/main.tf b/examples/existing-network/main.tf
@@ -21,7 +21,6 @@ module "secrets" {
 module "existing_network" {
   source = "../../"
 
-  gcp_project_id              = var.gcp_project_id
   distribution                = "ubuntu"
   dns_zone_name               = var.dns_zone_name
   existing_service_account_id = var.existing_service_account_id

diff --git a/examples/existing-network/variables.tf b/examples/existing-network/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "dns_zone_name" {
   description = "The name of the DNS zone in which a record will be created."
   type        = string

diff --git a/examples/external-dns/main.tf b/examples/external-dns/main.tf
@@ -23,7 +23,6 @@ module "secrets" {
 module "tfe" {
   source = "../../"
 
-  gcp_project_id              = var.gcp_project_id
   distribution                = "ubuntu"
   dns_create_record           = var.dns_create_record
   dns_zone_name               = var.dns_zone_name

diff --git a/examples/external-dns/variables.tf b/examples/external-dns/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "dns_zone_name" {
   description = "The name of the DNS zone in which a record will be created."
   type        = string

diff --git a/examples/standalone-airgap-dev/main.tf b/examples/standalone-airgap-dev/main.tf
@@ -23,7 +23,6 @@ module "secrets" {
 module "tfe" {
   source = "../.."
 
-  gcp_project_id                            = var.gcp_project_id
   airgap_url                                = var.airgap_url
   tfe_license_bootstrap_airgap_package_path = "/var/lib/ptfe/ptfe.airgap"
 

diff --git a/examples/standalone-airgap-dev/variables.tf b/examples/standalone-airgap-dev/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "airgap_url" {
   description = "The URL of the storage bucket object that comprises an airgap package."
   type        = string

diff --git a/examples/standalone-airgap/main.tf b/examples/standalone-airgap/main.tf
@@ -6,7 +6,6 @@
 module "tfe" {
   source = "../../"
 
-  gcp_project_id = var.gcp_project_id
   # Air-gap
   existing_service_account_id               = var.existing_service_account_id
   tfe_license_bootstrap_airgap_package_path = "/var/lib/ptfe/ptfe.airgap"

diff --git a/examples/standalone-airgap/variables.tf b/examples/standalone-airgap/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "dns_zone_name" {
   description = "The name of the DNS zone in which a record will be created."
   type        = string

diff --git a/examples/standalone-mounted/main.tf b/examples/standalone-mounted/main.tf
@@ -23,7 +23,6 @@ module "secrets" {
 module "tfe" {
   source = "../../"
 
-  gcp_project_id              = var.gcp_project_id
   distribution                = "ubuntu"
   dns_zone_name               = var.dns_zone_name
   existing_service_account_id = var.existing_service_account_id

diff --git a/examples/standalone-mounted/variables.tf b/examples/standalone-mounted/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "dns_zone_name" {
   description = "The name of the DNS zone in which a record will be created."
   type        = string

diff --git a/tests/private-active-active/main.tf b/tests/private-active-active/main.tf
@@ -35,7 +35,6 @@ module "secrets" {
 module "tfe" {
   source = "../.."
 
-  gcp_project_id                = var.gcp_project_id
   consolidated_services_enabled = var.consolidated_services_enabled
   distribution                  = "rhel"
   dns_zone_name                 = data.google_dns_managed_zone.main.name

diff --git a/tests/private-tcp-active-active/main.tf b/tests/private-tcp-active-active/main.tf
@@ -37,7 +37,6 @@ module "secrets" {
 module "tfe" {
   source = "../.."
 
-  gcp_project_id                = var.gcp_project_id
   bypass_preflight_checks       = true
   consolidated_services_enabled = var.consolidated_services_enabled
   distribution                  = "rhel"

diff --git a/tests/public-active-active/variables.tf b/tests/public-active-active/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "consolidated_services_enabled" {
   default     = true
   type        = bool

diff --git a/tests/standalone-external-rhel8-worker/variables.tf b/tests/standalone-external-rhel8-worker/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "consolidated_services_enabled" {
   default     = true
   type        = bool

diff --git a/tests/standalone-mounted-disk/main.tf b/tests/standalone-mounted-disk/main.tf
@@ -32,7 +32,6 @@ resource "local_file" "private_key_pem" {
 
 module "tfe" {
   source                        = "../.."
-  gcp_project_id                = var.gcp_project_id
   consolidated_services_enabled = var.consolidated_services_enabled
   disk_path                     = "/opt/hashicorp/data"
   distribution                  = "ubuntu"

diff --git a/tests/standalone-mounted-disk/variables.tf b/tests/standalone-mounted-disk/variables.tf
@@ -1,10 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "consolidated_services_enabled" {
   default     = true
   type        = bool

diff --git a/variables.tf b/variables.tf
@@ -3,12 +3,6 @@
 
 # GENERAL
 # -------
-
-variable "gcp_project_id" {
-  description = "GCP Project ID to deploy resources into."
-  type        = string
-}
-
 variable "ca_certificate_secret_id" {
   default     = null
   description = "The Secret Manager secret which comprises the Base64 encoded PEM certificate file for a Certificate Authority. The Terraform provider calls this value the secret_id and the GCP UI calls it the name."