Run terraform fmt as part of linting

Jberlinsky · Jberlinsky · commit 2bbf53ad1b8d · 2018-12-13T17:07:15.000-05:00
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -142,7 +142,7 @@ resource "null_resource" "wait_for_regional_cluster" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when    = "destroy"
     command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
   }
 
diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -142,7 +142,7 @@ resource "null_resource" "wait_for_zonal_cluster" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when    = "destroy"
     command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
   }
 
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -33,14 +33,14 @@ provider "kubernetes" {
 data "google_client_config" "default" {}
 
 module "gke" {
-  source            = "../../"
-  project_id        = "${var.project_id}"
-  name              = "${local.cluster_type}-cluster"
-  region            = "${var.region}"
-  network           = "${var.network}"
-  subnetwork        = "${var.subnetwork}"
-  ip_range_pods     = "${var.ip_range_pods}"
-  ip_range_services = "${var.ip_range_services}"
+  source             = "../../"
+  project_id         = "${var.project_id}"
+  name               = "${local.cluster_type}-cluster"
+  region             = "${var.region}"
+  network            = "${var.network}"
+  subnetwork         = "${var.subnetwork}"
+  ip_range_pods      = "${var.ip_range_pods}"
+  ip_range_services  = "${var.ip_range_services}"
   kubernetes_version = "1.11.5-gke.4"
   service_account    = "${var.compute_engine_service_account}"
 }
diff --git a/examples/deploy_service/outputs.tf b/examples/deploy_service/outputs.tf
@@ -25,5 +25,5 @@ output "client_token" {
 }
 
 output "ca_certificate" {
-  value     = "${module.gke.ca_certificate}"
+  value = "${module.gke.ca_certificate}"
 }
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -24,21 +24,21 @@ provider "google" {
 }
 
 module "gke" {
-  source            = "../../"
-  project_id        = "${var.project_id}"
-  name              = "${local.cluster_type}-cluster"
-  region            = "${var.region}"
-  network           = "${var.network}"
-  subnetwork        = "${var.subnetwork}"
-  ip_range_pods     = "${var.ip_range_pods}"
-  ip_range_services = "${var.ip_range_services}"
+  source             = "../../"
+  project_id         = "${var.project_id}"
+  name               = "${local.cluster_type}-cluster"
+  region             = "${var.region}"
+  network            = "${var.network}"
+  subnetwork         = "${var.subnetwork}"
+  ip_range_pods      = "${var.ip_range_pods}"
+  ip_range_services  = "${var.ip_range_services}"
   kubernetes_version = "1.11.5-gke.4"
-  node_version = "1.11.5-gke.4"
+  node_version       = "1.11.5-gke.4"
 
   node_pools = [
     {
-      name      = "pool-01"
-      min_count = 4
+      name            = "pool-01"
+      min_count       = 4
       service_account = "${var.compute_engine_service_account}"
     },
     {
diff --git a/examples/node_pool/outputs.tf b/examples/node_pool/outputs.tf
@@ -25,5 +25,5 @@ output "client_token" {
 }
 
 output "ca_certificate" {
-  value     = "${module.gke.ca_certificate}"
+  value = "${module.gke.ca_certificate}"
 }
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -24,17 +24,17 @@ provider "google" {
 }
 
 module "gke" {
-  source            = "../../"
-  project_id        = "${var.project_id}"
-  name              = "${local.cluster_type}-cluster"
-  regional          = true
-  region            = "${var.region}"
-  network           = "${var.network}"
-  subnetwork        = "${var.subnetwork}"
-  ip_range_pods     = "${var.ip_range_pods}"
-  ip_range_services = "${var.ip_range_services}"
+  source             = "../../"
+  project_id         = "${var.project_id}"
+  name               = "${local.cluster_type}-cluster"
+  regional           = true
+  region             = "${var.region}"
+  network            = "${var.network}"
+  subnetwork         = "${var.subnetwork}"
+  ip_range_pods      = "${var.ip_range_pods}"
+  ip_range_services  = "${var.ip_range_services}"
   kubernetes_version = "1.11.5-gke.4"
-  node_version = "1.11.5-gke.4"
+  node_version       = "1.11.5-gke.4"
   service_account    = "${var.compute_engine_service_account}"
 }
 
diff --git a/examples/simple_regional/outputs.tf b/examples/simple_regional/outputs.tf
@@ -25,5 +25,5 @@ output "client_token" {
 }
 
 output "ca_certificate" {
-  value     = "${module.gke.ca_certificate}"
+  value = "${module.gke.ca_certificate}"
 }
diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
@@ -24,18 +24,18 @@ provider "google" {
 }
 
 module "gke" {
-  source            = "../../"
-  project_id        = "${var.project_id}"
-  name              = "${local.cluster_type}-cluster"
-  regional          = false
-  region            = "${var.region}"
-  zones             = "${var.zones}"
-  network           = "${var.network}"
-  subnetwork        = "${var.subnetwork}"
-  ip_range_pods     = "${var.ip_range_pods}"
-  ip_range_services = "${var.ip_range_services}"
+  source             = "../../"
+  project_id         = "${var.project_id}"
+  name               = "${local.cluster_type}-cluster"
+  regional           = false
+  region             = "${var.region}"
+  zones              = "${var.zones}"
+  network            = "${var.network}"
+  subnetwork         = "${var.subnetwork}"
+  ip_range_pods      = "${var.ip_range_pods}"
+  ip_range_services  = "${var.ip_range_services}"
   kubernetes_version = "1.11.4-gke.8"
-  node_version = "1.11.4-gke.8"
+  node_version       = "1.11.4-gke.8"
   service_account    = "${var.compute_engine_service_account}"
 }
 
diff --git a/examples/simple_zonal/outputs.tf b/examples/simple_zonal/outputs.tf
@@ -25,5 +25,5 @@ output "client_token" {
 }
 
 output "ca_certificate" {
-  value     = "${module.gke.ca_certificate}"
+  value = "${module.gke.ca_certificate}"
 }
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -24,17 +24,17 @@ provider "google" {
 }
 
 module "gke" {
-  source            = "../../"
-  project_id        = "${var.project_id}"
-  name              = "${local.cluster_type}-cluster"
-  region            = "${var.region}"
-  network           = "${var.network}"
-  subnetwork        = "${var.subnetwork}"
-  ip_range_pods     = "${var.ip_range_pods}"
-  ip_range_services = "${var.ip_range_services}"
-  network_policy = true
+  source             = "../../"
+  project_id         = "${var.project_id}"
+  name               = "${local.cluster_type}-cluster"
+  region             = "${var.region}"
+  network            = "${var.network}"
+  subnetwork         = "${var.subnetwork}"
+  ip_range_pods      = "${var.ip_range_pods}"
+  ip_range_services  = "${var.ip_range_services}"
+  network_policy     = true
   kubernetes_version = "1.11.5-gke.4"
-  node_version = "1.11.5-gke.4"
+  node_version       = "1.11.5-gke.4"
   service_account    = "${var.compute_engine_service_account}"
 
   stub_domains {
diff --git a/examples/stub_domains/outputs.tf b/examples/stub_domains/outputs.tf
@@ -25,5 +25,5 @@ output "client_token" {
 }
 
 output "ca_certificate" {
-  value     = "${module.gke.ca_certificate}"
+  value = "${module.gke.ca_certificate}"
 }
diff --git a/main.tf b/main.tf
@@ -23,7 +23,7 @@ data "google_compute_zones" "available" {
 }
 
 resource "random_shuffle" "available_zones" {
-  input = ["${data.google_compute_zones.available.names}"]
+  input        = ["${data.google_compute_zones.available.names}"]
   result_count = 3
 }
 
diff --git a/test/fixtures/deploy_service/example.tf b/test/fixtures/deploy_service/example.tf
@@ -17,12 +17,12 @@
 module "example" {
   source = "../../../examples/deploy_service"
 
-  project_id = "${var.project_id}"
-  credentials_path = "${local.credentials_path}"
-  region = "${var.region}"
-  network = "${google_compute_network.main.name}"
-  subnetwork = "${google_compute_subnetwork.main.name}"
-  ip_range_pods = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
-  ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
+  project_id                     = "${var.project_id}"
+  credentials_path               = "${local.credentials_path}"
+  region                         = "${var.region}"
+  network                        = "${google_compute_network.main.name}"
+  subnetwork                     = "${google_compute_subnetwork.main.name}"
+  ip_range_pods                  = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
+  ip_range_services              = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
   compute_engine_service_account = "${var.compute_engine_service_account}"
 }
diff --git a/test/fixtures/deploy_service/network.tf b/test/fixtures/deploy_service/network.tf
@@ -19,32 +19,34 @@ locals {
 }
 
 resource "random_string" "suffix" {
-  length = 4
+  length  = 4
   special = false
-  upper = false
+  upper   = false
 }
 
 provider "google" {
   credentials = "${file(local.credentials_path)}"
-  project = "${var.project_id}"
+  project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
-  name = "cft-gke-test-${random_string.suffix.result}"
+  name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
-  name = "cft-gke-test-${random_string.suffix.result}"
+  name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
-  region = "${var.region}"
-  network = "${google_compute_network.main.self_link}"
+  region        = "${var.region}"
+  network       = "${google_compute_network.main.self_link}"
+
   secondary_ip_range {
-    range_name = "cft-gke-test-pods-${random_string.suffix.result}"
+    range_name    = "cft-gke-test-pods-${random_string.suffix.result}"
     ip_cidr_range = "192.168.0.0/18"
   }
+
   secondary_ip_range {
-    range_name = "cft-gke-test-services-${random_string.suffix.result}"
+    range_name    = "cft-gke-test-services-${random_string.suffix.result}"
     ip_cidr_range = "192.168.64.0/18"
   }
 }
diff --git a/test/fixtures/node_pool/example.tf b/test/fixtures/node_pool/example.tf
@@ -17,12 +17,12 @@
 module "example" {
   source = "../../../examples/node_pool"
 
-  project_id = "${var.project_id}"
-  credentials_path = "${local.credentials_path}"
-  region = "${var.region}"
-  network = "${google_compute_network.main.name}"
-  subnetwork = "${google_compute_subnetwork.main.name}"
-  ip_range_pods = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
-  ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
+  project_id                     = "${var.project_id}"
+  credentials_path               = "${local.credentials_path}"
+  region                         = "${var.region}"
+  network                        = "${google_compute_network.main.name}"
+  subnetwork                     = "${google_compute_subnetwork.main.name}"
+  ip_range_pods                  = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
+  ip_range_services              = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
   compute_engine_service_account = "${var.compute_engine_service_account}"
 }
diff --git a/test/fixtures/node_pool/network.tf b/test/fixtures/node_pool/network.tf
@@ -19,32 +19,34 @@ locals {
 }
 
 resource "random_string" "suffix" {
-  length = 4
+  length  = 4
   special = false
-  upper = false
+  upper   = false
 }
 
 provider "google" {
   credentials = "${file(local.credentials_path)}"
-  project = "${var.project_id}"
+  project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
-  name = "cft-gke-test-${random_string.suffix.result}"
+  name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
-  name = "cft-gke-test-${random_string.suffix.result}"
+  name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
-  region = "${var.region}"
-  network = "${google_compute_network.main.self_link}"
+  region        = "${var.region}"
+  network       = "${google_compute_network.main.self_link}"
+
   secondary_ip_range {
-    range_name = "cft-gke-test-pods-${random_string.suffix.result}"
+    range_name    = "cft-gke-test-pods-${random_string.suffix.result}"
     ip_cidr_range = "192.168.0.0/18"
   }
+
   secondary_ip_range {
-    range_name = "cft-gke-test-services-${random_string.suffix.result}"
+    range_name    = "cft-gke-test-services-${random_string.suffix.result}"
     ip_cidr_range = "192.168.64.0/18"
   }
 }
diff --git a/test/fixtures/shared/outputs.tf b/test/fixtures/shared/outputs.tf
@@ -75,5 +75,5 @@ output "client_token" {
 
 output "ca_certificate" {
   description = "The cluster CA certificate"
-  value = "${module.example.ca_certificate}"
+  value       = "${module.example.ca_certificate}"
 }
diff --git a/test/fixtures/shared/variables.tf b/test/fixtures/shared/variables.tf
@@ -14,23 +14,15 @@
  * limitations under the License.
  */
 
-variable "project_id" {
+variable "project_id" {}
 
-}
-
-variable "credentials_path_relative" {
-
-}
+variable "credentials_path_relative" {}
 
-variable "region" {
-
-}
+variable "region" {}
 
 variable "zones" {
-  type = "list"
+  type    = "list"
   default = []
 }
 
-variable "compute_engine_service_account" {
-
-}
+variable "compute_engine_service_account" {}
diff --git a/test/fixtures/simple_regional/example.tf b/test/fixtures/simple_regional/example.tf
@@ -17,12 +17,12 @@
 module "example" {
   source = "../../../examples/simple_regional"
 
-  project_id = "${var.project_id}"
-  credentials_path = "${local.credentials_path}"
-  region = "${var.region}"
-  network = "${google_compute_network.main.name}"
-  subnetwork = "${google_compute_subnetwork.main.name}"
-  ip_range_pods = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
-  ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
+  project_id                     = "${var.project_id}"
+  credentials_path               = "${local.credentials_path}"
+  region                         = "${var.region}"
+  network                        = "${google_compute_network.main.name}"
+  subnetwork                     = "${google_compute_subnetwork.main.name}"
+  ip_range_pods                  = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
+  ip_range_services              = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
   compute_engine_service_account = "${var.compute_engine_service_account}"
 }
diff --git a/test/fixtures/simple_regional/network.tf b/test/fixtures/simple_regional/network.tf
diff --git a/test/fixtures/simple_zonal/example.tf b/test/fixtures/simple_zonal/example.tf
diff --git a/test/fixtures/simple_zonal/network.tf b/test/fixtures/simple_zonal/network.tf
diff --git a/test/fixtures/stub_domains/example.tf b/test/fixtures/stub_domains/example.tf
diff --git a/test/fixtures/stub_domains/network.tf b/test/fixtures/stub_domains/network.tf
diff --git a/test/make.sh b/test/make.sh
diff --git a/variables.tf b/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ resource "null_resource" "wait_for_regional_cluster" {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`provisioner "local-exec" {`
`145`		`- when = "destroy"`
	`145`	`+ when = "destroy"`
`146`	`146`	`command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ output "client_token" {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`output "ca_certificate" {`
`28`		`- value = "${module.gke.ca_certificate}"`
	`28`	`+ value = "${module.gke.ca_certificate}"`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ data "google_compute_zones" "available" {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`resource "random_shuffle" "available_zones" {`
`26`		`- input = ["${data.google_compute_zones.available.names}"]`
	`26`	`+ input = ["${data.google_compute_zones.available.names}"]`
`27`	`27`	`result_count = 3`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,5 @@ output "client_token" {`
`75`	`75`
`76`	`76`	`output "ca_certificate" {`
`77`	`77`	`description = "The cluster CA certificate"`
`78`		`- value = "${module.example.ca_certificate}"`
	`78`	`+ value = "${module.example.ca_certificate}"`
`79`	`79`	`}`