Upgrade to 0.12

3 files changed, 27 insertions, 2 deletions

diff --git a/vendor/github.com/hashicorp/hil/convert.go b/vendor/github.com/hashicorp/hil/convert.go
index f2024d0..184e029 100644
--- a/vendor/github.com/hashicorp/hil/convert.go
+++ b/vendor/github.com/hashicorp/hil/convert.go
@@ -47,8 +47,23 @@ func hilMapstructureWeakDecode(m interface{}, rawVal interface{}) error {
 }
 
 func InterfaceToVariable(input interface{}) (ast.Variable, error) {
-        if inputVariable, ok := input.(ast.Variable); ok {
-                return inputVariable, nil
+        if iv, ok := input.(ast.Variable); ok {
+                return iv, nil
+        }
+
+        // This is just to maintain backward compatibility
+        // after https://github.com/mitchellh/mapstructure/pull/98
+        if v, ok := input.([]ast.Variable); ok {
+                return ast.Variable{
+                        Type:  ast.TypeList,
+                        Value: v,
+                }, nil
+        }
+        if v, ok := input.(map[string]ast.Variable); ok {
+                return ast.Variable{
+                        Type:  ast.TypeMap,
+                        Value: v,
+                }, nil
         }
 
         var stringVal string
diff --git a/vendor/github.com/hashicorp/hil/go.mod b/vendor/github.com/hashicorp/hil/go.mod
new file mode 100644
index 0000000..45719a6
--- /dev/null
+++ b/vendor/github.com/hashicorp/hil/go.mod
@@ -0,0 +1,6 @@
+module github.com/hashicorp/hil
+
+require (
+        github.com/mitchellh/mapstructure v1.1.2
+        github.com/mitchellh/reflectwalk v1.0.0
+)
diff --git a/vendor/github.com/hashicorp/hil/go.sum b/vendor/github.com/hashicorp/hil/go.sum
new file mode 100644
index 0000000..83639b6
--- /dev/null
+++ b/vendor/github.com/hashicorp/hil/go.sum
@@ -0,0 +1,4 @@
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=