[meta] upgrade progenitor to 0.13, reqwest to 0.13; use progenitor-extras (#9917)

Part of #9824.

We need to retain compatibility with progenitor 0.10 for the time being
while other repos are updated. Once the upgrades are done and
everything's synced up, I'll do a cleanup pass before closing #9824.

Author: sunshowers

Cargo.lock

@@ -408,6 +408,7 @@ attest-mock = { git = "https://github.com/oxidecomputer/dice-util", rev = "10952
 atomicwrites = "0.4.4"
 authz-macros = { path = "nexus/authz-macros" }
 backoff = { version = "0.4.0", features = [ "tokio" ] }
+backon = { version = "1.6", default-features = false }
 base64 = "0.22.1"
 bcs = "0.1.6"
 bincode = "1.3.3"
@@ -688,8 +689,10 @@ pretty_assertions = "1.4.1"
 pretty-hex = "0.4.1"
 prettyplease = { version = "0.2.36", features = ["verbatim"] }
 proc-macro2 = "1.0"
-progenitor = "0.10.0"
-progenitor-client = "0.10.0"
+progenitor = "0.13.0"
+progenitor-client = "0.13.0"
+progenitor-extras = "0.1.0"
+progenitor-client010 = { package = "progenitor-client", version = "0.10.0" }
 # NOTE: if you change the pinned revision of the `bhyve_api` and propolis
 # dependencies, you must also update the references in package-manifest.toml to
 # match the new revision.
@@ -721,7 +724,8 @@ regex = "1.11.1"
 regress = "0.10.4"
 repo-depot-api = { path = "sled-agent/repo-depot-api" }
 repo-depot-client = { path = "clients/repo-depot-client" }
-reqwest = { version = "0.12.22", default-features = false }
+reqwest = { version = "0.13", default-features = false }
+reqwest012 = { package = "reqwest", version = "0.12", default-features = false }
 ring = "0.17.14"
 rpassword = "7.4.0"
 rstest = "0.25.0"

Cargo.toml

@@ -11,7 +11,7 @@ workspace = true
 omicron-common.workspace = true
 progenitor.workspace = true
 regress.workspace = true
-reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
+reqwest = { workspace = true, features = [ "json", "rustls", "stream" ] }
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true

clients/bootstrap-agent-client/Cargo.toml

@@ -8,7 +8,7 @@ chrono.workspace = true
 clickhouse-admin-types.workspace = true
 omicron-uuid-kinds.workspace = true
 progenitor.workspace = true
-reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
+reqwest = { workspace = true, features = [ "json", "rustls", "stream" ] }
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true

clients/clickhouse-admin-keeper-client/Cargo.toml

@@ -8,7 +8,7 @@ chrono.workspace = true
 clickhouse-admin-types.workspace = true
 omicron-uuid-kinds.workspace = true
 progenitor.workspace = true
-reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
+reqwest = { workspace = true, features = [ "json", "rustls", "stream" ] }
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true

clients/clickhouse-admin-server-client/Cargo.toml

@@ -8,7 +8,7 @@ chrono.workspace = true
 clickhouse-admin-types.workspace = true
 omicron-uuid-kinds.workspace = true
 progenitor.workspace = true
-reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
+reqwest = { workspace = true, features = [ "json", "rustls", "stream" ] }
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true

clients/clickhouse-admin-single-client/Cargo.toml

@@ -11,7 +11,7 @@ workspace = true
 chrono.workspace = true
 omicron-uuid-kinds.workspace = true
 progenitor.workspace = true
-reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
+reqwest = { workspace = true, features = [ "json", "rustls", "stream" ] }
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true

clients/cockroach-admin-client/Cargo.toml

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

clients/ddm-admin-client/Cargo.toml

@@ -31,7 +31,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] reqwest012::Error),
 
     #[error("Failed making HTTP request to ddmd: {0}")]
     DdmdApi(#[from] Error<types::Error>),
@@ -57,7 +57,9 @@ impl Client {
         let log =
             log.new(slog::o!("DdmAdminClient" => SocketAddr::V6(ddmd_addr)));
 
-        let inner = reqwest::ClientBuilder::new()
+        // Use reqwest012 because the rev-pinned maghemite ddm-admin-client
+        // is still on reqwest 0.12.
+        let inner = reqwest012::ClientBuilder::new()
             .connect_timeout(dur)
             .timeout(dur)
             .build()?;

clients/ddm-admin-client/src/lib.rs

@@ -13,7 +13,7 @@ expectorate.workspace = true
 http.workspace = true
 internal-dns-types-versions.workspace = true
 progenitor.workspace = true
-reqwest = { workspace = true, features = ["json", "rustls-tls", "stream"] }
+reqwest = { workspace = true, features = ["json", "rustls", "stream"] }
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true