From 0de922d14aaae6ced1e41345f979fefe8261f4aa Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sat, 20 Apr 2013 18:08:43 -0600
Subject: [PATCH] Make environment config export variables

---
 packer/environment.go      | 24 +++++++-----------------
 packer/environment_test.go |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/packer/environment.go b/packer/environment.go
index d38a78fd3..6424e46cf 100644
--- a/packer/environment.go
+++ b/packer/environment.go
@@ -34,34 +34,30 @@ type Command interface {
 // if you're building a custom Packer binary, you could instantiate multiple
 // environments and run them in parallel.
 type Environment struct {
-	builder map[string]Builder
+	builderFactory BuilderFactory
 	command map[string]Command
 	ui      Ui
 }
 
 // This struct configures new environments.
 type EnvironmentConfig struct {
-	builder map[string]Builder
-	command map[string]Command
-	ui      Ui
+	BuilderFactory BuilderFactory
+	Command map[string]Command
+	Ui      Ui
 }
 
 // This creates a new environment
 func NewEnvironment(config *EnvironmentConfig) *Environment {
 	env := &Environment{}
-	env.builder = make(map[string]Builder)
 	env.command = make(map[string]Command)
 
 	if config != nil {
-		for k, v := range config.builder {
-			env.builder[k] = v
-		}
-
-		for k, v := range config.command {
+		for k, v := range config.Command {
 			env.command[k] = v
 		}
 
-		env.ui = config.ui
+		env.builderFactory = config.BuilderFactory
+		env.ui = config.Ui
 	}
 
 	if _, ok := env.command["build"]; !ok {
@@ -79,12 +75,6 @@ func NewEnvironment(config *EnvironmentConfig) *Environment {
 	return env
 }
 
-// Looks up a builder with the given name and returns an interface
-// to access it.
-func (e *Environment) Builder(name string) Builder {
-	return e.builder[name]
-}
-
 // Executes a command as if it was typed on the command-line interface.
 // The return value is the exit code of the command.
 func (e *Environment) Cli(args []string) int {
diff --git a/packer/environment_test.go b/packer/environment_test.go
index 281a18a05..75d31d2a1 100644
--- a/packer/environment_test.go
+++ b/packer/environment_test.go
@@ -83,7 +83,7 @@ func TestEnvironment_SettingUi(t *testing.T) {
 	ui := &ReaderWriterUi{new(bytes.Buffer), new(bytes.Buffer)}
 
 	config := &EnvironmentConfig{}
-	config.ui = ui
+	config.Ui = ui
 
 	env := NewEnvironment(config)