iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: UserData => UserVars

This commit is contained in:
Mitchell Hashimoto 2013-08-09 14:16:30 -07:00
parent eaf5e66f3a
commit ab5a1981d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/template.go
View File

@ -12,7 +12,7 @@ import (
// elements and functions available. Plugin creators should process as // elements and functions available. Plugin creators should process as
// many fields as possible through this. // many fields as possible through this.
type Template struct { type Template struct {
UserData map[string]string UserVars map[string]string
root *template.Template root *template.Template
i int i int
@ -21,7 +21,7 @@ type Template struct {
// NewTemplate creates a new template processor. // NewTemplate creates a new template processor.
func NewTemplate() (*Template, error) { func NewTemplate() (*Template, error) {
result := &Template{ result := &Template{
UserData: make(map[string]string), UserVars: make(map[string]string),
} }
result.root = template.New("configTemplateRoot") result.root = template.New("configTemplateRoot")
@ -68,7 +68,7 @@ func (t *Template) nextTemplateName() string {
// User is the function exposed as "user" within the templates and // User is the function exposed as "user" within the templates and
// looks up user variables. // looks up user variables.
func (t *Template) templateUser(n string) (string, error) { func (t *Template) templateUser(n string) (string, error) {
result, ok := t.UserData[n] result, ok := t.UserVars[n]
if !ok { if !ok {
return "", fmt.Errorf("uknown user var: %s", n) return "", fmt.Errorf("uknown user var: %s", n)
} }

2
common/template_test.go
View File

@ -35,7 +35,7 @@ func TestTemplateProcess_user(t *testing.T) {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
tpl.UserData["foo"] = "bar" tpl.UserVars["foo"] = "bar"
result, err := tpl.Process(`{{user "foo"}}`, nil) result, err := tpl.Process(`{{user "foo"}}`, nil)
if err != nil { if err != nil {