From 8372bfbc8b794445b74457de5f4ae56895f36fec Mon Sep 17 00:00:00 2001
From: Seth Hoenig <shoenig@hashicorp.com>
Date: Mon, 27 Jan 2020 09:52:44 -0600
Subject: [PATCH] e2e: use hclfmt on consul acls policy config files

---
 e2e/consulacls/README.md                | 3 ++-
 e2e/consulacls/acl-enable.hcl           | 4 ++--
 e2e/consulacls/consul-server-policy.hcl | 1 -
 e2e/consulacls/nomad-client-consul.hcl  | 2 +-
 e2e/consulacls/nomad-client-policy.hcl  | 1 -
 e2e/consulacls/nomad-server-consul.hcl  | 2 +-
 e2e/consulacls/nomad-server-policy.hcl  | 2 --
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/e2e/consulacls/README.md b/e2e/consulacls/README.md
index 10394525a..772261b85 100644
--- a/e2e/consulacls/README.md
+++ b/e2e/consulacls/README.md
@@ -7,7 +7,8 @@ provisioned e2e environment to enable Consul ACLs.
 
 The `consul-acls-manage.sh` script can be used to manipulate the Consul cluster
 to activate or de-activate Consul ACLs. There are 3 targets into the script, only
-2 of which should be used from e2e framework tests.
+2 of which should be used from e2e framework tests. The script should be run from
+the e2e directory (i.e. the directory from wich the e2e framework also runs).
 
 ### bootstrap
 
diff --git a/e2e/consulacls/acl-enable.hcl b/e2e/consulacls/acl-enable.hcl
index ec1361ebe..f4204befd 100644
--- a/e2e/consulacls/acl-enable.hcl
+++ b/e2e/consulacls/acl-enable.hcl
@@ -2,7 +2,7 @@
 # consul-acls-manage.sh script uploads this file as "acl.hcl" to Consul Server
 # configuration directories, and restarts those agents.
 acl = {
-  enabled = true
-  default_policy = "deny"
+  enabled                  = true
+  default_policy           = "deny"
   enable_token_persistence = true
 }
diff --git a/e2e/consulacls/consul-server-policy.hcl b/e2e/consulacls/consul-server-policy.hcl
index 0e7cea6a8..14d3d458e 100644
--- a/e2e/consulacls/consul-server-policy.hcl
+++ b/e2e/consulacls/consul-server-policy.hcl
@@ -23,4 +23,3 @@ query "" {
 service "" {
   policy = "write"
 }
-
diff --git a/e2e/consulacls/nomad-client-consul.hcl b/e2e/consulacls/nomad-client-consul.hcl
index ef89f47ac..2cd6ecc84 100644
--- a/e2e/consulacls/nomad-client-consul.hcl
+++ b/e2e/consulacls/nomad-client-consul.hcl
@@ -1,4 +1,4 @@
 // The provided consul.token value must be blessed with service=write ACLs.
 consul {
-  token="CONSUL_TOKEN"
+  token = "CONSUL_TOKEN"
 }
diff --git a/e2e/consulacls/nomad-client-policy.hcl b/e2e/consulacls/nomad-client-policy.hcl
index 059c59a09..8d3206a13 100644
--- a/e2e/consulacls/nomad-client-policy.hcl
+++ b/e2e/consulacls/nomad-client-policy.hcl
@@ -3,4 +3,3 @@
 service "" {
   policy = "write"
 }
-
diff --git a/e2e/consulacls/nomad-server-consul.hcl b/e2e/consulacls/nomad-server-consul.hcl
index 8a7985f2c..ac42b5bab 100644
--- a/e2e/consulacls/nomad-server-consul.hcl
+++ b/e2e/consulacls/nomad-server-consul.hcl
@@ -4,5 +4,5 @@
 // The provided consul.token value must be blessed with acl=write ACLs.
 consul {
   allow_unauthenticated = false
-  token="CONSUL_TOKEN"
+  token                 = "CONSUL_TOKEN"
 }
diff --git a/e2e/consulacls/nomad-server-policy.hcl b/e2e/consulacls/nomad-server-policy.hcl
index 4cee1a41d..185c6e0a4 100644
--- a/e2e/consulacls/nomad-server-policy.hcl
+++ b/e2e/consulacls/nomad-server-policy.hcl
@@ -2,5 +2,3 @@
 // will be requesting new SI tokens from Consul.
 
 acl = "write"
-
-