Merge pull request #35 from 99designs/boto-compat

Boto use AWS_SECURITY_TOKEN vs AWS_SESSION_TOKEN
99designs · Oct 10, 2015 · 87dd854 · 87dd854
2 parents e1babc5 + 1fc3416
commit 87dd854
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/exec.go b/exec.go
@@ -62,6 +62,7 @@ func ExecCommand(ui Ui, input ExecCommandInput) {
 
 	env := os.Environ()
 	env = overwriteEnv(env, "http_proxy", l.Addr().String())
+	env = overwriteEnv(env, "no_proxy", "amazonaws.com")
 	env = overwriteEnv(env, "AWS_CONFIG_FILE", cfg.Name())
 	env = overwriteEnv(env, "AWS_DEFAULT_PROFILE", input.Profile)
 
@@ -71,6 +72,7 @@ func ExecCommand(ui Ui, input ExecCommandInput) {
 
 		if val.SessionToken != "" {
 			env = overwriteEnv(env, "AWS_SESSION_TOKEN", val.SessionToken)
+			env = overwriteEnv(env, "AWS_SECURITY_TOKEN", val.SessionToken)
 		}
 	}