From aaf1302ce834daaf919a227c7c981637194e4c93 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 31 Jan 2016 08:45:15 +0100 Subject: [PATCH] providers/template: don't use config/lang --- builtin/providers/template/resource_template_file.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/providers/template/resource_template_file.go b/builtin/providers/template/resource_template_file.go index 554fa18ba..4b3e4bd89 100644 --- a/builtin/providers/template/resource_template_file.go +++ b/builtin/providers/template/resource_template_file.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" + "github.com/hashicorp/hil" + "github.com/hashicorp/hil/ast" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/lang" - "github.com/hashicorp/terraform/config/lang/ast" "github.com/hashicorp/terraform/helper/pathorcontents" "github.com/hashicorp/terraform/helper/schema" ) @@ -133,7 +133,7 @@ func renderFile(d *schema.ResourceData) (string, error) { // execute parses and executes a template using vars. func execute(s string, vars map[string]interface{}) (string, error) { - root, err := lang.Parse(s) + root, err := hil.Parse(s) if err != nil { return "", err } @@ -152,14 +152,14 @@ func execute(s string, vars map[string]interface{}) (string, error) { } } - cfg := lang.EvalConfig{ + cfg := hil.EvalConfig{ GlobalScope: &ast.BasicScope{ VarMap: varmap, FuncMap: config.Funcs(), }, } - out, typ, err := lang.Eval(root, &cfg) + out, typ, err := hil.Eval(root, &cfg) if err != nil { return "", err }