Skip to content
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

Jump to bottom

fix(rust, python): fixed differences in storage options between log and object stores #2500

Merged
merged 4 commits into from
May 15, 2024
Merged

fix(rust, python): fixed differences in storage options between log and object stores #2500

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9370046
fix(rust, python): fixed differences in storage options between log a…
mightyshazam May 11, 2024
bb7ae28
reformatted code
mightyshazam May 11, 2024
2a3cdc8
removed debug statement
mightyshazam May 12, 2024
3d042b4
Merge branch 'main' into fix-aws-region-imds
mightyshazam May 13, 2024
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
70 changes: 47 additions & 23 deletions crates/aws/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! AWS S3 storage backend.

use aws_config::meta::region::ProvideRegion;
use aws_config::provider_config::ProviderConfig;
use aws_config::{Region, SdkConfig};
use bytes::Bytes;
Expand All @@ -20,6 +21,7 @@ use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;
use tokio::io::AsyncWrite;
use tracing::warn;
use url::Url;

use crate::errors::DynamoDbConfigError;
Expand Down Expand Up @@ -67,9 +69,9 @@ impl ObjectStoreFactory for S3ObjectStoreFactory {
fn parse_url_opts(
&self,
url: &Url,
options: &StorageOptions,
storage_options: &StorageOptions,
) -> DeltaResult<(ObjectStoreRef, Path)> {
let options = self.with_env_s3(options);
let options = self.with_env_s3(storage_options);
let (inner, prefix) = parse_url_opts(
url,
options.0.iter().filter_map(|(key, value)| {
Expand All @@ -87,7 +89,7 @@ impl ObjectStoreFactory for S3ObjectStoreFactory {
{
Ok((store, prefix))
} else {
let s3_options = S3StorageOptions::from_map(&options.0)?;
let s3_options = S3StorageOptions::from_map(&storage_options.0)?;

let store = S3StorageBackend::try_new(
store,
Expand Down Expand Up @@ -140,7 +142,6 @@ impl S3StorageOptions {
.filter(|(k, _)| !s3_constants::S3_OPTS.contains(&k.as_str()))
.map(|(k, v)| (k.to_owned(), v.to_owned()))
.collect();

// Copy web identity values provided in options but not the environment into the environment
// to get picked up by the `from_k8s_env` call in `get_web_identity_provider`.
Self::ensure_env_var(options, s3_constants::AWS_REGION);
Expand Down Expand Up @@ -175,41 +176,47 @@ impl S3StorageOptions {
.unwrap_or(true);
let imds_timeout =
Self::u64_or_default(options, s3_constants::AWS_EC2_METADATA_TIMEOUT, 100);
let (loader, provider_config) =
if let Some(endpoint_url) = str_option(options, s3_constants::AWS_ENDPOINT_URL) {
let (region_provider, provider_config) = Self::create_provider_config(
str_option(options, s3_constants::AWS_REGION)
.or_else(|| std::env::var("AWS_DEFAULT_REGION").ok())
.map_or(Region::from_static("custom"), Region::new),
)?;
let loader = aws_config::from_env()
.endpoint_url(endpoint_url)
.region(region_provider);
(loader, provider_config)
} else {
let (region_provider, provider_config) = Self::create_provider_config(
crate::credentials::new_region_provider(disable_imds, imds_timeout),
)?;
(
aws_config::from_env().region(region_provider),
provider_config,
)
};

let region_provider = crate::credentials::new_region_provider(disable_imds, imds_timeout);
let region = execute_sdk_future(region_provider.region())?;
let provider_config = ProviderConfig::default().with_region(region);
let credentials_provider = crate::credentials::ConfiguredCredentialChain::new(
disable_imds,
imds_timeout,
&provider_config,
);
#[cfg(feature = "native-tls")]
let sdk_config = execute_sdk_future(
aws_config::from_env()
loader
.http_client(native::use_native_tls_client(
str_option(options, s3_constants::AWS_ALLOW_HTTP)
.map(|val| str_is_truthy(&val))
.unwrap_or(false),
))
.credentials_provider(credentials_provider)
.region(region_provider)
.load(),
)?;
#[cfg(feature = "rustls")]
let sdk_config = execute_sdk_future(
aws_config::from_env()
.credentials_provider(credentials_provider)
.region(region_provider)
.load(),
)?;

let sdk_config =
if let Some(endpoint_url) = str_option(options, s3_constants::AWS_ENDPOINT_URL) {
sdk_config.to_builder().endpoint_url(endpoint_url).build()
} else {
sdk_config
};
execute_sdk_future(loader.credentials_provider(credentials_provider).load())?;

Ok(Self {
virtual_hosted_style_request,
locking_provider: str_option(options, s3_constants::AWS_S3_LOCKING_PROVIDER),
Expand All @@ -230,6 +237,16 @@ impl S3StorageOptions {
self.sdk_config.region()
}

fn create_provider_config<T: ProvideRegion>(
region_provider: T,
) -> DeltaResult<(T, ProviderConfig)> {
let region = execute_sdk_future(region_provider.region())?;
Ok((
region_provider,
ProviderConfig::default().with_region(region),
))
}

fn u64_or_default(map: &HashMap<String, String>, key: &str, default: u64) -> u64 {
str_option(map, key)
.and_then(|v| v.parse().ok())
Expand Down Expand Up @@ -494,8 +511,15 @@ pub mod s3_constants {
}

pub(crate) fn str_option(map: &HashMap<String, String>, key: &str) -> Option<String> {
map.get(key)
.map_or_else(|| std::env::var(key).ok(), |v| Some(v.to_owned()))
if let Some(s) = map.get(key) {
return Some(s.to_owned());
}

if let Some(s) = map.get(&key.to_ascii_lowercase()) {
return Some(s.to_owned());
}

std::env::var(key).ok()
}

#[cfg(test)]
Expand Down
Loading