Added prettifyer helper command and prettifyed tf-files (#21)

Skatteetaten · Sep 21, 2020 · 1a2cc80 · 1a2cc80
1 parent 1dc6ef6
commit 1a2cc80
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Added
 
+- Added command that formats/prettify all `.tf`-files in directory #21
 - Added check for consul and terraform binary in the `Makefile` #20
 
 ### Fixed

diff --git a/Makefile b/Makefile
@@ -70,3 +70,6 @@ clean: destroy-box remove-tmp
 # helper commands
 update-box:
 	@SSL_CERT_FILE=${SSL_CERT_FILE} CURL_CA_BUNDLE=${CURL_CA_BUNDLE} vagrant box update || (echo '\n\nIf you get an SSL error you might be behind a transparent proxy. \nMore info https://github.com/fredrikhgrelland/vagrant-hashistack/blob/master/README.md#proxy\n\n' && exit 2)
+
+prettify:
+	@terraform fmt -recursive && echo Trying to prettify all .tf files.
diff --git a/example/vagrant_box_example/nomad_acl.tf b/example/vagrant_box_example/nomad_acl.tf
@@ -1,7 +1,7 @@
 data "vault_generic_secret" "nomad_secret_id" {
   # Set count of this data source to 1 if ACLs are enabled in Nomad, and 0 if not
   count = var.nomad_acl ? 1 : 0
-  path = "nomad/creds/write"
+  path  = "nomad/creds/write"
 }
 
 provider "nomad" {

diff --git a/template_example/example/standalone/nomad_acl.tf b/template_example/example/standalone/nomad_acl.tf
@@ -1,7 +1,7 @@
 data "vault_generic_secret" "nomad_secret_id" {
   # Set count of this data source to 1 if ACLs are enabled in Nomad, and 0 if not
   count = var.nomad_acl ? 1 : 0
-  path = "nomad/creds/write"
+  path  = "nomad/creds/write"
 }
 
 provider "nomad" {

diff --git a/template_example/example/standalone/variables.tf b/template_example/example/standalone/variables.tf
@@ -1,4 +1,4 @@
 variable "nomad_acl" {
-  type = bool
+  type        = bool
   description = "Nomad ACLs enabled/disabled"
 }
diff --git a/template_example/main.tf b/template_example/main.tf
@@ -1,4 +1,4 @@
 resource "nomad_job" "countdash" {
   jobspec = file("${path.module}/conf/nomad/countdash.hcl")
-  detach = false
+  detach  = false
 }
diff --git a/template_example/outputs.tf b/template_example/outputs.tf
@@ -1,4 +1,4 @@
 output "nomad_job" {
-  value = nomad_job.countdash
+  value       = nomad_job.countdash
   description = "The countdash nomad job object"
 }