leave the old maghemite

Author: ahl

Cargo.lock

@@ -426,10 +426,8 @@ macaddr = { version = "1.0.1", features = ["serde_std"] }
 maplit = "1.0.2"
 mockall = "0.13"
 newtype_derive = "0.1.6"
-# mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42" }
-# ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42" }
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", branch = "hyper-v1" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", branch = "hyper-v1" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42" }
 multimap = "0.10.0"
 nexus-auth = { path = "nexus/auth" }
 nexus-client = { path = "clients/nexus-client" }
@@ -536,6 +534,7 @@ ref-cast = "1.0"
 regex = "1.10.6"
 regress = "0.9.1"
 reqwest = { version = "0.12", default-features = false }
+reqwest11 = { package = "reqwest", version = "0.11", default-features = false }
 ring = "0.17.8"
 rpassword = "7.3.1"
 rstest = "0.22.0"

Cargo.toml

@@ -11,6 +11,7 @@ workspace = true
 either.workspace = true
 progenitor-client.workspace = true
 reqwest = { workspace = true, features = ["json", "stream", "rustls-tls"] }
+reqwest11 = { workspace = true, features = ["json", "stream", "rustls-tls"] }
 serde.workspace = true
 slog.workspace = true
 thiserror.workspace = true

clients/ddm-admin-client/Cargo.toml

@@ -38,7 +38,7 @@ const DDMD_PORT: u16 = 8000;
 #[derive(Debug, Error)]
 pub enum DdmError {
     #[error("Failed to construct an HTTP client: {0}")]
-    HttpClient(#[from] reqwest::Error),
+    HttpClient(#[from] reqwest11::Error),
 
     #[error("Failed making HTTP request to ddmd: {0}")]
     DdmdApi(#[from] Error<types::Error>),
@@ -64,7 +64,7 @@ impl Client {
         let log =
             log.new(slog::o!("DdmAdminClient" => SocketAddr::V6(ddmd_addr)));
 
-        let inner = reqwest::ClientBuilder::new()
+        let inner = reqwest11::ClientBuilder::new()
             .connect_timeout(dur)
             .timeout(dur)
             .build()?;