Merge pull request #1785 from koendc/f-aws-security-token

aws: re-introduce support for AWS_SECURITY_TOKEN
2015-05-04 11:18:28 -07:00 · 2015-05-04 11:18:28 -07:00 · cf6fa89f46
parent c437886a46 c8f32a2711
commit cf6fa89f46
1 changed files with 1 additions and 0 deletions
--- a/builtin/providers/aws/provider.go
+++ b/builtin/providers/aws/provider.go
@ -38,6 +38,7 @@ func Provider() terraform.ResourceProvider {
 				Optional: true,
 				DefaultFunc: schema.MultiEnvDefaultFunc([]string{
 					"AWS_SESSION_TOKEN",
+					"AWS_SECURITY_TOKEN",
 				}, ""),
 				Description: descriptions["token"],
 			},