Move os environment to environment struct

Author: SimonBarendse

internals/secrethub/env_source.go

@@ -24,7 +24,7 @@ import (
 
 type environment struct {
 	io                           ui.IO
-	osEnv                        []string
+	osEnv                        func() []string
 	readFile                     func(filename string) ([]byte, error)
 	osStat                       func(filename string) (os.FileInfo, error)
 	envar                        map[string]string
@@ -38,7 +38,7 @@ type environment struct {
 func newEnvironment(io ui.IO) *environment {
 	return &environment{
 		io:           io,
-		osEnv:        os.Environ(),
+		osEnv:        os.Environ,
 		readFile:     ioutil.ReadFile,
 		osStat:       os.Stat,
 		templateVars: make(map[string]string),
@@ -57,9 +57,13 @@ func (env *environment) register(clause *cli.CommandClause) {
 }
 
 func (env *environment) env() (map[string]value, error) {
-	osEnv, _ := parseKeyValueStringsToMap(env.osEnv)
+	osEnvMap, _ := parseKeyValueStringsToMap(env.osEnv())
 	var sources []EnvSource
 
+	sources = append(sources, &osEnv{
+		osEnv: osEnvMap,
+	})
+
 	// .secretsenv dir (for backwards compatibility)
 	envDir := filepath.Join(secretspec.SecretEnvPath, env.secretsEnvDir)
 	_, err := os.Stat(envDir)
@@ -82,7 +86,7 @@ func (env *environment) env() (map[string]value, error) {
 	}
 
 	if env.envFile != "" {
-		templateVariableReader, err := newVariableReader(osEnv, env.templateVars)
+		templateVariableReader, err := newVariableReader(osEnvMap, env.templateVars)
 		if err != nil {
 			return nil, err
 		}
@@ -109,7 +113,7 @@ func (env *environment) env() (map[string]value, error) {
 	}
 
 	// secret references (secrethub://)
-	referenceEnv := newReferenceEnv(osEnv)
+	referenceEnv := newReferenceEnv(osEnvMap)
 	sources = append(sources, referenceEnv)
 
 	// --envar flag

internals/secrethub/run.go

@@ -182,13 +182,9 @@ func (cmd *RunCommand) Run() error {
 // sourceEnvironment returns the environment of the subcommand, with all the secrets sourced
 // and the secret values that need to be masked.
 func (cmd *RunCommand) sourceEnvironment() ([]string, []string, error) {
-	osEnv, passthroughEnv := parseKeyValueStringsToMap(cmd.osEnv)
+	_, passthroughEnv := parseKeyValueStringsToMap(cmd.osEnv)
 
-	// add os envs
 	newEnv := map[string]string{}
-	for name, value := range osEnv {
-		newEnv[name] = value
-	}
 
 	envValues, err := cmd.environment.env()
 	if err != nil {

internals/secrethub/run_test.go

@@ -589,7 +589,9 @@ func TestRunCommand_Run(t *testing.T) {
 				command: []string{"echo", "test"},
 				io:      ui.NewFakeIO(),
 				environment: &environment{
-					osEnv:  []string{"TEST=secrethub://nonexistent/secret/path"},
+					osEnv: func() []string {
+						return []string{"TEST=secrethub://nonexistent/secret/path"}
+					},
 					osStat: osStatNotExist,
 				},
 				newClient: func() (secrethub.ClientInterface, error) {
@@ -612,7 +614,9 @@ func TestRunCommand_Run(t *testing.T) {
 				command:              []string{"echo", "test"},
 				io:                   ui.NewFakeIO(),
 				environment: &environment{
-					osEnv:  []string{"TEST=secrethub://nonexistent/secret/path"},
+					osEnv: func() []string {
+						return []string{"TEST=secrethub://nonexistent/secret/path"}
+					},
 					osStat: osStatNotExist,
 				},
 				newClient: func() (secrethub.ClientInterface, error) {
@@ -772,7 +776,9 @@ func TestRunCommand_environment(t *testing.T) {
 					readFile:                     readFileFunc("secrethub.env", "TEST=aaa"),
 					dontPromptMissingTemplateVar: true,
 					templateVersion:              "2",
-					osEnv:                        []string{"TEST=secrethub://test/test/test"},
+					osEnv: func() []string {
+						return []string{"TEST=secrethub://test/test/test"}
+					},
 				},
 				newClient: func() (secrethub.ClientInterface, error) {
 					return fakeclient.Client{
@@ -885,7 +891,9 @@ func TestRunCommand_environment(t *testing.T) {
 					readFile:                     readFileFunc("secrethub.env", "TEST = {{ test/$variable/test }}"),
 					dontPromptMissingTemplateVar: true,
 					templateVersion:              "2",
-					osEnv:                        []string{"SECRETHUB_VAR_VARIABLE=test"},
+					osEnv: func() []string {
+						return []string{"SECRETHUB_VAR_VARIABLE=test"}
+					},
 				},
 				newClient: func() (secrethub.ClientInterface, error) {
 					return fakeclient.Client{