Skip to content

Commit 19512b2

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 4f758dd commit 19512b2

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
@@ -1090,8 +1090,8 @@
10901090
Uses the values of fs.s3a.access.key and fs.s3a.secret.key.
10911091
* com.amazonaws.auth.EnvironmentVariableCredentialsProvider: supports
10921092
configuration of AWS access key ID and secret access key in
1093-
environment variables named AWS_ACCESS_KEY_ID and
1094-
AWS_SECRET_ACCESS_KEY, as documented in the AWS SDK.
1093+
environment variables named AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
1094+
and AWS_SESSION_TOKEN as documented in the AWS SDK.
10951095
* org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider: picks up
10961096
IAM credentials of any EC2 VM or AWS container in which the process is running.
10971097
</description>

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
@@ -537,8 +537,8 @@ This means that the default S3A authentication chain can be defined as
537537
Uses the values of fs.s3a.access.key and fs.s3a.secret.key.
538538
* com.amazonaws.auth.EnvironmentVariableCredentialsProvider: supports
539539
configuration of AWS access key ID and secret access key in
540-
environment variables named AWS_ACCESS_KEY_ID and
541-
AWS_SECRET_ACCESS_KEY, as documented in the AWS SDK.
540+
environment variables named AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
541+
and AWS_SESSION_TOKEN as documented in the AWS SDK.
542542
* org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider: picks up
543543
IAM credentials of any EC2 VM or AWS container in which the process is running.
544544
</description>

0 commit comments

Comments
 (0)