Change osEnv to slice instead of function

Author: Marton6

internals/secrethub/inject.go

@@ -34,7 +34,7 @@ type InjectCommand struct {
 	useClipboard                  bool
 	clearClipboardAfter           time.Duration
 	clipper                       clip.Clipper
-	osEnv                         func() []string
+	osEnv                         []string
 	newClient                     newClientFunc
 	templateVars                  map[string]string
 	templateVersion               string
@@ -45,7 +45,7 @@ type InjectCommand struct {
 func NewInjectCommand(io ui.IO, newClient newClientFunc) *InjectCommand {
 	return &InjectCommand{
 		clipper:             clip.NewClipboard(),
-		osEnv:               os.Environ,
+		osEnv:               os.Environ(),
 		clearClipboardAfter: defaultClearClipboardAfter,
 		io:                  io,
 		newClient:           newClient,
@@ -101,7 +101,7 @@ func (cmd *InjectCommand) Run() error {
 		}
 	}
 
-	osEnv, _ := parseKeyValueStringsToMap(cmd.osEnv())
+	osEnv, _ := parseKeyValueStringsToMap(cmd.osEnv)
 
 	var templateVariableReader tpl.VariableReader
 	templateVariableReader, err = newVariableReader(osEnv, cmd.templateVars)

internals/secrethub/run.go

@@ -60,7 +60,7 @@ const (
 type RunCommand struct {
 	command                      []string
 	io                           ui.IO
-	osEnv                        func() []string
+	osEnv                        []string
 	envar                        map[string]string
 	envFile                      string
 	templateVars                 map[string]string
@@ -77,7 +77,7 @@ type RunCommand struct {
 func NewRunCommand(io ui.IO, newClient newClientFunc) *RunCommand {
 	return &RunCommand{
 		io:           io,
-		osEnv:        os.Environ,
+		osEnv:        os.Environ(),
 		envar:        make(map[string]string),
 		templateVars: make(map[string]string),
 		newClient:    newClient,
@@ -115,7 +115,7 @@ func (cmd *RunCommand) Run() error {
 	// Parse
 	envSources := []EnvSource{}
 
-	osEnv, passthroughEnv := parseKeyValueStringsToMap(cmd.osEnv())
+	osEnv, passthroughEnv := parseKeyValueStringsToMap(cmd.osEnv)
 
 	referenceEnv := newReferenceEnv(osEnv)
 	envSources = append(envSources, referenceEnv)

internals/secrethub/run_test.go

@@ -458,13 +458,11 @@ func TestRunCommand_Run(t *testing.T) {
 	}{
 		"success, no secrets": {
 			command: RunCommand{
-				osEnv:   func() []string { return []string{} },
 				command: []string{"echo", "test"},
 			},
 		},
 		"missing secret": {
 			command: RunCommand{
-				osEnv:   func() []string { return []string{} },
 				command: []string{"echo", "test"},
 				envar: map[string]string{
 					"missing": "path/to/unexisting/secret",
@@ -486,7 +484,6 @@ func TestRunCommand_Run(t *testing.T) {
 		},
 		"missing secret ignored": {
 			command: RunCommand{
-				osEnv:   func() []string { return []string{} },
 				command: []string{"echo", "test"},
 				envar: map[string]string{
 					"missing": "path/to/unexisting/secret",
@@ -508,7 +505,6 @@ func TestRunCommand_Run(t *testing.T) {
 		},
 		"repo does not exist ignored": {
 			command: RunCommand{
-				osEnv:   func() []string { return []string{} },
 				command: []string{"echo", "test"},
 				envar: map[string]string{
 					"missing": "unexisting/repo/secret",
@@ -530,7 +526,6 @@ func TestRunCommand_Run(t *testing.T) {
 		},
 		"invalid template var: start with a number": {
 			command: RunCommand{
-				osEnv:   func() []string { return []string{} },
 				envFile: "secrethub.env",
 				templateVars: map[string]string{
 					"0foo": "value",
@@ -541,7 +536,6 @@ func TestRunCommand_Run(t *testing.T) {
 		},
 		"invalid template var: illegal character": {
 			command: RunCommand{
-				osEnv:   func() []string { return []string{} },
 				envFile: "secrethub.env",
 				templateVars: map[string]string{
 					"foo@bar": "value",
@@ -552,9 +546,7 @@ func TestRunCommand_Run(t *testing.T) {
 		},
 		"os env secret not found": {
 			command: RunCommand{
-				osEnv: func() []string {
-					return []string{"TEST=secrethub://nonexistent/secret/path"}
-				},
+				osEnv:   []string{"TEST=secrethub://nonexistent/secret/path"},
 				command: []string{"echo", "test"},
 				newClient: func() (secrethub.ClientInterface, error) {
 					return fakeclient.Client{
@@ -572,9 +564,7 @@ func TestRunCommand_Run(t *testing.T) {
 		},
 		"os env secret not found ignored": {
 			command: RunCommand{
-				osEnv: func() []string {
-					return []string{"TEST=secrethub://nonexistent/secret/path"}
-				},
+				osEnv:                []string{"TEST=secrethub://nonexistent/secret/path"},
 				ignoreMissingSecrets: true,
 				command:              []string{"echo", "test"},
 				newClient: func() (secrethub.ClientInterface, error) {