core: fix test fixtures for HCL2 syntax idiom

A number of our test fixtures were previously using the non-idiomatic form
of including a single child attribute all on one line with the block
header and bounding braces.

This non-idiomatic form is an error in HCL2, and hclfmt has always "fixed"
it to the expected form of each attribute being on a line of its own, and
so here we just update all the affected test fixtures to canonical form
(using hclfmt), allowing them to be parsed as intended.

Since the these entire files were processed with hclfmt, there are some
other unrelated style changes included in situations where the file
layouts were non-idiomatic in other ways.

terraform/test-fixtures/apply-cbd-count/main.tf

@@ -1,5 +1,8 @@
 resource "aws_instance" "bar" {
-    count = 2
-    foo = "bar"
-    lifecycle { create_before_destroy = true }
+  count = 2
+  foo   = "bar"
+
+  lifecycle {
+    create_before_destroy = true
+  }
 }

terraform/test-fixtures/apply-cbd-deposed-only/main.tf

@@ -1,3 +1,5 @@
 resource "aws_instance" "bar" {
-    lifecycle { create_before_destroy = true }
+  lifecycle {
+    create_before_destroy = true
+  }
 }

terraform/test-fixtures/apply-multi-var-order-interp/main.tf

@@ -1,15 +1,17 @@
-variable "count" { default = 15 }
+variable "count" {
+  default = 15
+}
 
 resource "aws_instance" "bar" {
-    count = "${var.count}"
-    foo = "index-${count.index}"
+  count = "${var.count}"
+  foo   = "index-${count.index}"
 }
 
 resource "aws_instance" "baz" {
-    count = "${var.count}"
-    foo = "baz-${element(aws_instance.bar.*.foo, count.index)}"
+  count = "${var.count}"
+  foo   = "baz-${element(aws_instance.bar.*.foo, count.index)}"
 }
 
 output "should-be-11" {
-    value = "${element(aws_instance.baz.*.foo, 11)}"
+  value = "${element(aws_instance.baz.*.foo, 11)}"
 }

terraform/test-fixtures/apply-multi-var-order/main.tf

@@ -1,10 +1,12 @@
-variable "count" { default = 15 }
+variable "count" {
+  default = 15
+}
 
 resource "aws_instance" "bar" {
-    count = "${var.count}"
-    foo = "index-${count.index}"
+  count = "${var.count}"
+  foo   = "index-${count.index}"
 }
 
 output "should-be-11" {
-    value = "${element(aws_instance.bar.*.foo, 11)}"
+  value = "${element(aws_instance.bar.*.foo, 11)}"
 }

terraform/test-fixtures/apply-output-orphan-module/child/main.tf

@@ -1 +1,3 @@
-output "foo" { value = "bar" }
+output "foo" {
+  value = "bar"
+}

terraform/test-fixtures/apply-output-orphan/main.tf

@@ -1 +1,3 @@
-output "foo" { value = "bar" }
+output "foo" {
+  value = "bar"
+}

terraform/test-fixtures/apply-provider-alias-configure/main.tf

@@ -1,11 +1,14 @@
 provider "another" {
-    foo = "bar"
+  foo = "bar"
 }
 
 provider "another" {
-    alias = "two"
-    foo = "bar"
+  alias = "two"
+  foo   = "bar"
 }
 
 resource "another_instance" "foo" {}
-resource "another_instance" "bar" { provider = "another.two" }
+
+resource "another_instance" "bar" {
+  provider = "another.two"
+}

terraform/test-fixtures/apply-provisioner-module/main.tf

@@ -1 +1,3 @@
-module "child" { source = "./child" }
+module "child" {
+  source = "./child"
+}

terraform/test-fixtures/apply-ref-existing/main.tf

@@ -1,7 +1,9 @@
-resource "aws_instance" "foo" { foo = "bar" }
+resource "aws_instance" "foo" {
+  foo = "bar"
+}
 
 module "child" {
-    source = "./child"
+  source = "./child"
 
-    var = "${aws_instance.foo.foo}"
+  var = "${aws_instance.foo.foo}"
 }

terraform/test-fixtures/context-required-version-module/child/main.tf

@@ -1 +1,3 @@
-terraform { required_version = ">= 0.5.0" }
+terraform {
+  required_version = ">= 0.5.0"
+}

terraform/test-fixtures/graph-builder-apply-dep-cbd/main.tf

@@ -1,5 +1,7 @@
 resource "aws_instance" "A" {
-  lifecycle { create_before_destroy = true }
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 resource "aws_instance" "B" {

terraform/test-fixtures/graph-builder-apply-double-cbd/main.tf

@@ -1,9 +1,13 @@
 resource "aws_instance" "A" {
-  lifecycle { create_before_destroy = true }
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 resource "aws_instance" "B" {
   value = ["${aws_instance.A.*.id}"]
 
-  lifecycle { create_before_destroy = true }
+  lifecycle {
+    create_before_destroy = true
+  }
 }

terraform/test-fixtures/graph-builder-apply-module-destroy/A/main.tf

@@ -1,7 +1,11 @@
 variable "input" {}
 
 resource "null_resource" "foo" {
-    triggers { input = "${var.input}" }
+  triggers {
+    input = "${var.input}"
+  }
 }
 
-output "output" { value = "${null_resource.foo.id}" }
+output "output" {
+  value = "${null_resource.foo.id}"
+}

terraform/test-fixtures/graph-builder-apply-module-destroy/main.tf

@@ -1,11 +1,13 @@
-variable "input" { default = "value" }
+variable "input" {
+  default = "value"
+}
 
 module "A" {
-    source = "./A"
-    input  = "${var.input}"
+  source = "./A"
+  input  = "${var.input}"
 }
 
 module "B" {
-    source = "./A"
-    input  = "${module.A.output}"
+  source = "./A"
+  input  = "${module.A.output}"
 }

terraform/test-fixtures/graph-builder-plan-target-module-provider/child1/main.tf

@@ -1,4 +1,7 @@
 variable "key" {}
-provider "null" { key = "${var.key}" }
+
+provider "null" {
+  key = "${var.key}"
+}
 
 resource "null_resource" "foo" {}

terraform/test-fixtures/graph-builder-plan-target-module-provider/child2/main.tf

@@ -1,4 +1,7 @@
 variable "key" {}
-provider "null" { key = "${var.key}" }
+
+provider "null" {
+  key = "${var.key}"
+}
 
 resource "null_resource" "foo" {}

terraform/test-fixtures/graph-builder-plan-target-module-provider/main.tf

@@ -1,2 +1,7 @@
-module "child1" { source = "./child1" }
-module "child2" { source = "./child2" }
+module "child1" {
+  source = "./child1"
+}
+
+module "child2" {
+  source = "./child2"
+}

terraform/test-fixtures/input-interpolate-var/source/main.tf

@@ -1 +1,3 @@
-output "list" { value = "foo,bar,baz" }
+output "list" {
+  value = "foo,bar,baz"
+}

terraform/test-fixtures/issue-5254/step-0/main.tf

@@ -1,7 +1,9 @@
-variable "c" { default = 1 }
+variable "c" {
+  default = 1
+}
 
 resource "template_file" "parent" {
-  count = "${var.c}"
+  count    = "${var.c}"
   template = "Hi"
 }
 

terraform/test-fixtures/plan-cbd-maintain-root/main.tf

@@ -1,11 +1,17 @@
 resource "aws_instance" "foo" {
   count = "2"
-  lifecycle { create_before_destroy = true }
+
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 resource "aws_instance" "bar" {
   count = "2"
-  lifecycle { create_before_destroy = true }
+
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 output "out" {

terraform/test-fixtures/plan-cbd/main.tf

@@ -1,3 +1,5 @@
 resource "aws_instance" "foo" {
-    lifecycle { create_before_destroy = true }
+  lifecycle {
+    create_before_destroy = true
+  }
 }

terraform/test-fixtures/plan-cdb-depends-datasource/main.tf

@@ -1,11 +1,14 @@
 resource "aws_instance" "foo" {
-  count = 2
+  count   = 2
   num     = "2"
   compute = "${element(data.aws_vpc.bar.*.id, count.index)}"
-  lifecycle { create_before_destroy = true }
+
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 data "aws_vpc" "bar" {
   count = 2
-  foo = "${count.index}"
+  foo   = "${count.index}"
 }

terraform/test-fixtures/plan-computed-value-in-map/main.tf

@@ -3,13 +3,14 @@ resource "aws_computed_source" "intermediates" {}
 module "test_mod" {
   source = "./mod"
 
-  services {
-    "exists" = "true"
-    "elb" = "${aws_computed_source.intermediates.computed_read_only}"
-  }
-
-  services {
-    "otherexists" = " true"
-    "elb" = "${aws_computed_source.intermediates.computed_read_only}"
-  }
+  services = [
+    {
+      "exists" = "true"
+      "elb"    = "${aws_computed_source.intermediates.computed_read_only}"
+    },
+    {
+      "otherexists" = " true"
+      "elb"         = "${aws_computed_source.intermediates.computed_read_only}"
+    },
+  ]
 }

terraform/test-fixtures/plan-count-module-static-grandchild/main.tf

@@ -1,6 +1,8 @@
-variable "foo" { default = "3" }
+variable "foo" {
+  default = "3"
+}
 
 module "child" {
-    source = "./child"
-    value = "${var.foo}"
+  source = "./child"
+  value  = "${var.foo}"
 }

terraform/test-fixtures/plan-count-module-static/main.tf

@@ -1,6 +1,8 @@
-variable "foo" { default = "3" }
+variable "foo" {
+  default = "3"
+}
 
 module "child" {
-    source = "./child"
-    value = "${var.foo}"
+  source = "./child"
+  value  = "${var.foo}"
 }

terraform/test-fixtures/plan-module-deadlock/child/main.tf

@@ -1,4 +1,7 @@
 resource "aws_instance" "foo" {
   count = "${length("abc")}"
-  lifecycle { create_before_destroy = true }
+
+  lifecycle {
+    create_before_destroy = true
+  }
 }

terraform/test-fixtures/plan-module-provider-inherit-deep/A/main.tf

@@ -1 +1,3 @@
-module "B" { source = "../B" }
+module "B" {
+  source = "../B"
+}

terraform/test-fixtures/plan-module-provider-inherit-deep/B/main.tf

@@ -1 +1,3 @@
-module "C" { source = "../C" }
+module "C" {
+  source = "../C"
+}

terraform/test-fixtures/plan-module-provider-var/main.tf

@@ -1,6 +1,8 @@
-variable "foo" { default = "bar" }
+variable "foo" {
+  default = "bar"
+}
 
 module "child" {
-    source = "./child"
-    foo    = "${var.foo}"
+  source = "./child"
+  foo    = "${var.foo}"
 }

terraform/test-fixtures/plan-module-var/child/main.tf

@@ -1,7 +1,7 @@
 resource "aws_instance" "foo" {
-    num = "2"
+  num = "2"
 }
 
 output "num" {
-    value = "${aws_instance.foo.num}"
+  value = "${aws_instance.foo.num}"
 }

terraform/test-fixtures/plan-module-var/main.tf

@@ -1,7 +1,7 @@
 module "child" {
-    source = "./child"
+  source = "./child"
 }
 
 resource "aws_instance" "bar" {
-    foo = "${module.child.num}"
+  foo = "${module.child.num}"
 }

terraform/test-fixtures/plan-module-wrong-var-type/inner/main.tf

@@ -1,10 +1,13 @@
 variable "map_in" {
-    type = "map"
-    default = {
-        us-west-1 = "ami-12345"
-        us-west-2 = "ami-67890"
-    }
+  type = "map"
+
+  default = {
+    us-west-1 = "ami-12345"
+    us-west-2 = "ami-67890"
+  }
 }
 
 // We have to reference it so it isn't pruned
-output "output" { value = "${var.map_in}" }
+output "output" {
+  value = "${var.map_in}"
+}

terraform/test-fixtures/plan-targeted-cross-module/A/main.tf

@@ -1,5 +1,7 @@
 resource "aws_instance" "foo" {
-    foo = "bar"
+  foo = "bar"
 }
 
-output "value" { value = "${aws_instance.foo.id}" }
+output "value" {
+  value = "${aws_instance.foo.id}"
+}

terraform/test-fixtures/plan-targeted-module-with-provider/child1/main.tf

@@ -1,4 +1,7 @@
 variable "key" {}
-provider "null" { key = "${var.key}" }
+
+provider "null" {
+  key = "${var.key}"
+}
 
 resource "null_resource" "foo" {}

terraform/test-fixtures/plan-targeted-module-with-provider/child2/main.tf

@@ -1,4 +1,7 @@
 variable "key" {}
-provider "null" { key = "${var.key}" }
+
+provider "null" {
+  key = "${var.key}"
+}
 
 resource "null_resource" "foo" {}

terraform/test-fixtures/refresh-no-state/main.tf

@@ -1 +1,3 @@
-output "foo" {}
+output "foo" {
+  value = ""
+}

terraform/test-fixtures/transform-destroy-edge-basic/main.tf

@@ -1,2 +1,5 @@
 resource "test" "A" {}
-resource "test" "B" { value = "${test.A.value}" }
+
+resource "test" "B" {
+  value = "${test.A.value}"
+}

terraform/test-fixtures/transform-destroy-edge-module/child/main.tf

@@ -1,5 +1,7 @@
 resource "aws_instance" "b" {
-    value = "foo"
+  value = "foo"
 }
 
-output "output" { value = "${aws_instance.b.value}" }
+output "output" {
+  value = "${aws_instance.b.value}"
+}

terraform/test-fixtures/transform-destroy-edge-multi/main.tf

@@ -1,3 +1,9 @@
 resource "test" "A" {}
-resource "test" "B" { value = "${test.A.value}" }
-resource "test" "C" { value = "${test.B.value}" }
+
+resource "test" "B" {
+  value = "${test.A.value}"
+}
+
+resource "test" "C" {
+  value = "${test.B.value}"
+}

terraform/test-fixtures/transform-flat-config-basic/main.tf

@@ -1,6 +1,9 @@
 resource "aws_instance" "foo" {}
-resource "aws_instance" "bar" { value = "${aws_instance.foo.value}" }
+
+resource "aws_instance" "bar" {
+  value = "${aws_instance.foo.value}"
+}
 
 module "child" {
-    source = "./child"
+  source = "./child"
 }

terraform/test-fixtures/transform-module-var-basic/child/main.tf

@@ -1,3 +1,5 @@
 variable "value" {}
 
-output "result" { value = "${var.value}" }
+output "result" {
+  value = "${var.value}"
+}

terraform/test-fixtures/transform-module-var-nested/child/child/main.tf

@@ -1,3 +1,5 @@
 variable "value" {}
 
-output "result" { value = "${var.value}" }
+output "result" {
+  value = "${var.value}"
+}

terraform/test-fixtures/transform-orphan-count/main.tf

@@ -1 +1,3 @@
-resource "aws_instance" "foo" { count = 3 }
+resource "aws_instance" "foo" {
+  count = 3
+}

terraform/test-fixtures/validate-computed-module-var-ref/source/main.tf

@@ -1,3 +1,5 @@
-resource "aws_instance" "source" { }
+resource "aws_instance" "source" {}
 
-output "sourceout" { value = "${aws_instance.source.id}" }
+output "sourceout" {
+  value = "${aws_instance.source.id}"
+}