Skip to content

Commit cdb0caf

Browse files
committed
HADOOP-16735. Make it clearer in config default that EnvironmentVariableCredentialsProvider supports AWS_SESSION_TOKEN. Contributed by Mingliang Liu
This closes #1733
1 parent 0ac6dc7 commit cdb0caf

File tree

2 files changed

+4
-4
lines changed
  • hadoop-common-project/hadoop-common/src/main/resources
  • hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws

2 files changed

+4
-4
lines changed

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,8 +1072,8 @@
10721072
fs.s3a.access.key and fs.s3a.secret.key.
10731073
2. com.amazonaws.auth.EnvironmentVariableCredentialsProvider: supports
10741074
configuration of AWS access key ID and secret access key in
1075-
environment variables named AWS_ACCESS_KEY_ID and
1076-
AWS_SECRET_ACCESS_KEY, as documented in the AWS SDK.
1075+
environment variables named AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
1076+
and AWS_SESSION_TOKEN as documented in the AWS SDK.
10771077
3. org.apache.hadoop.fs.s3a.SharedInstanceProfileCredentialsProvider:
10781078
a shared instance of
10791079
com.amazonaws.auth.InstanceProfileCredentialsProvider from the AWS

hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ of `com.amazonaws.auth.AWSCredentialsProvider` may also be used.
355355
See also fs.s3a.access.key and fs.s3a.secret.key.
356356
2. com.amazonaws.auth.EnvironmentVariableCredentialsProvider: supports
357357
configuration of AWS access key ID and secret access key in
358-
environment variables named AWS_ACCESS_KEY_ID and
359-
AWS_SECRET_ACCESS_KEY, as documented in the AWS SDK.
358+
environment variables named AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
359+
and AWS_SESSION_TOKEN as documented in the AWS SDK.
360360
3. com.amazonaws.auth.InstanceProfileCredentialsProvider: supports use
361361
of instance profile credentials if running in an EC2 VM.
362362
</description>

0 commit comments

Comments
 (0)