This is an automated email from the ASF dual-hosted git repository. fjy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push: new 1a78a0c Add credentials for ECS (#8651) 1a78a0c is described below commit 1a78a0c98a1c4bb286293430540e02aa37c6dcac Author: Mitch Lloyd <mitch.ll...@gmail.com> AuthorDate: Sat Oct 12 09:12:14 2019 -0700 Add credentials for ECS (#8651) * Add credentials for ECS * Fix import order * Update S3 authentication methods table * Update .spelling for new documentation --- .../main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java | 4 +++- docs/development/extensions-core/s3.md | 3 ++- website/.spelling | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java b/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java index a0ccce4..6e93d4a 100644 --- a/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java +++ b/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java @@ -20,6 +20,7 @@ package org.apache.druid.common.aws; import com.amazonaws.auth.AWSCredentialsProviderChain; +import com.amazonaws.auth.EC2ContainerCredentialsProviderWrapper; import com.amazonaws.auth.EnvironmentVariableCredentialsProvider; import com.amazonaws.auth.InstanceProfileCredentialsProvider; import com.amazonaws.auth.SystemPropertiesCredentialsProvider; @@ -35,6 +36,7 @@ public class AWSCredentialsUtils new EnvironmentVariableCredentialsProvider(), new SystemPropertiesCredentialsProvider(), new ProfileCredentialsProvider(), - new InstanceProfileCredentialsProvider()); + new EC2ContainerCredentialsProviderWrapper(), + InstanceProfileCredentialsProvider.getInstance()); } } diff --git a/docs/development/extensions-core/s3.md b/docs/development/extensions-core/s3.md index 6d12815..ea69562 100644 --- a/docs/development/extensions-core/s3.md +++ b/docs/development/extensions-core/s3.md @@ -79,7 +79,8 @@ To connect to your S3 bucket (whether deep storage bucket or source bucket), Dru |3|Environment variables|Based on environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`| |4|Java system properties|Based on JVM properties `aws.accessKeyId` and `aws.secretKey` | |5|Profile information|Based on credentials you may have on your druid instance (generally in `~/.aws/credentials`)| -|6|Instance profile information|Based on the instance profile you may have attached to your druid instance| +|6|ECS container credentials|Based on environment variables available on AWS ECS (AWS_CONTAINER_CREDENTIALS_RELATIVE_URI or AWS_CONTAINER_CREDENTIALS_FULL_URI) as described in the [EC2ContainerCredentialsProviderWrapper documentation](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/EC2ContainerCredentialsProviderWrapper.html)| +|7|Instance profile information|Based on the instance profile you may have attached to your druid instance| You can find more information about authentication method [here](https://docs.aws.amazon.com/fr_fr/sdk-for-java/v1/developer-guide/credentials.html)<br/> **Note :** *Order is important here as it indicates the precedence of authentication methods.<br/> diff --git a/website/.spelling b/website/.spelling index cd9ece1..c4afdae 100644 --- a/website/.spelling +++ b/website/.spelling @@ -23,6 +23,8 @@ ACL APIs AWS +AWS_CONTAINER_CREDENTIALS_RELATIVE_URI +AWS_CONTAINER_CREDENTIALS_FULL_URI Actian Authorizer Avatica @@ -58,6 +60,8 @@ Dropwizard dropwizard DruidSQL EC2 +EC2ContainerCredentialsProviderWrapper +ECS EMR EMRFS ETL --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org