Skip to content

Commit 1ab6df0

Browse files
committed
Call terraform fmt after generating from templates
1 parent 11588c7 commit 1ab6df0

File tree

10 files changed

+11
-9
lines changed

10 files changed

+11
-9
lines changed

auth.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ provider "kubernetes" {
2727
host = "https://${local.cluster_endpoint}"
2828
token = "${data.google_client_config.default.access_token}"
2929
cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
30-
}
30+
}

cluster_regional.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,4 @@ resource "null_resource" "wait_for_regional_cluster" {
151151
}
152152

153153
depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
154-
}
154+
}

cluster_zonal.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
151151
}
152152

153153
depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
154-
}
154+
}

dns.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ EOF
4949
}
5050

5151
depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
52-
}
52+
}

helpers/generate_modules/generate_modules.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# limitations under the License.
1616

1717
import os
18+
import subprocess
1819
import sys
1920

2021
from jinja2 import Environment, FileSystemLoader
@@ -32,6 +33,7 @@ def main(argv):
3233
with open(os.path.join("./", template_file), "w") as f:
3334
f.write(rendered)
3435

36+
subprocess.call(["terraform", "fmt"])
3537

3638
if __name__ == "__main__":
3739
main(sys.argv)

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ locals {
148148
data "google_container_engine_versions" "region" {
149149
zone = "${data.google_compute_zones.available.names[0]}"
150150
project = "${var.project_id}"
151-
}
151+
}

masq.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ EOF
3939
}
4040

4141
depends_on = ["data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
42-
}
42+
}

networks.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
2323
name = "${var.subnetwork}"
2424
region = "${var.region}"
2525
project = "${local.network_project_id}"
26-
}
26+
}

outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ output "node_pools_names" {
104104
output "node_pools_versions" {
105105
description = "List of node pools versions"
106106
value = "${local.cluster_node_pools_versions}"
107-
}
107+
}

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,4 @@ variable "monitoring_service" {
208208
variable "service_account" {
209209
description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account"
210210
default = ""
211-
}
211+
}

0 commit comments

Comments
 (0)