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

packer: Template properly calls builder type builderType

This commit is contained in:
Mitchell Hashimoto 2013-05-22 14:39:32 -07:00
parent 4bd7db0759
commit 06b0cebd1e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packer/template.go
View File

@ -30,7 +30,7 @@ type Template struct {
// raw configuration. If requested, this is used to compile into a full // raw configuration. If requested, this is used to compile into a full
// builder configuration at some point. // builder configuration at some point.
type rawBuilderConfig struct { type rawBuilderConfig struct {
builderName string builderType string
rawConfig interface{} rawConfig interface{}
} }
@ -88,7 +88,10 @@ func ParseTemplate(data []byte) (t *Template, err error) {
continue continue
} }
t.Builders[name] = rawBuilderConfig{typeName, v} t.Builders[name] = rawBuilderConfig{
typeName,
v,
}
} }
// If there were errors, we put it into a MultiError and return // If there were errors, we put it into a MultiError and return
@ -122,13 +125,13 @@ func (t *Template) Build(name string, components *ComponentFinder) (b Build, err
return return
} }
builder, err := components.Builder(builderConfig.builderName) builder, err := components.Builder(builderConfig.builderType)
if err != nil { if err != nil {
return return
} }
if builder == nil { if builder == nil {
err = fmt.Errorf("Builder not found: %s", name) err = fmt.Errorf("Builder type not found: %s", builderConfig.builderType)
return return
} }

4
packer/template_test.go
View File

@ -91,7 +91,7 @@ func TestParseTemplate_BuilderWithoutName(t *testing.T) {
builder, ok := result.Builders["amazon-ebs"] builder, ok := result.Builders["amazon-ebs"]
assert.True(ok, "should have amazon-ebs builder") assert.True(ok, "should have amazon-ebs builder")
assert.Equal(builder.builderName, "amazon-ebs", "builder should be amazon-ebs") assert.Equal(builder.builderType, "amazon-ebs", "builder should be amazon-ebs")
} }
func TestParseTemplate_BuilderWithName(t *testing.T) { func TestParseTemplate_BuilderWithName(t *testing.T) {
@ -116,7 +116,7 @@ func TestParseTemplate_BuilderWithName(t *testing.T) {
builder, ok := result.Builders["bob"] builder, ok := result.Builders["bob"]
assert.True(ok, "should have bob builder") assert.True(ok, "should have bob builder")
assert.Equal(builder.builderName, "amazon-ebs", "builder should be amazon-ebs") assert.Equal(builder.builderType, "amazon-ebs", "builder should be amazon-ebs")
} }
func TestParseTemplate_BuilderWithConflictingName(t *testing.T) { func TestParseTemplate_BuilderWithConflictingName(t *testing.T) {