Skip to content

feat: Expose disable_config_load opendal S3 option #782

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

Merged
merged 1 commit into from
Dec 12, 2024
Merged

feat: Expose disable_config_load opendal S3 option #782

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions crates/iceberg/src/io/storage_s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,17 @@ pub const S3_ASSUME_ROLE_ARN: &str = "client.assume-role.arn";
pub const S3_ASSUME_ROLE_EXTERNAL_ID: &str = "client.assume-role.external-id";
/// Optional session name used to assume an IAM role.
pub const S3_ASSUME_ROLE_SESSION_NAME: &str = "client.assume-role.session-name";
/// Option to skip signing request (e.g. for public buckets/folders)
/// Option to skip signing requests (e.g. for public buckets/folders).
pub const S3_ALLOW_ANONYMOUS: &str = "s3.allow-anonymous";
/// Option to skip loading the credential from EC2 metadata (typically used in conjunction with
/// `S3_ALLOW_ANONYMOUS`)
/// `S3_ALLOW_ANONYMOUS`).
pub const S3_DISABLE_EC2_METADATA: &str = "s3.disable-ec2-metadata";
/// Option to skip loading configuration from config file and the env.
pub const S3_DISABLE_CONFIG_LOAD: &str = "s3.disable-config-load";

fn is_truthy(value: &str) -> bool {
["true", "t", "1", "on"].contains(&value)
}

/// Parse iceberg props to s3 config.
pub(crate) fn s3_config_parse(mut m: HashMap<String, String>) -> Result<S3Config> {
Expand All @@ -86,7 +92,7 @@ pub(crate) fn s3_config_parse(mut m: HashMap<String, String>) -> Result<S3Config
cfg.region = Some(region);
};
if let Some(path_style_access) = m.remove(S3_PATH_STYLE_ACCESS) {
if ["true", "t", "1"].contains(&path_style_access.to_lowercase().as_str()) {
if is_truthy(path_style_access.to_lowercase().as_str()) {
cfg.enable_virtual_host_style = true;
}
};
Expand Down Expand Up @@ -132,15 +138,20 @@ pub(crate) fn s3_config_parse(mut m: HashMap<String, String>) -> Result<S3Config
};

if let Some(allow_anonymous) = m.remove(S3_ALLOW_ANONYMOUS) {
if ["true", "t", "1", "on"].contains(&allow_anonymous.to_lowercase().as_str()) {
if is_truthy(allow_anonymous.to_lowercase().as_str()) {
cfg.allow_anonymous = true;
}
}
if let Some(disable_ec2_metadata) = m.remove(S3_DISABLE_EC2_METADATA) {
if ["true", "t", "1", "on"].contains(&disable_ec2_metadata.to_lowercase().as_str()) {
if is_truthy(disable_ec2_metadata.to_lowercase().as_str()) {
cfg.disable_ec2_metadata = true;
}
};
if let Some(disable_config_load) = m.remove(S3_DISABLE_CONFIG_LOAD) {
if is_truthy(disable_config_load.to_lowercase().as_str()) {
cfg.disable_config_load = true;
}
};

Ok(cfg)
}
Expand Down
Loading