Change precedence of --secrets-dir flag

Author: Marton6

internals/secrethub/env_source.go

@@ -90,6 +90,12 @@ func (env *environment) env() (map[string]value, error) {
 		sources = append(sources, dirSource)
 	}
 
+	// --secrets-dir flag
+	if env.secretsDir != "" {
+		secretsDirEnv := newSecretsDirEnv(env.newClient, env.secretsDir)
+		sources = append(sources, secretsDirEnv)
+	}
+
 	//secrethub.env file
 	if env.envFile == "" {
 		_, err := env.osStat(defaultEnvFile)
@@ -131,12 +137,6 @@ func (env *environment) env() (map[string]value, error) {
 	referenceEnv := newReferenceEnv(osEnvMap)
 	sources = append(sources, referenceEnv)
 
-	// --secrets-dir flag
-	if env.secretsDir != "" {
-		secretsDirEnv := newSecretsDirEnv(env.newClient, env.secretsDir)
-		sources = append(sources, secretsDirEnv)
-	}
-
 	// --envar flag
 	// TODO: Validate the flags when parsing by implementing the Flag interface for EnvFlags.
 	flagEnv, err := NewEnvFlags(env.envar)

internals/secrethub/run_test.go

@@ -770,7 +770,7 @@ func TestRunCommand_environment(t *testing.T) {
 			expectedEnv:     []string{"TEST=bbb"},
 		},
 		// TODO Add test case for: envar flag has precedence over secret reference - requires refactoring of fakeclient
-		"secrets-dir flag has precedence over secret reference": {
+		"secret reference has precedence over secrets-dir flag": {
 			command: RunCommand{
 				environment: &environment{
 					newClient: func() (secrethub.ClientInterface, error) {
@@ -818,8 +818,8 @@ func TestRunCommand_environment(t *testing.T) {
 					}, nil
 				},
 			},
-			expectedSecrets: []string{"aaa"},
-			expectedEnv:     []string{"FOO=aaa"},
+			expectedSecrets: []string{"bbb"},
+			expectedEnv:     []string{"FOO=bbb"},
 		},
 		"secret reference has precedence over .env file": {
 			command: RunCommand{