Merge pull request #2352 from mitchellh/b-amazon-bundle

builder/amazon/instance: set valid bundle prefix [GH-2328]

builder/amazon/instance/builder.go

@@ -50,6 +50,12 @@ type Builder struct {
 }
 
 func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
+	configs := make([]interface{}, len(raws)+1)
+	configs[0] = map[string]interface{}{
+		"bundle_prefix": "image-{{timestamp}}",
+	}
+	copy(configs[1:], raws)
+
 	b.config.ctx.Funcs = awscommon.TemplateFuncs
 	err := config.Decode(&b.config, &config.DecodeOpts{
 		Interpolate:        true,
@@ -60,7 +66,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 				"bundle_vol_command",
 			},
 		},
-	}, raws...)
+	}, configs...)
 	if err != nil {
 		return nil, err
 	}
@@ -69,10 +75,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 		b.config.BundleDestination = "/tmp"
 	}
 
-	if b.config.BundlePrefix == "" {
-		b.config.BundlePrefix = "image-{{timestamp}}"
-	}
-
 	if b.config.BundleUploadCommand == "" {
 		if b.config.IamInstanceProfile != "" {
 			b.config.BundleUploadCommand = "sudo -i -n ec2-upload-bundle " +

builder/amazon/instance/builder_test.go

@@ -130,7 +130,6 @@ func TestBuilderPrepare_BundlePrefix(t *testing.T) {
 	b := &Builder{}
 	config := testConfig()
 
-	config["bundle_prefix"] = ""
 	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)