From 2cf60068b3055632c4ecbf22ed730d0cf3131578 Mon Sep 17 00:00:00 2001
From: jamie brim <bramiejim@gmail.com>
Date: Fri, 8 Aug 2014 23:55:30 -0700
Subject: [PATCH] template: interpolate builder name in ParseTemplate

fixes #858
---
 packer/template.go      | 107 ++++++++++++++++++++++------------------
 packer/template_test.go |   2 +-
 2 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/packer/template.go b/packer/template.go
index ed71e90d679..d9736b4f207 100644
--- a/packer/template.go
+++ b/packer/template.go
@@ -189,6 +189,11 @@ func ParseTemplate(data []byte, vars map[string]string) (t *Template, err error)
 		t.Variables[k] = variable
 	}
 
+	variables, err := t.processVariables(false)
+	if err != nil {
+		return nil, err
+	}
+
 	// Gather all the builders
 	for i, v := range rawTpl.Builders {
 		var raw RawBuilderConfig
@@ -214,6 +219,16 @@ func ParseTemplate(data []byte, vars map[string]string) (t *Template, err error)
 		// at this point.
 		if raw.Name == "" {
 			raw.Name = raw.Type
+		} else {
+			tpl, err := NewConfigTemplate()
+			tpl.UserVars = variables
+			if err != nil {
+				return nil, err
+			}
+			raw.Name, err = tpl.Process(raw.Name,nil)
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		// Check if we already have a builder with this name and error if so
@@ -473,53 +488,7 @@ func (t *Template) Build(name string, components *ComponentFinder) (b Build, err
 		return
 	}
 
-	// Prepare the variable template processor, which is a bit unique
-	// because we don't allow user variable usage and we add a function
-	// to read from the environment.
-	varTpl, err := NewConfigTemplate()
-	if err != nil {
-		return nil, err
-	}
-	varTpl.Funcs(template.FuncMap{
-		"env":  templateEnv,
-		"user": templateDisableUser,
-	})
-
-	// Prepare the variables
-	var varErrors []error
-	variables := make(map[string]string)
-	for k, v := range t.Variables {
-		if v.Required && !v.HasValue {
-			varErrors = append(varErrors,
-				fmt.Errorf("Required user variable '%s' not set", k))
-		}
-
-		var val string
-		if v.HasValue {
-			val = v.Value
-		} else {
-			val, err = varTpl.Process(v.Default, nil)
-			if err != nil {
-				varErrors = append(varErrors,
-					fmt.Errorf("Error processing user variable '%s': %s'", k, err))
-			}
-		}
-
-		variables[k] = val
-	}
-
-	if len(varErrors) > 0 {
-		return nil, &MultiError{varErrors}
-	}
-
-	// Process the name
-	tpl, err := NewConfigTemplate()
-	if err != nil {
-		return nil, err
-	}
-	tpl.UserVars = variables
-
-	name, err = tpl.Process(name, nil)
+	variables, err := t.processVariables(true)
 	if err != nil {
 		return nil, err
 	}
@@ -699,3 +668,47 @@ func (t *TemplateOnlyExcept) Validate(b map[string]RawBuilderConfig) (e []error)
 
 	return
 }
+
+func (t *Template) processVariables(enforceRequired bool) (vars map[string]string, err error) {
+	// Prepare the variable template processor, which is a bit unique
+	// because we don't allow user variable usage and we add a function
+	// to read from the environment.
+	vars = make(map[string]string)
+	varTpl, err := NewConfigTemplate()
+	if err != nil {
+		return nil, err
+	}
+
+	varTpl.Funcs(template.FuncMap{
+		"env":  templateEnv,
+		"user": templateDisableUser,
+	})
+
+	// Prepare the variables
+	var varErrors []error
+
+	for k, v := range t.Variables {
+		if v.Required && !v.HasValue && enforceRequired {
+			varErrors = append(varErrors,
+				fmt.Errorf("Required user variable '%s' not set", k))
+	  }
+
+		var val string
+		if v.HasValue {
+			val = v.Value
+		} else {
+			val, err = varTpl.Process(v.Default, nil)
+			if err != nil {
+				varErrors = append(varErrors,
+					fmt.Errorf("Error processing user variable '%s': %s'", k, err))
+			}
+		}
+
+		vars[k] = val
+	}
+
+	if len(varErrors) > 0 {
+		return nil, &MultiError{varErrors}
+	}
+	return vars, nil
+}
diff --git a/packer/template_test.go b/packer/template_test.go
index 547b29dafe7..ee125644810 100644
--- a/packer/template_test.go
+++ b/packer/template_test.go
@@ -825,7 +825,7 @@ func TestTemplateBuild_names(t *testing.T) {
 		t.Fatalf("bad: %#v", b.Name())
 	}
 
-	b, err = template.Build("test2-{{user \"foo\"}}", testComponentFinder())
+	b, err = template.Build("test2-bar", testComponentFinder())
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}