Undo making osEnv a function

Author: SimonBarendse

internals/secrethub/env_source.go

@@ -24,7 +24,7 @@ import (
 
 type environment struct {
 	io                           ui.IO
-	osEnv                        func() []string
+	osEnv                        []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,7 +57,7 @@ func (env *environment) register(clause *cli.CommandClause) {
 }
 
 func (env *environment) env() (map[string]value, error) {
-	osEnvMap, _ := parseKeyValueStringsToMap(env.osEnv())
+	osEnvMap, _ := parseKeyValueStringsToMap(env.osEnv)
 	var sources []EnvSource
 
 	sources = append(sources, &osEnv{

internals/secrethub/run_test.go

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