resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

providers/template: don't use config/lang

This commit is contained in:
Mitchell Hashimoto 2016-01-31 08:45:15 +01:00 committed by James Nugent
parent 8be4afacf8
commit aaf1302ce8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/providers/template/resource_template_file.go
View File

@ -8,9 +8,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/hashicorp/hil"
"github.com/hashicorp/hil/ast"
"github.com/hashicorp/terraform/config" "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/pathorcontents"
"github.com/hashicorp/terraform/helper/schema" "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. // execute parses and executes a template using vars.
func execute(s string, vars map[string]interface{}) (string, error) { func execute(s string, vars map[string]interface{}) (string, error) {
root, err := lang.Parse(s) root, err := hil.Parse(s)
if err != nil { if err != nil {
return "", err 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{ GlobalScope: &ast.BasicScope{
VarMap: varmap, VarMap: varmap,
FuncMap: config.Funcs(), FuncMap: config.Funcs(),
}, },
} }
out, typ, err := lang.Eval(root, &cfg) out, typ, err := hil.Eval(root, &cfg)
if err != nil { if err != nil {
return "", err return "", err
} }