From 64ecb211e6343d5c948f62b200cb90cea89126c4 Mon Sep 17 00:00:00 2001 From: Alexandra Li Date: Fri, 21 Mar 2025 13:41:45 -0700 Subject: [PATCH 1/3] pull google_storage_token from env variables --- rust/lance-io/src/object_store.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rust/lance-io/src/object_store.rs b/rust/lance-io/src/object_store.rs index 6600371f7ae..b7db7c621a6 100644 --- a/rust/lance-io/src/object_store.rs +++ b/rust/lance-io/src/object_store.rs @@ -750,16 +750,24 @@ impl StorageOptions { pub fn with_env_gcs(&mut self) { for (os_key, os_value) in std::env::vars_os() { if let (Some(key), Some(value)) = (os_key.to_str(), os_value.to_str()) { - if let Ok(config_key) = GoogleConfigKey::from_str(&key.to_ascii_lowercase()) { + let lowercase_key = key.to_ascii_lowercase(); + + if let Ok(config_key) = GoogleConfigKey::from_str(&lowercase_key) { if !self.0.contains_key(config_key.as_ref()) { self.0 .insert(config_key.as_ref().to_string(), value.to_string()); } } + // Special case for GOOGLE_STORAGE_TOKEN + else if lowercase_key == "google_storage_token" { + if !self.0.contains_key("google_storage_token") { + self.0.insert("google_storage_token".to_string(), value.to_string()); + } + } } } } - + /// Add values from the environment to storage options pub fn with_env_s3(&mut self) { for (os_key, os_value) in std::env::vars_os() { From ee67562a38acd050aa62b85af9d56f1a931e68b7 Mon Sep 17 00:00:00 2001 From: Alexandra Li Date: Fri, 21 Mar 2025 14:48:42 -0700 Subject: [PATCH 2/3] a --- rust/lance-io/src/object_store.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rust/lance-io/src/object_store.rs b/rust/lance-io/src/object_store.rs index b7db7c621a6..28055dbc7d4 100644 --- a/rust/lance-io/src/object_store.rs +++ b/rust/lance-io/src/object_store.rs @@ -751,6 +751,7 @@ impl StorageOptions { for (os_key, os_value) in std::env::vars_os() { if let (Some(key), Some(value)) = (os_key.to_str(), os_value.to_str()) { let lowercase_key = key.to_ascii_lowercase(); + let token_key = "google_storage_token"; if let Ok(config_key) = GoogleConfigKey::from_str(&lowercase_key) { if !self.0.contains_key(config_key.as_ref()) { @@ -758,10 +759,10 @@ impl StorageOptions { .insert(config_key.as_ref().to_string(), value.to_string()); } } - // Special case for GOOGLE_STORAGE_TOKEN - else if lowercase_key == "google_storage_token" { - if !self.0.contains_key("google_storage_token") { - self.0.insert("google_storage_token".to_string(), value.to_string()); + // Check for GOOGLE_STORAGE_TOKEN until GoogleConfigKey supports storage token + else if lowercase_key == token_key { + if !self.0.contains_key(token_key) { + self.0.insert(token_key.to_string(), value.to_string()); } } } From 2c212bd57874bf18bd9af075a53cb78daef78d94 Mon Sep 17 00:00:00 2001 From: Alexandra Li Date: Tue, 25 Mar 2025 14:41:01 -0700 Subject: [PATCH 3/3] format --- rust/lance-io/src/object_store.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rust/lance-io/src/object_store.rs b/rust/lance-io/src/object_store.rs index 28055dbc7d4..1ad95eeeff9 100644 --- a/rust/lance-io/src/object_store.rs +++ b/rust/lance-io/src/object_store.rs @@ -760,15 +760,13 @@ impl StorageOptions { } } // Check for GOOGLE_STORAGE_TOKEN until GoogleConfigKey supports storage token - else if lowercase_key == token_key { - if !self.0.contains_key(token_key) { - self.0.insert(token_key.to_string(), value.to_string()); - } + else if lowercase_key == token_key && !self.0.contains_key(token_key) { + self.0.insert(token_key.to_string(), value.to_string()); } } } } - + /// Add values from the environment to storage options pub fn with_env_s3(&mut self) { for (os_key, os_value) in std::env::vars_os() {