Merge pull request #89 from terraform-google-modules/internal/remove-…

…credentials-path Remove credentials_path and credentials_path_relative
terraform-google-modules · Mar 27, 2019 · ff61512 · ff61512
2 parents 5dc6786 + fc43491
commit ff61512
Show file tree

Hide file tree

Showing 60 changed files with 28 additions and 199 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,18 +14,13 @@
  * limitations under the License.
  */
 
-locals {
-  credentials_path = "${path.module}/${var.credentials_path_relative}"
-}
-
 resource "random_string" "suffix" {
   length  = 4
   special = false
   upper   = false
 }
 
 provider "google" {
-  credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }