Skip to content

Commit

Permalink
Merge pull request ClickHouse#72397 from ClickHouse/fix-aws-ecs-conta…
Browse files Browse the repository at this point in the history
…iner-env-var-name

Read AWS EKS token from file, attempt #2
  • Loading branch information
thevar1able authored Nov 25, 2024
2 parents ba7ebe8 + 69b4743 commit 7c3d015
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/IO/S3/Credentials.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
static const char AWS_ECS_CONTAINER_CREDENTIALS_RELATIVE_URI[] = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI";
static const char AWS_ECS_CONTAINER_CREDENTIALS_FULL_URI[] = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
static const char AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN[] = "AWS_CONTAINER_AUTHORIZATION_TOKEN";
static const char AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN_PATH[] = "AWS_CONTAINER_AUTHORIZATION_TOKEN_PATH";
static const char AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN_FILE[] = "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE";
static const char AWS_EC2_METADATA_DISABLED[] = "AWS_EC2_METADATA_DISABLED";

/// The only difference from DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain()
Expand Down Expand Up @@ -754,11 +754,11 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
else if (!absolute_uri.empty())
{
auto token = Aws::Environment::GetEnv(AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN);
const auto token_path = Aws::Environment::GetEnv(AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN_PATH);
const auto token_path = Aws::Environment::GetEnv(AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN_FILE);

if (!token_path.empty())
{
LOG_INFO(logger, "The environment variable value {} is {}", AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN_PATH, token_path);
LOG_INFO(logger, "The environment variable value {} is {}", AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN_FILE, token_path);

String token_from_file;

Expand Down

0 comments on commit 7c3d015

Please sign in to comment.