ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8835 from ksatirli/patch-2 

Replaces remaining AWS_SECURITY_TOKEN with AWS_SESSION_TOKEN
This commit is contained in:
James Nugent 2016-09-14 11:18:18 +01:00 committed by GitHub
parent a0a59d3fb7 27f8845863
commit e705d5462b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/providers/aws/index.html.markdown
View File

@ -154,7 +154,7 @@ The following arguments are supported in the `provider` block:
If this is not set and a profile is specified, ~/.aws/credentials will be used. If this is not set and a profile is specified, ~/.aws/credentials will be used.
* `token` - (Optional) Use this to set an MFA token. It can also be sourced * `token` - (Optional) Use this to set an MFA token. It can also be sourced
from the `AWS_SECURITY_TOKEN` environment variable. from the `AWS_SESSION_TOKEN` environment variable.
* `max_retries` - (Optional) This is the maximum number of times an API call is * `max_retries` - (Optional) This is the maximum number of times an API call is
being retried in case requests are being throttled or experience transient failures. being retried in case requests are being throttled or experience transient failures.

2
website/source/docs/state/remote/s3.html.md
View File

@ -58,4 +58,4 @@ The following configuration options / environment variables are supported:
* `kms_key_id` - (Optional) The ARN of a KMS Key to use for encrypting the state. * `kms_key_id` - (Optional) The ARN of a KMS Key to use for encrypting the state.
* `profile` - (Optional) This is the AWS profile name as set in the shared credentials file. * `profile` - (Optional) This is the AWS profile name as set in the shared credentials file.
* `shared_credentials_file` - (Optional) This is the path to the shared credentials file. If this is not set and a profile is specified, ~/.aws/credentials will be used. * `shared_credentials_file` - (Optional) This is the path to the shared credentials file. If this is not set and a profile is specified, ~/.aws/credentials will be used.
* `token` - (Optional) Use this to set an MFA token. It can also be sourced from the `AWS_SECURITY_TOKEN` environment variable. * `token` - (Optional) Use this to set an MFA token. It can also be sourced from the `AWS_SESSION_TOKEN` environment variable.