Skip to content

Fix profile loading when passed an explicit profile #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: v1.4-andium
Choose a base branch
from
+22 −24
Open

Fix profile loading when passed an explicit profile #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
530d2e3
Fix profile loading when passed an explicit profile
jtanx Sep 27, 2025
f47933c
Misc cleanup
jtanx Sep 27, 2025
d67aa46
Maybe fix tests
jtanx Oct 6, 2025
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
24 changes: 12 additions & 12 deletions scripts/create_minio_credential_file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ aws_session_token=completelybogussessiontoken
aws_access_key_id=
aws_secret_access_key=
aws_session_token=
[assume-role-arn]
source_profile = default
role_arn = arn:aws:iam::840140254803:role/pyiceberg-etl-role
region = us-east-2
[assume-role-arn-external-id]
source_profile = default
role_arn = arn:aws:iam::840140254803:role/pyiceberg-etl-role
region = us-east-2
external_id = 128289344
"

# Write the credentials configuration to the file
Expand All @@ -54,8 +43,19 @@ region=eu-west-1
[profile minio-testing-invalid]
region=the-moon-123
[minio-testing-empty]
[profile minio-testing-empty]
region=
[profile assume-role-arn]
source_profile = default
role_arn = arn:aws:iam::840140254803:role/pyiceberg-etl-role
region = us-east-2
[profile assume-role-arn-external-id]
source_profile = default
role_arn = arn:aws:iam::840140254803:role/pyiceberg-etl-role
region = us-east-2
external_id = 128289344
"

# Write the config to the file
Expand Down
22 changes: 10 additions & 12 deletions src/aws_secret.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ static struct {

//! Parse and set the remaining options
static void ParseCoreS3Config(CreateSecretInput &input, KeyValueSecret &secret) {
vector<string> options = {"key_id", "secret", "region",
"endpoint", "session_token", "endpoint",
"url_style", "use_ssl", "s3_url_compatibility_mode"};
vector<string> options = {"key_id", "secret", "region",
"endpoint", "session_token", "url_style",
"use_ssl", "s3_url_compatibility_mode"};
for (const auto &val : options) {
auto set_region_param = input.options.find(val);
if (set_region_param != input.options.end()) {
Expand All @@ -65,26 +65,25 @@ static unique_ptr<KeyValueSecret> ConstructBaseS3Secret(vector<string> &prefix_p

static Aws::Config::Profile GetProfile(const string &profile_name, const bool require_profile) {
Aws::Config::Profile selected_profile;
// get file path where aws credentials are stored.
// comes from AWS_SHARED_CREDENTIALS_FILE
auto credentials_file_path = Aws::Auth::ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename();
// get file path where aws config is stored.
// comes from AWS_CONFIG_FILE
auto config_file_path = Aws::Auth::GetConfigProfileFilename();
// get the profile from within that file
Aws::Map<Aws::String, Aws::Config::Profile> profiles;
Aws::Config::AWSConfigFileProfileConfigLoader loader(credentials_file_path);
Aws::Config::AWSConfigFileProfileConfigLoader loader(config_file_path, true);
Copy link
Collaborator

@Tmonster Tmonster Nov 4, 2025

Choose a reason for hiding this comment

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

Maybe in the future we will want a setting for the useProfilePrefix, but don't think that is needed here

if (loader.Load()) {
profiles = loader.GetProfiles();
for (const auto &entry : profiles) {
const Aws::String &profileName = entry.first;
if (profileName == profile_name) {
selected_profile = entry.second;
auto &url = selected_profile.GetValue("endpoint");
return selected_profile;
}
}
}
if (require_profile) {
throw InvalidConfigurationException("Secret Validation Failure: no profile '%s' found in credentials file %s",
profile_name, credentials_file_path);
throw InvalidConfigurationException("Secret Validation Failure: no profile '%s' found in config file %s",
profile_name, config_file_path);
}
return selected_profile; // empty profile
}
Expand Down Expand Up @@ -313,7 +312,6 @@ static unique_ptr<BaseSecret> CreateAWSSecretFromCredentialChain(ClientContext &
result->secret_map["refresh_info"] = Value::STRUCT(struct_fields);
}

AwsSetCredentialsResult ret;
if (!credentials.IsExpiredOrEmpty()) {
result->secret_map["key_id"] = Value(credentials.GetAWSAccessKeyId());
result->secret_map["secret"] = Value(credentials.GetAWSSecretKey());
Expand Down Expand Up @@ -356,7 +354,7 @@ void CreateAwsSecretFunctions::InitializeCurlCertificates(DatabaseInstance &db)
struct stat buf;
if (stat(caFile.c_str(), &buf) == 0) {
SELECTED_CURL_CERT_PATH = caFile;
DUCKDB_LOG_DEBUG(db, "aws.CaCertificateDetection", "CA path: %s", SELECTED_CURL_CERT_PATH);
DUCKDB_LOG_DEBUG(db, "aws.CaCertificateDetection: CA path: %s", SELECTED_CURL_CERT_PATH);
return;
}
}
Expand Down
Loading