Don't set region env vars twice

99designs · Apr 20, 2020 · 255e9cb · 255e9cb
1 parent 591a63b
commit 255e9cb
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/cli/exec.go b/cli/exec.go
@@ -188,9 +188,11 @@ func updateEnvForAwsVault(env environ, profileName string, region string) enviro
 
 	env.Set("AWS_VAULT", profileName)
 
-	log.Printf("Setting subprocess env: AWS_DEFAULT_REGION=%s, AWS_REGION=%s", region, region)
-	env.Set("AWS_DEFAULT_REGION", region)
-	env.Set("AWS_REGION", region)
+	if region != "" {
+		log.Printf("Setting subprocess env: AWS_DEFAULT_REGION=%s, AWS_REGION=%s", region, region)
+		env.Set("AWS_DEFAULT_REGION", region)
+		env.Set("AWS_REGION", region)
+	}
 
 	return env
 }
@@ -259,10 +261,6 @@ func execEnvironment(input ExecCommandInput, config *vault.Config, creds *creden
 	env := environ(os.Environ())
 	env = updateEnvForAwsVault(env, input.ProfileName, config.Region)
 
-	log.Printf("Setting subprocess env: AWS_DEFAULT_REGION=%s, AWS_REGION=%s", config.Region, config.Region)
-	env.Set("AWS_DEFAULT_REGION", config.Region)
-	env.Set("AWS_REGION", config.Region)
-
 	log.Println("Setting subprocess env: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY")
 	env.Set("AWS_ACCESS_KEY_ID", val.AccessKeyID)
 	env.Set("AWS_SECRET_ACCESS_KEY", val.SecretAccessKey)