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
2 changes: 1 addition & 1 deletion src/httpfs_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static void LoadInternal(ExtensionLoader &loader) {
};
config.AddExtensionOption("httpfs_client_implementation", "Select which is the HTTPUtil implementation to be used",
LogicalType::VARCHAR, "default", callback_httpfs_client_implementation);
config.AddExtensionOption("disable_global_s3_configuration",
config.AddExtensionOption("enable_global_s3_configuration",
"Automatically fetch AWS credentials from environment variables.", LogicalType::BOOLEAN,
Value::BOOLEAN(true));

Expand Down
2 changes: 1 addition & 1 deletion src/s3fs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,7 @@ S3KeyValueReader::S3KeyValueReader(FileOpener &opener_p, optional_ptr<FileOpener
idx_t secret_types_len)
: reader(opener_p, info, secret_types, secret_types_len) {
Value use_env_vars_for_secret_info_setting;
reader.TryGetSecretKeyOrSetting("disable_global_s3_configuration", "disable_global_s3_configuration",
reader.TryGetSecretKeyOrSetting("enable_global_s3_configuration", "enable_global_s3_configuration",
use_env_vars_for_secret_info_setting);
use_env_variables_for_secret_settings = use_env_vars_for_secret_info_setting.GetValue<bool>();
}
Expand Down
2 changes: 1 addition & 1 deletion test/sql/test_read_public_bucket.test
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SELECT * FROM read_parquet('s3://coiled-datasets/timeseries/20-years/parquet/par

# default to not using globally scoped settings for secrets
statement ok
set disable_global_s3_configuration=false;
set enable_global_s3_configuration=false;

statement ok
SELECT * FROM read_parquet('s3://coiled-datasets/timeseries/20-years/parquet/part.0.parquet') LIMIT 5;
Loading