config: understand provisioner blocks in JSON [GH-807]

CHANGELOG.md

@@ -16,6 +16,7 @@ BUG FIXES:
  * core: Escape characters `\"`, `\n`, and `\\` now work in interpolations.
  * core: Fix crash that could occur when there are exactly zero providers
  installed on a system. [GH-786]
+ * core: JSON TF configurations can configure provisioners. [GH-807]
  * provider/aws: ELB subnet change doesn't force new resource. [GH-804]
 
 PLUGIN CHANGES:

config/loader_hcl.go

@@ -517,7 +517,15 @@ func loadProvisionersHcl(os *hclobj.Object, connInfo map[string]interface{}) ([]
  //
  for _, o1 := range os.Elem(false) {
  for _, o2 := range o1.Elem(true) {
- pos = append(pos, o2)
+
+ switch o1.Type {
+ case hclobj.ValueTypeList:
+ for _, o3 := range o2.Elem(true) {
+ pos = append(pos, o3)
+ }
+ case hclobj.ValueTypeObject:
+ pos = append(pos, o2)
+ }
  }
  }
 

config/loader_test.go

@@ -410,6 +410,10 @@ const basicResourcesStr = `
 aws_instance[db] (x1)
  VPC
  security_groups
+ provisioners
+ file
+ destination
+ source
  dependsOn
  aws_instance.web
  vars
@@ -418,6 +422,10 @@ aws_instance[web] (x1)
  ami
  network_interface
  security_groups
+ provisioners
+ file
+ destination
+ source
  vars
  resource: aws_security_group.firewall.foo
  user: var.foo

config/test-fixtures/basic.tf

@@ -27,13 +27,23 @@ resource aws_instance "web" {
  device_index = 0
  description = "Main network interface"
  }
+
+ provisioner "file" {
+ source = "foo"
+ destination = "bar"
+ }
 }
 
 resource "aws_instance" "db" {
  security_groups = "${aws_security_group.firewall.*.id}"
  VPC = "foo"
 
  depends_on = ["aws_instance.web"]
+
+ provisioner "file" {
+ source = "foo"
+ destination = "bar"
+ }
 }
 
 output "web_ip" {

config/test-fixtures/basic.tf.json

@@ -22,7 +22,14 @@
  "db": {
  "security_groups": ["${aws_security_group.firewall.*.id}"],
  "VPC": "foo",
- "depends_on": ["aws_instance.web"]
+ "depends_on": ["aws_instance.web"],
+
+ "provisioner": [{
+ "file": {
+ "source": "foo",
+ "destination": "bar"
+ }
+ }]
  },
 
  "web": {
@@ -34,6 +41,13 @@
  "network_interface": {
  "device_index": 0,
  "description": "Main network interface"
+ },
+
+ "provisioner": {
+ "file": {
+ "source": "foo",
+ "destination": "bar"
+ }
  }
  }
  },