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

fix: Fix allow_invalid_certificates being ignored in storage_options #20744

Merged
merged 1 commit into from
Jan 16, 2025
+21 −17
Merged

fix: Fix allow_invalid_certificates being ignored in storage_options #20744

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
38 changes: 21 additions & 17 deletions crates/polars-io/src/cloud/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ fn get_retry_config(max_retries: usize) -> RetryConfig {

#[cfg(any(feature = "aws", feature = "gcp", feature = "azure", feature = "http"))]
pub(super) fn get_client_options() -> ClientOptions {
ClientOptions::default()
ClientOptions::new()
// We set request timeout super high as the timeout isn't reset at ACK,
// but starts from the moment we start downloading a body.
// https://docs.rs/reqwest/latest/reqwest/struct.ClientBuilder.html#method.timeout
Expand Down Expand Up @@ -299,15 +299,9 @@ impl CloudOptions {
pub async fn build_aws(&self, url: &str) -> PolarsResult<impl object_store::ObjectStore> {
use super::credential_provider::IntoCredentialProvider;

let mut builder = AmazonS3Builder::from_env().with_url(url);
if let Some(options) = &self.config {
let CloudConfig::Aws(options) = options else {
panic!("impl error: cloud type mismatch")
};
for (key, value) in options.iter() {
builder = builder.with_config(*key, value);
}
}
let mut builder = AmazonS3Builder::from_env()
.with_client_options(get_client_options())
.with_url(url);

read_config(
&mut builder,
Expand All @@ -316,6 +310,7 @@ impl CloudOptions {
&[("region\\s*=\\s*(.*)\n", AmazonS3ConfigKey::Region)],
)],
);

read_config(
&mut builder,
&[(
Expand All @@ -333,6 +328,15 @@ impl CloudOptions {
)],
);

if let Some(options) = &self.config {
let CloudConfig::Aws(options) = options else {
panic!("impl error: cloud type mismatch")
};
for (key, value) in options.iter() {
builder = builder.with_config(*key, value);
}
}

if builder
.get_config_value(&AmazonS3ConfigKey::DefaultRegion)
.is_none()
Expand Down Expand Up @@ -382,9 +386,7 @@ impl CloudOptions {
};
};

let builder = builder
.with_client_options(get_client_options())
.with_retry(get_retry_config(self.max_retries));
let builder = builder.with_retry(get_retry_config(self.max_retries));

let builder = if let Some(v) = self.credential_provider.clone() {
builder.with_credentials(v.into_aws_provider())
Expand Down Expand Up @@ -416,7 +418,8 @@ impl CloudOptions {

// The credential provider `self.credentials` is prioritized if it is set. We also need
// `from_env()` as it may source environment configured storage account name.
let mut builder = MicrosoftAzureBuilder::from_env();
let mut builder =
MicrosoftAzureBuilder::from_env().with_client_options(get_client_options());

if let Some(options) = &self.config {
let CloudConfig::Azure(options) = options else {
Expand All @@ -428,7 +431,6 @@ impl CloudOptions {
}

let builder = builder
.with_client_options(get_client_options())
.with_url(url)
.with_retry(get_retry_config(self.max_retries));

Expand Down Expand Up @@ -464,11 +466,14 @@ impl CloudOptions {
pub fn build_gcp(&self, url: &str) -> PolarsResult<impl object_store::ObjectStore> {
use super::credential_provider::IntoCredentialProvider;

let mut builder = if self.credential_provider.is_none() {
let builder = if self.credential_provider.is_none() {
GoogleCloudStorageBuilder::from_env()
} else {
GoogleCloudStorageBuilder::new()
};

let mut builder = builder.with_client_options(get_client_options());

if let Some(options) = &self.config {
let CloudConfig::Gcp(options) = options else {
panic!("impl error: cloud type mismatch")
Expand All @@ -479,7 +484,6 @@ impl CloudOptions {
}

let builder = builder
.with_client_options(get_client_options())
.with_url(url)
.with_retry(get_retry_config(self.max_retries));

Expand Down
Loading