Merge pull request #58 from omazin/fix-test-approach

Fix testing approach. Update examples, tests.
terraform-google-modules · Dec 26, 2019 · 48a9b07 · 48a9b07
2 parents cc9ee9c + 55241dc
commit 48a9b07
Show file tree

Hide file tree

Showing 92 changed files with 219 additions and 1,169 deletions.
diff --git a/examples/compute_instance/simple/README.md b/examples/compute_instance/simple/README.md
@@ -7,10 +7,9 @@ This is a simple, minimal example of how to use the compute_instance module
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | num\_instances | Number of instances to create | string | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
-| region | The GCP region to create and test resources in | string | n/a | yes |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The subnetwork to host the compute instances in | string | n/a | yes |
 

diff --git a/examples/compute_instance/simple/main.tf b/examples/compute_instance/simple/main.tf
@@ -15,10 +15,10 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

diff --git a/examples/compute_instance/simple/variables.tf b/examples/compute_instance/simple/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {
@@ -34,6 +35,8 @@ variable "num_instances" {
   description = "Number of instances to create"
 }
 
+
+
 variable "service_account" {
   default = null
   type = object({

diff --git a/examples/instance_template/additional_disks/README.md b/examples/instance_template/additional_disks/README.md
@@ -8,9 +8,8 @@ instance templates with additional persistent disks.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
-| region | The GCP region to create and test resources in | string | n/a | yes |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The name of the subnetwork create this instance in. | string | `""` | no |
 

diff --git a/examples/instance_template/additional_disks/main.tf b/examples/instance_template/additional_disks/main.tf
@@ -15,10 +15,10 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

diff --git a/examples/instance_template/additional_disks/variables.tf b/examples/instance_template/additional_disks/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {

diff --git a/examples/instance_template/simple/README.md b/examples/instance_template/simple/README.md
@@ -7,10 +7,9 @@ This is a simple, minimal example of how to use the instance_template module.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | labels | Labels, provided as a map | map(string) | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
-| region | The GCP region to create and test resources in | string | n/a | yes |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The name of the subnetwork create this instance in. | string | `""` | no |
 | tags | Network tags, provided as a list | list(string) | n/a | yes |

diff --git a/examples/instance_template/simple/main.tf b/examples/instance_template/simple/main.tf
@@ -15,10 +15,10 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 resource "google_compute_address" "ip_address" {

diff --git a/examples/instance_template/simple/variables.tf b/examples/instance_template/simple/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {

diff --git a/examples/mig/autoscaler/README.md b/examples/mig/autoscaler/README.md
@@ -10,10 +10,9 @@ group with an autoscaler.
 |------|-------------|:----:|:-----:|:-----:|
 | autoscaling\_cpu | Autoscaling, cpu utilization policy block as single element array. https://www.terraform.io/docs/providers/google/r/compute_autoscaler.html#cpu_utilization | list(map(number)) | n/a | yes |
 | autoscaling\_enabled | Creates an autoscaler for the managed instance group | string | n/a | yes |
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | min\_replicas | The minimum number of replicas that the autoscaler can scale down to. This cannot be less than 0. | string | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
-| region | The GCP region to create and test resources in | string | n/a | yes |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The subnetwork to host the compute instances in | string | n/a | yes |
 
@@ -23,5 +22,6 @@ group with an autoscaler.
 |------|-------------|
 | instance\_template\_self\_link | Self-link of instance template |
 | mig\_self\_link | Self-link for managed instance group |
+| region | The GCP region to create and test resources in |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/mig/autoscaler/main.tf b/examples/mig/autoscaler/main.tf
@@ -15,17 +15,17 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

diff --git a/examples/mig/autoscaler/outputs.tf b/examples/mig/autoscaler/outputs.tf
@@ -24,3 +24,7 @@ output "mig_self_link" {
   value       = module.mig.self_link
 }
 
+output "region" {
+  description = "The GCP region to create and test resources in"
+  value       = var.region
+}
diff --git a/examples/mig/autoscaler/variables.tf b/examples/mig/autoscaler/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {

diff --git a/examples/mig/full/main.tf b/examples/mig/full/main.tf
@@ -15,17 +15,17 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

diff --git a/examples/mig/full/variables.tf b/examples/mig/full/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ variable "hostname" {
 
 variable "region" {
   description = "The GCP region where instances will be deployed."
+  type        = string
+  default     = "us-central1"
 }
 
 variable "network" {
@@ -39,12 +41,10 @@ variable "subnetwork" {
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-  default     = ""
-}
+
 
 variable "subnetwork_project" {
   description = "The project that subnetwork belongs to"

diff --git a/examples/mig/simple/README.md b/examples/mig/simple/README.md
@@ -8,9 +8,8 @@ managed instance group.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
-| region | The GCP region to create and test resources in | string | n/a | yes |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The subnetwork to host the compute instances in | string | n/a | yes |
 | target\_size | The target number of running instances for this managed instance group. This value should always be explicitly set unless this resource is attached to an autoscaler, in which case it should never be set. | string | n/a | yes |
@@ -19,6 +18,7 @@ managed instance group.
 
 | Name | Description |
 |------|-------------|
+| region | The GCP region to create and test resources in |
 | self\_link | Self-link of the managed instance group |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/mig/simple/main.tf b/examples/mig/simple/main.tf
@@ -15,15 +15,15 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 provider "google-beta" {
-  credentials = file(var.credentials_path)
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

diff --git a/examples/mig/simple/outputs.tf b/examples/mig/simple/outputs.tf
@@ -19,3 +19,7 @@ output "self_link" {
   value       = module.mig.self_link
 }
 
+output "region" {
+  description = "The GCP region to create and test resources in"
+  value       = var.region
+}
diff --git a/examples/mig/simple/variables.tf b/examples/mig/simple/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {