Merge pull request #135 from terraform-google-modules/aaron-lane-format-autogen

Fix format of autogenerated files

Author: aaron-lane

autogen/main.tf

@@ -162,5 +162,6 @@ data "google_container_engine_versions" "zone" {
   //     data.google_container_engine_versions.zone: Cannot determine zone: set in this resource, or set provider-level zone.
   //
   zone     = "${var.zones[0] == "" ? data.google_compute_zones.available.names[0] : var.zones[0]}"
+
   project  = "${var.project_id}"
 }

autogen/variables.tf

@@ -129,7 +129,6 @@ variable "disable_legacy_metadata_endpoints" {
   default     = "true"
 }
 
-
 variable "node_pools" {
   type        = "list"
   description = "List of maps containing node pools"
@@ -218,18 +217,19 @@ variable "service_account" {
   default     = ""
 }
 {% if private_cluster %}
+
 variable "enable_private_endpoint" {
-  description  = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
-  default      = false
+  description = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
+  default     = false
 }
 
 variable "enable_private_nodes" {
-  description  = "(Beta) Whether nodes have internal IP addresses only"
-  default      = false
+  description = "(Beta) Whether nodes have internal IP addresses only"
+  default     = false
 }
 
 variable "master_ipv4_cidr_block" {
-  description  = "(Beta) The IP range in CIDR notation to use for the hosted master network"
-  default      = "10.0.0.0/28"
+  description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
+  default     = "10.0.0.0/28"
 }
 {% endif %}

helpers/generate_modules/generate_modules.py

@@ -66,7 +66,7 @@ def main(argv):
                 module.template_options(BASE_TEMPLATE_OPTIONS)
             )
             with open(os.path.join(module.path, template_file), "w") as f:
-                f.write(rendered.rstrip())
+                f.write(rendered)
                 if template_file.endswith(".tf"):
                     subprocess.call(
                         [

main.tf

@@ -161,6 +161,7 @@ data "google_container_engine_versions" "zone" {
   //
   //     data.google_container_engine_versions.zone: Cannot determine zone: set in this resource, or set provider-level zone.
   //
-  zone     = "${var.zones[0] == "" ? data.google_compute_zones.available.names[0] : var.zones[0]}"
-  project  = "${var.project_id}"
-}
+  zone = "${var.zones[0] == "" ? data.google_compute_zones.available.names[0] : var.zones[0]}"
+
+  project = "${var.project_id}"
+}

modules/private-cluster/main.tf

@@ -161,6 +161,7 @@ data "google_container_engine_versions" "zone" {
   //
   //     data.google_container_engine_versions.zone: Cannot determine zone: set in this resource, or set provider-level zone.
   //
-  zone     = "${var.zones[0] == "" ? data.google_compute_zones.available.names[0] : var.zones[0]}"
-  project  = "${var.project_id}"
-}
+  zone = "${var.zones[0] == "" ? data.google_compute_zones.available.names[0] : var.zones[0]}"
+
+  project = "${var.project_id}"
+}

modules/private-cluster/variables.tf

@@ -129,7 +129,6 @@ variable "disable_legacy_metadata_endpoints" {
   default     = "true"
 }
 
-
 variable "node_pools" {
   type        = "list"
   description = "List of maps containing node pools"
@@ -217,17 +216,18 @@ variable "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account. May also specify `create` to automatically create a cluster-specific service account"
   default     = ""
 }
+
 variable "enable_private_endpoint" {
-  description  = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
-  default      = false
+  description = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
+  default     = false
 }
 
 variable "enable_private_nodes" {
-  description  = "(Beta) Whether nodes have internal IP addresses only"
-  default      = false
+  description = "(Beta) Whether nodes have internal IP addresses only"
+  default     = false
 }
 
 variable "master_ipv4_cidr_block" {
-  description  = "(Beta) The IP range in CIDR notation to use for the hosted master network"
-  default      = "10.0.0.0/28"
-}
+  description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
+  default     = "10.0.0.0/28"
+}

variables.tf

@@ -129,7 +129,6 @@ variable "disable_legacy_metadata_endpoints" {
   default     = "true"
 }
 
-
 variable "node_pools" {
   type        = "list"
   description = "List of maps containing node pools"
@@ -216,4 +215,4 @@ variable "monitoring_service" {
 variable "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account. May also specify `create` to automatically create a cluster-specific service account"
   default     = ""
-}
+}