diff --git a/examples/deploy_service/README.md b/examples/deploy_service/README.md index 9d2429490d..4b43c09e72 100644 --- a/examples/deploy_service/README.md +++ b/examples/deploy_service/README.md @@ -16,7 +16,6 @@ It will: |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -31,7 +30,6 @@ It will: | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 6e2a3d2d5c..3b811053bf 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -19,15 +19,13 @@ locals { } provider "google" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "kubernetes" { diff --git a/examples/deploy_service/variables.tf b/examples/deploy_service/variables.tf index 8501b205b3..a4409795b7 100644 --- a/examples/deploy_service/variables.tf +++ b/examples/deploy_service/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/node_pool/README.md b/examples/node_pool/README.md index d3a3ab7098..2146e2c53f 100644 --- a/examples/node_pool/README.md +++ b/examples/node_pool/README.md @@ -10,7 +10,6 @@ This example illustrates how to create a cluster with multiple custom node-pool |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -26,7 +25,6 @@ This example illustrates how to create a cluster with multiple custom node-pool | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index bb5c8c74ed..adf0f1e2af 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -19,15 +19,13 @@ locals { } provider "google" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } module "gke" { diff --git a/examples/node_pool/variables.tf b/examples/node_pool/variables.tf index ebb151e38a..847277a5ba 100644 --- a/examples/node_pool/variables.tf +++ b/examples/node_pool/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/shared_vpc/README.md b/examples/shared_vpc/README.md index 86a561331f..d66cdd5fc4 100644 --- a/examples/shared_vpc/README.md +++ b/examples/shared_vpc/README.md @@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster where the host network i |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -26,7 +25,6 @@ This example illustrates how to create a simple cluster where the host network i | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index d4a4283a6f..ec732c9c08 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -19,15 +19,13 @@ locals { } provider "google" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } module "gke" { diff --git a/examples/shared_vpc/variables.tf b/examples/shared_vpc/variables.tf index 645d2311a1..f8d1189671 100644 --- a/examples/shared_vpc/variables.tf +++ b/examples/shared_vpc/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/simple_regional/README.md b/examples/simple_regional/README.md index f37db67dfc..741c40c32b 100644 --- a/examples/simple_regional/README.md +++ b/examples/simple_regional/README.md @@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster. |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -25,7 +24,6 @@ This example illustrates how to create a simple cluster. | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index 328658cff8..81fb0381f7 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -19,15 +19,13 @@ locals { } provider "google" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } module "gke" { diff --git a/examples/simple_regional/variables.tf b/examples/simple_regional/variables.tf index 8501b205b3..a4409795b7 100644 --- a/examples/simple_regional/variables.tf +++ b/examples/simple_regional/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/simple_regional_private/README.md b/examples/simple_regional_private/README.md index 0b7a1089e1..9987f9dad0 100644 --- a/examples/simple_regional_private/README.md +++ b/examples/simple_regional_private/README.md @@ -10,7 +10,6 @@ This example illustrates how to create a simple private cluster. |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -25,7 +24,6 @@ This example illustrates how to create a simple private cluster. | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 1f1776c8a6..0b2ffcf90c 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -19,9 +19,8 @@ locals { } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } data "google_compute_subnetwork" "subnetwork" { diff --git a/examples/simple_regional_private/variables.tf b/examples/simple_regional_private/variables.tf index 8501b205b3..a4409795b7 100644 --- a/examples/simple_regional_private/variables.tf +++ b/examples/simple_regional_private/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/simple_zonal/README.md b/examples/simple_zonal/README.md index 0e528744dc..229fde7028 100644 --- a/examples/simple_zonal/README.md +++ b/examples/simple_zonal/README.md @@ -9,7 +9,6 @@ This example illustrates how to create a simple cluster. | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -25,7 +24,6 @@ This example illustrates how to create a simple cluster. | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf index 71fe57ed28..904dbc9e51 100644 --- a/examples/simple_zonal/main.tf +++ b/examples/simple_zonal/main.tf @@ -19,15 +19,13 @@ locals { } provider "google" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } module "gke" { diff --git a/examples/simple_zonal/variables.tf b/examples/simple_zonal/variables.tf index 10130ab2d1..62547edfcd 100644 --- a/examples/simple_zonal/variables.tf +++ b/examples/simple_zonal/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/simple_zonal_private/README.md b/examples/simple_zonal_private/README.md index cc1643aec8..0e2c56ff7a 100644 --- a/examples/simple_zonal_private/README.md +++ b/examples/simple_zonal_private/README.md @@ -10,7 +10,6 @@ This example illustrates how to create a simple private cluster. |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -26,7 +25,6 @@ This example illustrates how to create a simple private cluster. | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index 76f7d6da13..e0ba0cbdb3 100644 --- a/examples/simple_zonal_private/main.tf +++ b/examples/simple_zonal_private/main.tf @@ -19,9 +19,8 @@ locals { } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } data "google_compute_subnetwork" "subnetwork" { diff --git a/examples/simple_zonal_private/variables.tf b/examples/simple_zonal_private/variables.tf index ebb151e38a..847277a5ba 100644 --- a/examples/simple_zonal_private/variables.tf +++ b/examples/simple_zonal_private/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/examples/stub_domains/README.md b/examples/stub_domains/README.md index 5bff5843f1..4c380ada81 100644 --- a/examples/stub_domains/README.md +++ b/examples/stub_domains/README.md @@ -15,7 +15,6 @@ It will: |------|-------------|:----:|:-----:|:-----:| | cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | | compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | | ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | | ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | | network | The VPC network to host the cluster in | string | n/a | yes | @@ -30,7 +29,6 @@ It will: | ca\_certificate | | | client\_token | | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | | kubernetes\_endpoint | | diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 1a5568e663..70ace9d6c9 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -19,15 +19,13 @@ locals { } provider "google" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } provider "google-beta" { - version = "~> 2.2" - credentials = "${file(var.credentials_path)}" - region = "${var.region}" + version = "~> 2.2" + region = "${var.region}" } module "gke" { diff --git a/examples/stub_domains/variables.tf b/examples/stub_domains/variables.tf index 8501b205b3..a4409795b7 100644 --- a/examples/stub_domains/variables.tf +++ b/examples/stub_domains/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The project ID to host the cluster in" } -variable "credentials_path" { - description = "The path to the GCP credentials JSON file" -} - variable "cluster_name_suffix" { description = "A suffix to append to the default cluster name" default = "" diff --git a/test/fixtures/all_examples/test_outputs.tf b/test/fixtures/all_examples/test_outputs.tf index 4d1361b7eb..c1d4352219 100644 --- a/test/fixtures/all_examples/test_outputs.tf +++ b/test/fixtures/all_examples/test_outputs.tf @@ -21,10 +21,6 @@ output "project_id" { value = "${var.project_id}" } -output "credentials_path" { - value = "${var.credentials_path}" -} - output "region" { value = "${module.gke.region}" } diff --git a/test/fixtures/deploy_service/example.tf b/test/fixtures/deploy_service/example.tf index ed22358d66..7cc5178569 100644 --- a/test/fixtures/deploy_service/example.tf +++ b/test/fixtures/deploy_service/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/deploy_service" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" network = "${google_compute_network.main.name}" diff --git a/test/fixtures/deploy_service/network.tf b/test/fixtures/deploy_service/network.tf index 64dfbf8aeb..2dfbf2d9b2 100644 --- a/test/fixtures/deploy_service/network.tf +++ b/test/fixtures/deploy_service/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/node_pool/example.tf b/test/fixtures/node_pool/example.tf index 26086812e9..097c9e3bcf 100644 --- a/test/fixtures/node_pool/example.tf +++ b/test/fixtures/node_pool/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/node_pool" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" zones = ["${slice(var.zones,0,1)}"] diff --git a/test/fixtures/node_pool/network.tf b/test/fixtures/node_pool/network.tf index 64dfbf8aeb..2dfbf2d9b2 100644 --- a/test/fixtures/node_pool/network.tf +++ b/test/fixtures/node_pool/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/shared/outputs.tf b/test/fixtures/shared/outputs.tf index ee85f31f4e..229dc82689 100644 --- a/test/fixtures/shared/outputs.tf +++ b/test/fixtures/shared/outputs.tf @@ -18,10 +18,6 @@ output "project_id" { value = "${var.project_id}" } -output "credentials_path" { - value = "${local.credentials_path}" -} - output "region" { value = "${module.example.region}" } diff --git a/test/fixtures/shared/terraform.tfvars.sample b/test/fixtures/shared/terraform.tfvars.sample index b1f826ed7e..3110e9b3d5 100644 --- a/test/fixtures/shared/terraform.tfvars.sample +++ b/test/fixtures/shared/terraform.tfvars.sample @@ -1,5 +1,4 @@ project_id="" -credentials_path_relative="../../../credentials.json" region="us-east4" zones=["us-east4-a","us-east4-b","us-east4-c"] compute_engine_service_account="" diff --git a/test/fixtures/shared/variables.tf b/test/fixtures/shared/variables.tf index 8955c2e0be..28b827b0d5 100644 --- a/test/fixtures/shared/variables.tf +++ b/test/fixtures/shared/variables.tf @@ -18,10 +18,6 @@ variable "project_id" { description = "The GCP project to use for integration tests" } -variable "credentials_path_relative" { - description = "The relative path from the fixture directory to the GCP credentials file that will run Terraform tests" -} - variable "region" { description = "The GCP region to create and test resources in" } diff --git a/test/fixtures/shared_vpc/example.tf b/test/fixtures/shared_vpc/example.tf index 58b784a7ae..276e8f9dd7 100644 --- a/test/fixtures/shared_vpc/example.tf +++ b/test/fixtures/shared_vpc/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/shared_vpc" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" network = "${google_compute_network.main.name}" diff --git a/test/fixtures/shared_vpc/network.tf b/test/fixtures/shared_vpc/network.tf index 64dfbf8aeb..2dfbf2d9b2 100644 --- a/test/fixtures/shared_vpc/network.tf +++ b/test/fixtures/shared_vpc/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/simple_regional/example.tf b/test/fixtures/simple_regional/example.tf index 3f0855d225..ea14fbc3f8 100644 --- a/test/fixtures/simple_regional/example.tf +++ b/test/fixtures/simple_regional/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/simple_regional" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" network = "${google_compute_network.main.name}" diff --git a/test/fixtures/simple_regional/network.tf b/test/fixtures/simple_regional/network.tf index 64dfbf8aeb..2dfbf2d9b2 100644 --- a/test/fixtures/simple_regional/network.tf +++ b/test/fixtures/simple_regional/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/simple_regional_private/example.tf b/test/fixtures/simple_regional_private/example.tf index ddd8058572..beefece56c 100644 --- a/test/fixtures/simple_regional_private/example.tf +++ b/test/fixtures/simple_regional_private/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/simple_regional_private" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" network = "${google_compute_network.main.name}" diff --git a/test/fixtures/simple_regional_private/network.tf b/test/fixtures/simple_regional_private/network.tf index 6228192e31..0f7492d884 100644 --- a/test/fixtures/simple_regional_private/network.tf +++ b/test/fixtures/simple_regional_private/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google-beta" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/simple_zonal/example.tf b/test/fixtures/simple_zonal/example.tf index 2874e4b91e..e85f1818ba 100644 --- a/test/fixtures/simple_zonal/example.tf +++ b/test/fixtures/simple_zonal/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/simple_zonal" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" zones = ["${slice(var.zones,0,1)}"] diff --git a/test/fixtures/simple_zonal/network.tf b/test/fixtures/simple_zonal/network.tf index 64dfbf8aeb..2dfbf2d9b2 100644 --- a/test/fixtures/simple_zonal/network.tf +++ b/test/fixtures/simple_zonal/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/simple_zonal_private/example.tf b/test/fixtures/simple_zonal_private/example.tf index b45355ccf9..6fd14c4c4c 100644 --- a/test/fixtures/simple_zonal_private/example.tf +++ b/test/fixtures/simple_zonal_private/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/simple_zonal_private" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" zones = ["${slice(var.zones,0,1)}"] diff --git a/test/fixtures/simple_zonal_private/network.tf b/test/fixtures/simple_zonal_private/network.tf index 6228192e31..0f7492d884 100644 --- a/test/fixtures/simple_zonal_private/network.tf +++ b/test/fixtures/simple_zonal_private/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google-beta" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/fixtures/stub_domains/example.tf b/test/fixtures/stub_domains/example.tf index 0170e24577..1072411867 100644 --- a/test/fixtures/stub_domains/example.tf +++ b/test/fixtures/stub_domains/example.tf @@ -18,7 +18,6 @@ module "example" { source = "../../../examples/stub_domains" project_id = "${var.project_id}" - credentials_path = "${local.credentials_path}" cluster_name_suffix = "-${random_string.suffix.result}" region = "${var.region}" network = "${google_compute_network.main.name}" diff --git a/test/fixtures/stub_domains/network.tf b/test/fixtures/stub_domains/network.tf index 64dfbf8aeb..2dfbf2d9b2 100644 --- a/test/fixtures/stub_domains/network.tf +++ b/test/fixtures/stub_domains/network.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -locals { - credentials_path = "${path.module}/${var.credentials_path_relative}" -} - resource "random_string" "suffix" { length = 4 special = false @@ -25,7 +21,6 @@ resource "random_string" "suffix" { } provider "google" { - credentials = "${file(local.credentials_path)}" project = "${var.project_id}" } diff --git a/test/integration/deploy_service/controls/gcloud.rb b/test/integration/deploy_service/controls/gcloud.rb index ccdcd3e461..2f8cfb2a38 100644 --- a/test/integration/deploy_service/controls/gcloud.rb +++ b/test/integration/deploy_service/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/deploy_service/inspec.yml b/test/integration/deploy_service/inspec.yml index 947d2a13e8..f01c60e9ac 100644 --- a/test/integration/deploy_service/inspec.yml +++ b/test/integration/deploy_service/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/node_pool/controls/gcloud.rb b/test/integration/node_pool/controls/gcloud.rb index a89e3eced0..866f7af400 100644 --- a/test/integration/node_pool/controls/gcloud.rb +++ b/test/integration/node_pool/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/node_pool/inspec.yml b/test/integration/node_pool/inspec.yml index a38e10b807..79cc899016 100644 --- a/test/integration/node_pool/inspec.yml +++ b/test/integration/node_pool/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/shared_vpc/controls/gcloud.rb b/test/integration/shared_vpc/controls/gcloud.rb index ccdcd3e461..2f8cfb2a38 100644 --- a/test/integration/shared_vpc/controls/gcloud.rb +++ b/test/integration/shared_vpc/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/shared_vpc/inspec.yml b/test/integration/shared_vpc/inspec.yml index c4cdfdd1a4..aa4303bc38 100644 --- a/test/integration/shared_vpc/inspec.yml +++ b/test/integration/shared_vpc/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/simple_regional/controls/gcloud.rb b/test/integration/simple_regional/controls/gcloud.rb index 83f33be1c3..e3fba671b3 100644 --- a/test/integration/simple_regional/controls/gcloud.rb +++ b/test/integration/simple_regional/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/simple_regional/inspec.yml b/test/integration/simple_regional/inspec.yml index 802697b75a..b4b455a341 100644 --- a/test/integration/simple_regional/inspec.yml +++ b/test/integration/simple_regional/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/simple_regional_private/controls/gcloud.rb b/test/integration/simple_regional_private/controls/gcloud.rb index 18ee9e0293..f4df827813 100644 --- a/test/integration/simple_regional_private/controls/gcloud.rb +++ b/test/integration/simple_regional_private/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/simple_regional_private/inspec.yml b/test/integration/simple_regional_private/inspec.yml index 7ee916787d..ebe54e2374 100644 --- a/test/integration/simple_regional_private/inspec.yml +++ b/test/integration/simple_regional_private/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/simple_zonal/controls/gcloud.rb b/test/integration/simple_zonal/controls/gcloud.rb index f65986b0a8..cab5f8e4fd 100644 --- a/test/integration/simple_zonal/controls/gcloud.rb +++ b/test/integration/simple_zonal/controls/gcloud.rb @@ -17,9 +17,6 @@ cluster_name = attribute('cluster_name') service_account = attribute('service_account') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/simple_zonal/inspec.yml b/test/integration/simple_zonal/inspec.yml index 8b66718e9c..fb587182c7 100644 --- a/test/integration/simple_zonal/inspec.yml +++ b/test/integration/simple_zonal/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/simple_zonal_private/controls/gcloud.rb b/test/integration/simple_zonal_private/controls/gcloud.rb index a2bc62eba9..2f808e136c 100644 --- a/test/integration/simple_zonal_private/controls/gcloud.rb +++ b/test/integration/simple_zonal_private/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/simple_zonal_private/inspec.yml b/test/integration/simple_zonal_private/inspec.yml index 7ee916787d..ebe54e2374 100644 --- a/test/integration/simple_zonal_private/inspec.yml +++ b/test/integration/simple_zonal_private/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string diff --git a/test/integration/stub_domains/controls/gcloud.rb b/test/integration/stub_domains/controls/gcloud.rb index a20fb67a89..03612e151e 100644 --- a/test/integration/stub_domains/controls/gcloud.rb +++ b/test/integration/stub_domains/controls/gcloud.rb @@ -16,9 +16,6 @@ location = attribute('location') cluster_name = attribute('cluster_name') -credentials_path = attribute('credentials_path') -ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = credentials_path - control "gcloud" do title "Google Compute Engine GKE configuration" describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do diff --git a/test/integration/stub_domains/inspec.yml b/test/integration/stub_domains/inspec.yml index 0dfb503568..1d9b10bbe0 100644 --- a/test/integration/stub_domains/inspec.yml +++ b/test/integration/stub_domains/inspec.yml @@ -3,9 +3,6 @@ attributes: - name: project_id required: true type: string - - name: credentials_path - required: true - type: string - name: location required: true type: string