v0.12 Support

This commit adds initial support for Terraform v0.12 while also retaining compatibility for Terraform v0.11. Testing has also been restructured and enhanced.
jtopjian · May 25, 2019 · 90ee117 · 90ee117
1 parent 7149a81
commit 90ee117
Show file tree

Hide file tree

Showing 12 changed files with 1,317 additions and 290 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 **/*.swp
+**/*.terraform
 work
diff --git a/Makefile b/Makefile
@@ -1,15 +1,26 @@
 CURDIR := $(shell pwd)
 TEST?=$$(go list ./... |grep -v 'vendor')
 TARGETS=darwin linux
-TERRAFORM_VERSION="0.11.13"
+TERRAFORM_VERSION_v011="0.11.13"
+TERRAFORM_VERSION_v012="0.12.0"
 
-test:
+test: test_v011 test_v012
+
+test_v011:
+	rm -rf work || true
+	mkdir work ; \
+	cd work ; \
+	wget https://releases.hashicorp.com/terraform/$(TERRAFORM_VERSION_v011)/terraform_$(TERRAFORM_VERSION_v011)_linux_amd64.zip ; \
+	unzip terraform_$(TERRAFORM_VERSION_v011)_linux_amd64.zip
+	PATH=$(CURDIR)/work:$(PATH) go test -v -run="V011" ./... -count=1
+
+test_v012:
 	rm -rf work || true
 	mkdir work ; \
 	cd work ; \
-	wget https://releases.hashicorp.com/terraform/$(TERRAFORM_VERSION)/terraform_$(TERRAFORM_VERSION)_linux_amd64.zip ; \
-	unzip terraform_$(TERRAFORM_VERSION)_linux_amd64.zip
-	PATH=$(CURDIR)/work:$(PATH) go test -v $(TEST) ./... -count=1
+	wget https://releases.hashicorp.com/terraform/$(TERRAFORM_VERSION_v012)/terraform_$(TERRAFORM_VERSION_v012)_linux_amd64.zip ; \
+	unzip terraform_$(TERRAFORM_VERSION_v012)_linux_amd64.zip
+	PATH=$(CURDIR)/work:$(PATH) go test -v -run "V012" ./... -count=1
 
 build:
 	go install

diff --git a/fixtures/main.tf b/fixtures/main.tf
@@ -2,7 +2,7 @@ resource "ansible_group" "group_1" {
   inventory_group_name = "group_1"
   children             = ["group_2"]
 
-  vars {
+  vars = {
     foo = "bar"
   }
 }
@@ -11,11 +11,16 @@ resource "ansible_group" "group_2" {
   inventory_group_name = "group_2"
 }
 
+resource "ansible_group" "other_groups" {
+  count                = 2
+  inventory_group_name = "some_group_${count.index}"
+}
+
 resource "ansible_host" "host_1" {
   inventory_hostname = "host_1"
   groups             = ["group_1"]
 
-  vars {
+  vars = {
     ansible_user = "ubuntu"
     ansible_host = "1.2.3.4"
     test         = "host_1"
@@ -26,9 +31,43 @@ resource "ansible_host" "host_2" {
   inventory_hostname = "host_2"
   groups             = ["group_1"]
 
-  vars {
+  vars = {
     ansible_user = "ubuntu"
     ansible_host = "1.2.3.5"
     test         = "host_2"
   }
 }
+
+resource "ansible_host" "host_3" {
+  inventory_hostname = "host_3"
+  groups             = ["group_3"]
+
+  vars = {
+    ansible_user = "ubuntu"
+    ansible_host = "1.2.3.6"
+  }
+}
+
+resource "ansible_host" "host_4" {
+  inventory_hostname = "host_4"
+
+  vars = {
+    ansible_user = "ubuntu"
+    ansible_host = "1.2.3.7"
+  }
+}
+
+resource "ansible_host" "other_hosts" {
+  count              = 2
+  inventory_hostname = "some_host_${count.index}"
+  groups             = ["some_group_${count.index}"]
+
+  vars = {
+    ansible_user = "ubuntu"
+    ansible_host = "1.2.4.${count.index}"
+  }
+}
+
+module "more_hosts" {
+  source = "./module"
+}
diff --git a/fixtures/module/main.tf b/fixtures/module/main.tf
@@ -0,0 +1,8 @@
+resource "ansible_host" "host_5" {
+  inventory_hostname = "host_5"
+
+  vars = {
+    ansible_user = "ubuntu"
+    ansible_host = "1.2.3.8"
+  }
+}
diff --git a/fixtures/terraform.tfstate → fixtures/v011/terraform.tfstate b/fixtures/terraform.tfstate → fixtures/v011/terraform.tfstate
@@ -1,8 +1,8 @@
 {
     "version": 3,
-    "terraform_version": "0.11.1",
-    "serial": 3,
-    "lineage": "4da608b9-cfb2-4135-9a02-cb0326eed951",
+    "terraform_version": "0.11.14",
+    "serial": 1,
+    "lineage": "16015fe5-5b24-330c-ca11-e3630a674808",
     "modules": [
         {
             "path": [
@@ -44,6 +44,36 @@
                     "deposed": [],
                     "provider": "provider.ansible"
                 },
+                "ansible_group.other_groups.0": {
+                    "type": "ansible_group",
+                    "depends_on": [],
+                    "primary": {
+                        "id": "some_group_0",
+                        "attributes": {
+                            "id": "some_group_0",
+                            "inventory_group_name": "some_group_0"
+                        },
+                        "meta": {},
+                        "tainted": false
+                    },
+                    "deposed": [],
+                    "provider": "provider.ansible"
+                },
+                "ansible_group.other_groups.1": {
+                    "type": "ansible_group",
+                    "depends_on": [],
+                    "primary": {
+                        "id": "some_group_1",
+                        "attributes": {
+                            "id": "some_group_1",
+                            "inventory_group_name": "some_group_1"
+                        },
+                        "meta": {},
+                        "tainted": false
+                    },
+                    "deposed": [],
+                    "provider": "provider.ansible"
+                },
                 "ansible_host.host_1": {
                     "type": "ansible_host",
                     "depends_on": [],
@@ -96,7 +126,7 @@
                             "groups.0": "group_3",
                             "id": "host_3",
                             "inventory_hostname": "host_3",
-                            "vars.%": "3",
+                            "vars.%": "2",
                             "vars.ansible_host": "1.2.3.6",
                             "vars.ansible_user": "ubuntu"
                         },
@@ -112,10 +142,9 @@
                     "primary": {
                         "id": "host_4",
                         "attributes": {
-                            "groups.#": "0",
                             "id": "host_4",
                             "inventory_hostname": "host_4",
-                            "vars.%": "3",
+                            "vars.%": "2",
                             "vars.ansible_host": "1.2.3.7",
                             "vars.ansible_user": "ubuntu"
                         },
@@ -124,6 +153,74 @@
                     },
                     "deposed": [],
                     "provider": "provider.ansible"
+                },
+                "ansible_host.other_hosts.0": {
+                    "type": "ansible_host",
+                    "depends_on": [],
+                    "primary": {
+                        "id": "some_host_0",
+                        "attributes": {
+                            "groups.#": "1",
+                            "groups.0": "some_group_0",
+                            "id": "some_host_0",
+                            "inventory_hostname": "some_host_0",
+                            "vars.%": "2",
+                            "vars.ansible_host": "1.2.4.0",
+                            "vars.ansible_user": "ubuntu"
+                        },
+                        "meta": {},
+                        "tainted": false
+                    },
+                    "deposed": [],
+                    "provider": "provider.ansible"
+                },
+                "ansible_host.other_hosts.1": {
+                    "type": "ansible_host",
+                    "depends_on": [],
+                    "primary": {
+                        "id": "some_host_1",
+                        "attributes": {
+                            "groups.#": "1",
+                            "groups.0": "some_group_1",
+                            "id": "some_host_1",
+                            "inventory_hostname": "some_host_1",
+                            "vars.%": "2",
+                            "vars.ansible_host": "1.2.4.1",
+                            "vars.ansible_user": "ubuntu"
+                        },
+                        "meta": {},
+                        "tainted": false
+                    },
+                    "deposed": [],
+                    "provider": "provider.ansible"
+                }
+            },
+            "depends_on": []
+        },
+        {
+            "path": [
+                "root",
+                "more_hosts"
+            ],
+            "outputs": {},
+            "resources": {
+                "ansible_host.host_5": {
+                    "type": "ansible_host",
+                    "depends_on": [],
+                    "primary": {
+                        "id": "host_5",
+                        "attributes": {
+                            "id": "host_5",
+                            "inventory_hostname": "host_5",
+                            "vars.%": "2",
+                            "vars.ansible_host": "1.2.3.8",
+                            "vars.ansible_user": "ubuntu"
+                        },
+                        "meta": {},
+                        "tainted": false
+                    },
+                    "deposed": [],
+                    "provider": "provider.ansible"
                 }
             },
             "depends_on": []