feat: Add support for gcs:// conda registries (#2263)

Co-authored-by: Tim de Jager <[email protected]>
prefix-dev · Oct 16, 2024 · 7dbb260 · 7dbb260
1 parent 6917132
commit 7dbb260
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -93,7 +93,9 @@ rattler_cache = { version = "0.2.6", default-features = false }
 rattler_conda_types = { version = "0.28.2", default-features = false }
 rattler_digest = { version = "1.0.1", default-features = false }
 rattler_lock = { version = "0.22.27", default-features = false }
-rattler_networking = { version = "0.21.4", default-features = false }
+rattler_networking = { version = "0.21.4", default-features = false, features = [
+  "google-cloud-auth",
+] }
 rattler_repodata_gateway = { version = "0.21.17", default-features = false }
 rattler_shell = { version = "0.22.4", default-features = false }
 rattler_solve = { version = "1.1.0", default-features = false }

diff --git a/crates/pixi_utils/src/reqwest.rs b/crates/pixi_utils/src/reqwest.rs
@@ -5,7 +5,8 @@ use rattler_networking::{
     authentication_storage::{self, backends::file::FileStorageError},
     mirror_middleware::Mirror,
     retry_policies::ExponentialBackoff,
-    AuthenticationMiddleware, AuthenticationStorage, MirrorMiddleware, OciMiddleware,
+    AuthenticationMiddleware, AuthenticationStorage, GCSMiddleware, MirrorMiddleware,
+    OciMiddleware,
 };
 
 use reqwest::Client;
@@ -106,6 +107,8 @@ pub fn build_reqwest_clients(config: Option<&Config>) -> (Client, ClientWithMidd
             .with(oci_middleware());
     }
 
+    client_builder = client_builder.with(GCSMiddleware);
+
     client_builder = client_builder.with_arc(Arc::new(
         auth_middleware(&config).expect("could not create auth middleware"),
     ));