all shells: Pass env vars through a key value store (#98)

Author: azr

cmd/packer-sdc/internal/test-data/.gitignore

@@ -0,0 +1 @@
+*.mdx

shell-local/config.go

@@ -96,19 +96,6 @@ func Validate(config *Config) error {
 		}
 	}
 
-	// Clean up input
-	if config.Inline != nil && len(config.Inline) == 0 {
-		config.Inline = make([]string, 0)
-	}
-
-	if config.Scripts == nil {
-		config.Scripts = make([]string, 0)
-	}
-
-	if config.Vars == nil {
-		config.Vars = make([]string, 0)
-	}
-
 	// Verify that the user has given us a command to run
 	if config.Command == "" && len(config.Inline) == 0 &&
 		len(config.Scripts) == 0 && config.Script == "" {

shell-local/config.hcl2spec.go

@@ -206,6 +206,12 @@ func createFlattenedEnvVars(config *Config) (string, error) {
 		envVars[keyValue[0]] = strings.Replace(keyValue[1], "'", `'"'"'`, -1)
 	}
 
+	for k, v := range config.Env {
+		// Store pair, replacing any single quotes in value so they parse
+		// correctly with required environment variable format
+		envVars[k] = strings.Replace(v, "'", `'"'"'`, -1)
+	}
+
 	// Create a list of env var keys in sorted order
 	var keys []string
 	for k := range envVars {

shell-local/run.go

@@ -36,10 +36,15 @@ type Provisioner struct {
 	// for examples such as 3010 - "The requested operation is successful.
 	ValidExitCodes []int `mapstructure:"valid_exit_codes"`
 
-	// An array of environment variables that will be injected before
-	// your command(s) are executed.
+	// An array of environment variables that will be injected before your
+	// command(s) are executed. Any duplicate vars will be overridden by `env`.
 	Vars []string `mapstructure:"environment_vars"`
 
+	// An map of environment variables that will be injected before your
+	// command(s) are executed. Any duplicate `environment_vars` will be
+	// overridden by `env`.
+	Env map[string]string `mapstructure:"env"`
+
 	// This is used in the template generation to format environment variables
 	// inside the `ExecuteCommand` template.
 	EnvVarFormat string `mapstructure:"env_var_format"`