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

packer: Get rid of "name" in template, wasn't used for anything

Browse Source
This commit is contained in:
Mitchell Hashimoto 2013-06-15 11:14:44 -07:00
parent 793877568f
commit 3435e63b52
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packer/template.go
View File

@ -11,7 +11,6 @@ import (
// "interface{}" pointers since we actually don't know what their contents // "interface{}" pointers since we actually don't know what their contents
// are until we read the "type" field. // are until we read the "type" field.
type rawTemplate struct { type rawTemplate struct {
Name string
Builders []map[string]interface{} Builders []map[string]interface{}
Hooks map[string][]string Hooks map[string][]string
Provisioners []map[string]interface{} Provisioners []map[string]interface{}
@ -21,7 +20,6 @@ type rawTemplate struct {
// The Template struct represents a parsed template, parsed into the most // The Template struct represents a parsed template, parsed into the most
// completed form it can be without additional processing by the caller. // completed form it can be without additional processing by the caller.
type Template struct { type Template struct {
Name string
Builders map[string]rawBuilderConfig Builders map[string]rawBuilderConfig
Hooks map[string][]string Hooks map[string][]string
Provisioners []rawProvisionerConfig Provisioners []rawProvisionerConfig
@ -61,7 +59,6 @@ func ParseTemplate(data []byte) (t *Template, err error) {
} }
t = &Template{} t = &Template{}
t.Name = rawTpl.Name
t.Builders = make(map[string]rawBuilderConfig) t.Builders = make(map[string]rawBuilderConfig)
t.Hooks = rawTpl.Hooks t.Hooks = rawTpl.Hooks
t.Provisioners = make([]rawProvisionerConfig, len(rawTpl.Provisioners)) t.Provisioners = make([]rawProvisionerConfig, len(rawTpl.Provisioners))

2
packer/template_test.go
View File

@ -11,7 +11,6 @@ func TestParseTemplate_Basic(t *testing.T) {
data := ` data := `
{ {
"name": "my-image",
"builders": [] "builders": []
} }
` `
@ -19,7 +18,6 @@ func TestParseTemplate_Basic(t *testing.T) {
result, err := ParseTemplate([]byte(data)) result, err := ParseTemplate([]byte(data))
assert.Nil(err, "should not error") assert.Nil(err, "should not error")
assert.NotNil(result, "template should not be nil") assert.NotNil(result, "template should not be nil")
assert.Equal(result.Name, "my-image", "name should be correct")
assert.Length(result.Builders, 0, "no builders") assert.Length(result.Builders, 0, "no builders")
} }