Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tiledb/sm/filesystem/s3/AWSCredentialsProviderChain.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "tiledb/sm/filesystem/s3/STSCredentialsProvider.h"

#include <aws/core/auth/AWSCredentialsProviderChain.h>
#include <aws/core/auth/LoginCredentialsProvider.h>
#include <aws/core/auth/SSOCredentialsProvider.h>
#include <aws/core/config/EC2InstanceProfileConfigLoader.h>
#include <aws/core/platform/Environment.h>
Expand Down Expand Up @@ -80,6 +81,10 @@ DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain(
// going to be added upstream soon with
// https://github.com/aws/aws-sdk-cpp/pull/2860, let's not update it for now.
AddProvider(make_shared<SSOCredentialsProvider>(HERE()));
if (clientConfig) {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition is always true in practice.

AddProvider(make_shared<LoginCredentialsProvider>(
HERE(), clientConfig->credentialProviderConfig));
}

// General HTTP Credentials (prev. known as ECS TaskRole credentials) only
// available when ENVIRONMENT VARIABLE is set
Expand Down
8 changes: 4 additions & 4 deletions tiledb/sm/filesystem/s3/AWSCredentialsProviderChain.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ namespace tiledb::sm::filesystem::s3 {
/**
* Creates an AWSCredentialsProviderChain which uses in order
* EnvironmentAWSCredentialsProvider, ProfileConfigFileAWSCredentialsProvider,
* ProcessCredentialsProvider, STSAssumeRoleWebIdentityCredentialsProvider and
* SSOCredentialsProvider.
* ProcessCredentialsProvider, STSAssumeRoleWebIdentityCredentialsProvider,
* SSOCredentialsProvider and LoginCredentialsProvider.
*/
class DefaultAWSCredentialsProviderChain
: public Aws::Auth::AWSCredentialsProviderChain {
public:
/**
* Initializes the provider chain with EnvironmentAWSCredentialsProvider,
* ProfileConfigFileAWSCredentialsProvider, ProcessCredentialsProvider,
* STSAssumeRoleWebIdentityCredentialsProvider and SSOCredentialsProvider in
* that order.
* STSAssumeRoleWebIdentityCredentialsProvider, SSOCredentialsProvider and
* LoginCredentialsProvider (if clientConfig is not null) in that order.
*
* @param clientConfig Optional client configuration to use.
*/
Expand Down
Loading