From bd30715b8ae5d835ed3fdac41659e74422141bba Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 31 Aug 2024 09:55:22 -0700
Subject: [PATCH 01/29] progress

---
 Cargo.lock                      | 1057 ++++++++++++++++++++++---------
 Cargo.toml                      |   33 +-
 clients/oxide-client/src/lib.rs |    5 +-
 gateway/src/serial_console.rs   |    6 +-
 installinator-api/src/lib.rs    |    4 +-
 internal-dns/src/resolver.rs    |    3 +-
 6 files changed, 785 insertions(+), 323 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8699e62d6..63b49d091f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -166,7 +166,7 @@ dependencies = [
  "omicron-workspace-hack",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -274,7 +274,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -296,7 +296,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -307,7 +307,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -360,7 +360,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_tokenstream",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -516,9 +516,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.74",
+ "syn 2.0.75",
  "which",
 ]
 
@@ -551,7 +551,7 @@ checksum = "1657dce144574f921af10a92876a96f0ca05dd830900598d21d91c8e4cf78f74"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -703,7 +703,7 @@ dependencies = [
 name = "bootstrap-agent-api"
 version = "0.1.0"
 dependencies = [
- "dropshot",
+ "dropshot 0.11.1-dev",
  "nexus-client",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -721,10 +721,10 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet",
- "progenitor",
- "regress",
- "reqwest",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -973,7 +973,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
  "libc",
  "omicron-rpaths",
@@ -1104,7 +1104,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1117,7 +1117,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 name = "clickhouse-admin-api"
 version = "0.1.0"
 dependencies = [
- "dropshot",
+ "dropshot 0.11.1-dev",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1160,7 +1160,7 @@ name = "cockroach-admin-api"
 version = "0.1.0"
 dependencies = [
  "cockroach-admin-types",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1175,8 +1175,8 @@ dependencies = [
  "chrono",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "slog",
@@ -1294,6 +1294,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
+ "percent-encoding",
  "time",
  "version_check",
 ]
@@ -1315,6 +1316,23 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "cookie_store"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
+dependencies = [
+ "cookie 0.18.1",
+ "idna 0.5.0",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1387,7 +1405,7 @@ name = "crdb-seed"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "slog",
@@ -1524,8 +1542,8 @@ dependencies = [
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "reqwest 0.11.27",
  "schemars",
  "serde",
  "serde_json",
@@ -1539,7 +1557,7 @@ dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot",
+ "dropshot 0.10.2-dev",
  "nix 0.28.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -1570,8 +1588,8 @@ dependencies = [
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "reqwest 0.11.27",
  "schemars",
  "serde",
  "serde_json",
@@ -1690,7 +1708,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1714,7 +1732,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1725,7 +1743,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1780,18 +1798,18 @@ dependencies = [
  "quote",
  "serde",
  "serde_tokenstream",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "ddm-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?rev=9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42#9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42"
+source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#8aa17aee6946bc5f371e656964b5c2be7855cecd"
 dependencies = [
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet?rev=7dacd265f1bcd0f8b47bd4805250c4f0812da206)",
  "percent-encoding",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "slog",
@@ -1824,7 +1842,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1857,7 +1875,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1878,7 +1896,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1899,7 +1917,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1909,7 +1927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1922,7 +1940,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.0",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1987,7 +2005,7 @@ dependencies = [
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1996,7 +2014,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
 dependencies = [
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2104,13 +2122,13 @@ dependencies = [
  "clap",
  "dns-server-api",
  "dns-service-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "hickory-client",
  "hickory-proto",
  "hickory-resolver",
  "hickory-server",
- "http 0.2.12",
+ "http 1.1.0",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "openapi-lint",
@@ -2137,7 +2155,7 @@ name = "dns-server-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "omicron-workspace-hack",
  "schemars",
  "serde",
@@ -2150,10 +2168,10 @@ dependencies = [
  "anyhow",
  "chrono",
  "expectorate",
- "http 0.2.12",
+ "http 1.1.0",
  "omicron-workspace-hack",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "slog",
@@ -2192,15 +2210,15 @@ dependencies = [
  "anyhow",
  "chrono",
  "futures",
- "http 0.2.12",
+ "http 1.1.0",
  "omicron-workspace-hack",
  "omicron-zone-package",
- "progenitor",
- "progenitor-client",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
  "quote",
  "rand",
- "regress",
- "reqwest",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "rustfmt-wrapper",
  "schemars",
  "serde",
@@ -2222,7 +2240,7 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint",
+ "dropshot_endpoint 0.10.2-dev",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2256,6 +2274,54 @@ dependencies = [
  "waitgroup",
 ]
 
+[[package]]
+name = "dropshot"
+version = "0.11.1-dev"
+source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#9075a2a56f0e6cd8797ecc3a0842922718f0560b"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "base64 0.22.1",
+ "bytes",
+ "camino",
+ "chrono",
+ "debug-ignore",
+ "dropshot_endpoint 0.11.1-dev",
+ "form_urlencoded",
+ "futures",
+ "hostname 0.4.0",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "indexmap 2.4.0",
+ "multer",
+ "openapiv3",
+ "paste",
+ "percent-encoding",
+ "rustls 0.22.4",
+ "rustls-pemfile 2.1.3",
+ "schemars",
+ "scopeguard",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sha1",
+ "slog",
+ "slog-async",
+ "slog-bunyan",
+ "slog-json",
+ "slog-term",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "toml 0.8.19",
+ "usdt",
+ "uuid",
+ "version_check",
+ "waitgroup",
+]
+
 [[package]]
 name = "dropshot_endpoint"
 version = "0.10.2-dev"
@@ -2266,7 +2332,20 @@ dependencies = [
  "quote",
  "serde",
  "serde_tokenstream",
- "syn 2.0.74",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "dropshot_endpoint"
+version = "0.11.1-dev"
+source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#9075a2a56f0e6cd8797ecc3a0842922718f0560b"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_tokenstream",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2280,7 +2359,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2409,9 +2488,9 @@ dependencies = [
  "colored",
  "dhcproto",
  "hickory-resolver",
- "http 0.2.12",
+ "http 1.1.0",
  "humantime",
- "hyper 0.14.30",
+ "hyper 1.4.1",
  "internet-checksum",
  "ispf",
  "macaddr",
@@ -2420,7 +2499,7 @@ dependencies = [
  "omicron-workspace-hack",
  "oxide-client",
  "rand",
- "reqwest",
+ "reqwest 0.12.7",
  "russh",
  "russh-keys",
  "serde",
@@ -2459,7 +2538,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2711,7 +2790,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2823,7 +2902,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2875,7 +2954,7 @@ dependencies = [
 name = "gateway-api"
 version = "0.1.0"
 dependencies = [
- "dropshot",
+ "dropshot 0.11.1-dev",
  "gateway-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -2896,7 +2975,7 @@ dependencies = [
  "gateway-messages",
  "omicron-common",
  "omicron-workspace-hack",
- "reqwest",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "slog",
@@ -2904,7 +2983,7 @@ dependencies = [
  "slog-term",
  "termios",
  "tokio",
- "tokio-tungstenite 0.20.1",
+ "tokio-tungstenite 0.23.1",
  "uuid",
 ]
 
@@ -2916,9 +2995,9 @@ dependencies = [
  "chrono",
  "gateway-messages",
  "omicron-workspace-hack",
- "progenitor",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
  "rand",
- "reqwest",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -2979,7 +3058,7 @@ name = "gateway-test-utils"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "gateway-messages",
  "gateway-types",
  "omicron-gateway",
@@ -3170,6 +3249,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "indexmap 2.4.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "2.4.1"
@@ -3234,14 +3332,14 @@ dependencies = [
 
 [[package]]
 name = "headers"
-version = "0.3.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
 dependencies = [
  "base64 0.21.7",
  "bytes",
  "headers-core",
- "http 0.2.12",
+ "http 1.1.0",
  "httpdate",
  "mime",
  "sha1",
@@ -3249,11 +3347,11 @@ dependencies = [
 
 [[package]]
 name = "headers-core"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http 0.2.12",
+ "http 1.1.0",
 ]
 
 [[package]]
@@ -3512,6 +3610,19 @@ dependencies = [
  "http 1.1.0",
 ]
 
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-range"
 version = "0.1.5"
@@ -3609,14 +3720,14 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -3625,16 +3736,18 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
+ "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "smallvec 1.13.2",
@@ -3664,7 +3777,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "log",
  "rustls 0.22.4",
@@ -3675,17 +3788,35 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.4.1",
+ "hyper-util",
+ "rustls 0.23.10",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tower-service",
+ "webpki-roots 0.26.3",
+]
+
 [[package]]
 name = "hyper-staticfile"
-version = "0.9.5"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318ca89e4827e7fe4ddd2824f52337239796ae8ecc761a663324407dc3d8d7e7"
+checksum = "bc4bce64c32578957926e75f832032f81ebb30bcee74f86c5848b13a69e547eb"
 dependencies = [
  "futures-util",
- "http 0.2.12",
+ "http 1.1.0",
  "http-range",
  "httpdate",
- "hyper 0.14.30",
+ "hyper 1.4.1",
  "mime_guess",
  "percent-encoding",
  "rand",
@@ -3707,18 +3838,34 @@ dependencies = [
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
@@ -3835,8 +3982,8 @@ dependencies = [
  "opte-ioctl",
  "oxide-vpc",
  "oxlog",
- "oxnet",
- "regress",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "regress 0.9.1",
  "schemars",
  "serde",
  "serde_json",
@@ -3926,7 +4073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
 dependencies = [
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3945,7 +4092,7 @@ dependencies = [
  "futures",
  "hex",
  "hex-literal",
- "http 0.2.12",
+ "http 1.1.0",
  "illumos-utils",
  "installinator-client",
  "installinator-common",
@@ -3958,7 +4105,7 @@ dependencies = [
  "omicron-workspace-hack",
  "partial-io",
  "proptest",
- "reqwest",
+ "reqwest 0.12.7",
  "sha2",
  "sled-hardware",
  "sled-hardware-types",
@@ -3982,8 +4129,8 @@ name = "installinator-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot",
- "hyper 0.14.30",
+ "dropshot 0.11.1-dev",
+ "hyper 1.4.1",
  "installinator-common",
  "omicron-common",
  "omicron-workspace-hack",
@@ -4000,9 +4147,9 @@ dependencies = [
  "installinator-common",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor",
- "regress",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -4050,17 +4197,17 @@ dependencies = [
  "chrono",
  "dns-server",
  "dns-service-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "hickory-resolver",
- "hyper 0.14.30",
+ "hyper 1.4.1",
  "omicron-common",
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "sled",
@@ -4077,7 +4224,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "hickory-resolver",
  "internal-dns",
  "omicron-common",
@@ -4249,7 +4396,7 @@ version = "0.1.0"
 source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d"
 dependencies = [
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -4351,7 +4498,7 @@ dependencies = [
  "propolis-server-config",
  "rand",
  "regex",
- "reqwest",
+ "reqwest 0.11.27",
  "ron 0.7.1",
  "serde",
  "slog",
@@ -4387,7 +4534,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -4547,9 +4694,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lpc55_areas"
@@ -4697,13 +4844,13 @@ dependencies = [
 [[package]]
 name = "mg-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?rev=9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42#9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42"
+source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#8aa17aee6946bc5f371e656964b5c2be7855cecd"
 dependencies = [
  "anyhow",
  "chrono",
  "percent-encoding",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -4804,7 +4951,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -4911,11 +5058,11 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "cookie 0.18.1",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
  "headers",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "newtype_derive",
  "nexus-db-fixed-data",
  "nexus-db-model",
@@ -4951,10 +5098,10 @@ dependencies = [
  "omicron-passwords",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet",
- "progenitor",
- "regress",
- "reqwest",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -4968,7 +5115,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "libc",
  "omicron-common",
@@ -5024,7 +5171,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "parse-display",
  "pq-sys",
  "rand",
@@ -5059,7 +5206,7 @@ dependencies = [
  "db-macros",
  "diesel",
  "diesel-dtrace",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "gateway-client",
@@ -5089,7 +5236,7 @@ dependencies = [
  "openapiv3",
  "oso",
  "oximeter",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "paste",
  "pem",
  "petgraph",
@@ -5129,7 +5276,7 @@ dependencies = [
  "omicron-common",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "rand",
  "serde_json",
 ]
@@ -5138,7 +5285,7 @@ dependencies = [
 name = "nexus-internal-api"
 version = "0.1.0"
 dependencies = [
- "dropshot",
+ "dropshot 0.11.1-dev",
  "nexus-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -5167,7 +5314,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "regex",
- "reqwest",
+ "reqwest 0.12.7",
  "serde_json",
  "sled-agent-client",
  "slog",
@@ -5185,7 +5332,7 @@ dependencies = [
  "omicron-workspace-hack",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5224,8 +5371,8 @@ dependencies = [
  "nexus-db-queries",
  "omicron-common",
  "omicron-workspace-hack",
- "oxnet",
- "reqwest",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "reqwest 0.12.7",
  "sled-agent-client",
  "slog",
  "uuid",
@@ -5262,9 +5409,9 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "pq-sys",
- "reqwest",
+ "reqwest 0.12.7",
  "sled-agent-client",
  "slog",
  "slog-error-chain",
@@ -5293,7 +5440,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "proptest",
  "rand",
  "sled-agent-client",
@@ -5393,14 +5540,14 @@ dependencies = [
  "crucible-agent-client",
  "dns-server",
  "dns-service-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
  "gateway-messages",
  "gateway-test-utils",
  "headers",
  "hickory-resolver",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "illumos-utils",
  "internal-dns",
  "nexus-config",
@@ -5417,7 +5564,7 @@ dependencies = [
  "oximeter",
  "oximeter-collector",
  "oximeter-producer",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -5434,7 +5581,7 @@ version = "0.1.0"
 dependencies = [
  "omicron-workspace-hack",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5451,10 +5598,10 @@ dependencies = [
  "derive-where",
  "derive_more",
  "dns-service-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
  "gateway-client",
- "http 0.2.12",
+ "http 1.1.0",
  "humantime",
  "ipnetwork",
  "newtype-uuid",
@@ -5465,7 +5612,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "openssl",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "oxql-types",
  "parse-display",
  "proptest",
@@ -5611,7 +5758,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5776,9 +5923,9 @@ dependencies = [
  "chrono",
  "clap",
  "clickhouse-admin-api",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
- "http 0.2.12",
+ "http 1.1.0",
  "illumos-utils",
  "nexus-test-utils",
  "omicron-common",
@@ -5813,9 +5960,9 @@ dependencies = [
  "cockroach-admin-api",
  "cockroach-admin-types",
  "csv",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
- "http 0.2.12",
+ "http 1.1.0",
  "illumos-utils",
  "nexus-test-utils",
  "omicron-common",
@@ -5855,11 +6002,11 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "hex",
- "http 0.2.12",
+ "http 1.1.0",
  "ipnetwork",
  "libc",
  "macaddr",
@@ -5867,14 +6014,14 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "parse-display",
- "progenitor",
- "progenitor-client",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
  "proptest",
  "rand",
- "regress",
- "reqwest",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "schemars",
  "semver 1.0.23",
  "serde",
@@ -5902,10 +6049,10 @@ dependencies = [
  "omicron-common",
  "omicron-workspace-hack",
  "omicron-zone-package",
- "progenitor",
- "progenitor-client",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
  "quote",
- "reqwest",
+ "reqwest 0.12.7",
  "rustfmt-wrapper",
  "serde",
  "serde_json",
@@ -5923,7 +6070,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "libc",
@@ -5962,7 +6109,7 @@ dependencies = [
  "base64 0.22.1",
  "camino",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "gateway-api",
@@ -5971,8 +6118,8 @@ dependencies = [
  "gateway-test-utils",
  "gateway-types",
  "hex",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "illumos-utils",
  "ipcc",
  "omicron-common",
@@ -5992,7 +6139,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tokio-tungstenite 0.20.1",
+ "tokio-tungstenite 0.23.1",
  "toml 0.8.19",
  "uuid",
 ]
@@ -6023,7 +6170,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "fatfs",
  "futures",
@@ -6033,10 +6180,10 @@ dependencies = [
  "headers",
  "hex",
  "hickory-resolver",
- "http 0.2.12",
+ "http 1.1.0",
  "httptest",
  "hubtools",
- "hyper 0.14.30",
+ "hyper 1.4.1",
  "hyper-rustls 0.26.0",
  "illumos-utils",
  "internal-dns",
@@ -6082,7 +6229,7 @@ dependencies = [
  "oximeter-db",
  "oximeter-instruments",
  "oximeter-producer",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "oxql-types",
  "parse-display",
  "paste",
@@ -6090,13 +6237,13 @@ dependencies = [
  "petgraph",
  "pq-sys",
  "pretty_assertions",
- "progenitor-client",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rand",
  "rcgen",
  "ref-cast",
  "regex",
- "reqwest",
+ "reqwest 0.12.7",
  "ring 0.17.8",
  "rustls 0.22.4",
  "rustls-pemfile 2.1.3",
@@ -6146,7 +6293,7 @@ dependencies = [
  "crucible-agent-client",
  "csv",
  "diesel",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "dyn-clone",
  "expectorate",
  "futures",
@@ -6211,7 +6358,7 @@ dependencies = [
  "omicron-zone-package",
  "petgraph",
  "rayon",
- "reqwest",
+ "reqwest 0.12.7",
  "ring 0.17.8",
  "semver 1.0.23",
  "serde",
@@ -6263,7 +6410,7 @@ dependencies = [
  "omicron-workspace-hack",
  "omicron-zone-package",
  "once_cell",
- "reqwest",
+ "reqwest 0.12.7",
  "semver 1.0.23",
  "serde",
  "sha2",
@@ -6308,7 +6455,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "flate2",
  "flume",
@@ -6317,8 +6464,8 @@ dependencies = [
  "glob",
  "guppy",
  "hex",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "hyper-staticfile",
  "illumos-utils",
  "installinator-common",
@@ -6343,13 +6490,13 @@ dependencies = [
  "oximeter",
  "oximeter-instruments",
  "oximeter-producer",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "pretty_assertions",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "propolis-mock-server",
  "rand",
  "rcgen",
- "reqwest",
+ "reqwest 0.12.7",
  "schemars",
  "semver 1.0.23",
  "serde",
@@ -6393,13 +6540,13 @@ dependencies = [
  "atomicwrites",
  "camino",
  "camino-tempfile",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "filetime",
  "gethostname",
  "headers",
  "hex",
- "http 0.2.12",
+ "http 1.1.0",
  "libc",
  "libfalcon",
  "nexus-config",
@@ -6408,7 +6555,7 @@ dependencies = [
  "pem",
  "rcgen",
  "regex",
- "reqwest",
+ "reqwest 0.12.7",
  "ring 0.17.8",
  "rustls 0.22.4",
  "slog",
@@ -6514,7 +6661,7 @@ dependencies = [
  "regex",
  "regex-automata 0.4.6",
  "regex-syntax 0.8.4",
- "reqwest",
+ "reqwest 0.11.27",
  "ring 0.17.8",
  "rsa",
  "rustix",
@@ -6534,7 +6681,7 @@ dependencies = [
  "string_cache",
  "subtle",
  "syn 1.0.109",
- "syn 2.0.74",
+ "syn 2.0.75",
  "time",
  "time-macros",
  "tokio",
@@ -6573,7 +6720,7 @@ dependencies = [
  "futures",
  "futures-util",
  "hex",
- "reqwest",
+ "reqwest 0.11.27",
  "ring 0.16.20",
  "semver 1.0.23",
  "serde",
@@ -6630,7 +6777,7 @@ dependencies = [
  "clickhouse-admin-api",
  "cockroach-admin-api",
  "dns-server-api",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "fs-err",
  "gateway-api",
  "indent_write",
@@ -6692,7 +6839,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6802,13 +6949,13 @@ dependencies = [
  "chrono",
  "futures",
  "hickory-resolver",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "omicron-workspace-hack",
- "progenitor",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
  "rand",
- "regress",
- "reqwest",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "thiserror",
@@ -6844,7 +6991,7 @@ dependencies = [
  "oximeter-timeseries-macro",
  "oximeter-types",
  "prettyplease",
- "syn 2.0.74",
+ "syn 2.0.75",
  "toml 0.8.19",
  "uuid",
 ]
@@ -6854,7 +7001,7 @@ name = "oximeter-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -6870,8 +7017,8 @@ dependencies = [
  "futures",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "serde",
  "slog",
  "uuid",
@@ -6885,10 +7032,10 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
- "hyper 0.14.30",
+ "hyper 1.4.1",
  "internal-dns",
  "nexus-client",
  "nexus-types",
@@ -6902,7 +7049,7 @@ dependencies = [
  "oximeter-client",
  "oximeter-db",
  "rand",
- "reqwest",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -6933,7 +7080,7 @@ dependencies = [
  "clap",
  "clickward",
  "crossterm 0.28.1",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "highway",
@@ -6949,7 +7096,7 @@ dependencies = [
  "peg",
  "reedline",
  "regex",
- "reqwest",
+ "reqwest 0.12.7",
  "rustyline",
  "schemars",
  "serde",
@@ -6975,10 +7122,10 @@ version = "0.1.0"
 dependencies = [
  "cfg-if",
  "chrono",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "kstat-rs",
  "libc",
  "omicron-workspace-hack",
@@ -7001,7 +7148,7 @@ dependencies = [
  "omicron-workspace-hack",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7011,7 +7158,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "internal-dns",
  "nexus-client",
  "omicron-common",
@@ -7045,7 +7192,7 @@ dependencies = [
  "schemars",
  "serde",
  "slog-error-chain",
- "syn 2.0.74",
+ "syn 2.0.75",
  "toml 0.8.19",
 ]
 
@@ -7069,7 +7216,7 @@ dependencies = [
  "oximeter-types",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7114,7 +7261,18 @@ dependencies = [
 [[package]]
 name = "oxnet"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/oxnet#2612d2203effcfdcbf83778a77f1bfd03fe6ed24"
+source = "git+https://github.com/oxidecomputer/oxnet?rev=7dacd265f1bcd0f8b47bd4805250c4f0812da206#7dacd265f1bcd0f8b47bd4805250c4f0812da206"
+dependencies = [
+ "ipnetwork",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "oxnet"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/oxnet#7dacd265f1bcd0f8b47bd4805250c4f0812da206"
 dependencies = [
  "ipnetwork",
  "schemars",
@@ -7277,7 +7435,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.4",
  "structmeta 0.3.0",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7446,7 +7604,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7516,7 +7674,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7797,7 +7955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7861,15 +8019,39 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "progenitor"
+version = "0.7.0"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#f56fc4a2bf72655e7b8523af55524b10045c2758"
+dependencies = [
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-macro 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+]
+
 [[package]]
 name = "progenitor"
 version = "0.7.0"
 source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
 dependencies = [
- "progenitor-client",
- "progenitor-impl",
- "progenitor-macro",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-macro 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "serde_json",
+]
+
+[[package]]
+name = "progenitor-client"
+version = "0.7.0"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#f56fc4a2bf72655e7b8523af55524b10045c2758"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "percent-encoding",
+ "reqwest 0.12.7",
+ "serde",
  "serde_json",
+ "serde_urlencoded",
 ]
 
 [[package]]
@@ -7880,12 +8062,33 @@ dependencies = [
  "bytes",
  "futures-core",
  "percent-encoding",
- "reqwest",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "serde_urlencoded",
 ]
 
+[[package]]
+name = "progenitor-impl"
+version = "0.7.0"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#f56fc4a2bf72655e7b8523af55524b10045c2758"
+dependencies = [
+ "heck 0.5.0",
+ "http 0.2.12",
+ "indexmap 2.4.0",
+ "openapiv3",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "schemars",
+ "serde",
+ "serde_json",
+ "syn 2.0.75",
+ "thiserror",
+ "typify",
+ "unicode-ident",
+]
+
 [[package]]
 name = "progenitor-impl"
 version = "0.7.0"
@@ -7902,12 +8105,29 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "syn 2.0.74",
+ "syn 2.0.75",
  "thiserror",
  "typify",
  "unicode-ident",
 ]
 
+[[package]]
+name = "progenitor-macro"
+version = "0.7.0"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#f56fc4a2bf72655e7b8523af55524b10045c2758"
+dependencies = [
+ "openapiv3",
+ "proc-macro2",
+ "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "quote",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_tokenstream",
+ "serde_yaml",
+ "syn 2.0.75",
+]
+
 [[package]]
 name = "progenitor-macro"
 version = "0.7.0"
@@ -7915,14 +8135,14 @@ source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed
 dependencies = [
  "openapiv3",
  "proc-macro2",
- "progenitor-impl",
+ "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "quote",
  "schemars",
  "serde",
  "serde_json",
  "serde_tokenstream",
  "serde_yaml",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7958,14 +8178,14 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9#24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#575e66a59f066e157e75fe6a1113728a3aa1cd03"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "rand",
- "reqwest",
+ "reqwest 0.11.27",
  "schemars",
  "serde",
  "serde_json",
@@ -7984,9 +8204,9 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "rand",
- "reqwest",
+ "reqwest 0.11.27",
  "schemars",
  "serde",
  "serde_json",
@@ -8000,19 +8220,19 @@ dependencies = [
 [[package]]
 name = "propolis-mock-server"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9#24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#575e66a59f066e157e75fe6a1113728a3aa1cd03"
 dependencies = [
  "anyhow",
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
- "hyper 0.14.30",
- "progenitor",
- "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9)",
+ "hyper 1.4.1",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rand",
- "reqwest",
+ "reqwest 0.11.27",
  "schemars",
  "serde",
  "serde_json",
@@ -8042,7 +8262,7 @@ dependencies = [
 [[package]]
 name = "propolis_types"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9#24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#575e66a59f066e157e75fe6a1113728a3aa1cd03"
 dependencies = [
  "schemars",
  "serde",
@@ -8109,6 +8329,54 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "quinn"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.10",
+ "socket2 0.5.7",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+dependencies = [
+ "bytes",
+ "rand",
+ "ring 0.17.8",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.10",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+dependencies = [
+ "libc",
+ "once_cell",
+ "socket2 0.5.7",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.36"
@@ -8266,7 +8534,7 @@ dependencies = [
  "camino-tempfile",
  "clap",
  "dns-service-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "humantime",
  "indexmap 2.4.0",
@@ -8373,7 +8641,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -8427,6 +8695,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "regress"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16fe0a24af5daaae947294213d2fd2646fbf5e1fbacc1d4ba3e84b2393854842"
+dependencies = [
+ "hashbrown 0.14.5",
+ "memchr",
+]
+
 [[package]]
 name = "relative-path"
 version = "1.9.3"
@@ -8442,16 +8720,16 @@ dependencies = [
  "base64 0.21.7",
  "bytes",
  "cookie 0.17.0",
- "cookie_store",
+ "cookie_store 0.20.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.30",
  "hyper-rustls 0.24.2",
- "hyper-tls",
+ "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
  "log",
@@ -8465,8 +8743,8 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
+ "sync_wrapper 0.1.2",
+ "system-configuration 0.5.1",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.24.1",
@@ -8477,10 +8755,62 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots",
+ "webpki-roots 0.25.4",
  "winreg",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.12.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "cookie 0.18.1",
+ "cookie_store 0.21.0",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.6",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-rustls 0.27.2",
+ "hyper-tls 0.6.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.10",
+ "rustls-pemfile 2.1.3",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.1",
+ "system-configuration 0.6.0",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls 0.26.0",
+ "tokio-util",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots 0.26.3",
+ "windows-registry",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.7.0"
@@ -8628,7 +8958,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version 0.4.0",
- "syn 2.0.74",
+ "syn 2.0.75",
  "unicode-ident",
 ]
 
@@ -8782,6 +9112,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_version"
 version = "0.1.7"
@@ -8852,6 +9188,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+dependencies = [
+ "once_cell",
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.7.0"
@@ -9062,7 +9412,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9088,7 +9438,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9219,7 +9569,7 @@ checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9230,7 +9580,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9281,7 +9631,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9302,7 +9652,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9344,7 +9694,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9522,7 +9872,7 @@ name = "sled-agent-api"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -9545,10 +9895,10 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet",
- "progenitor",
- "regress",
- "reqwest",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -9571,8 +9921,8 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9)",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rcgen",
  "schemars",
  "serde",
@@ -9735,7 +10085,7 @@ source = "git+https://github.com/oxidecomputer/slog-error-chain?branch=main#15f6
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9862,7 +10212,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -9892,7 +10242,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
  "gateway-messages",
  "gateway-types",
@@ -9960,7 +10310,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10097,7 +10447,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive 0.2.0",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10109,7 +10459,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive 0.3.0",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10120,7 +10470,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10131,7 +10481,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10166,7 +10516,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10179,7 +10529,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10226,9 +10576,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.74"
+version = "2.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
+checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10241,6 +10591,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -10249,7 +10608,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
 ]
 
 [[package]]
@@ -10262,6 +10632,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tabled"
 version = "0.15.0"
@@ -10402,7 +10782,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta 0.2.0",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10433,7 +10813,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10570,7 +10950,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10641,7 +11021,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -10701,6 +11081,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.10",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.15"
@@ -10736,6 +11127,18 @@ dependencies = [
  "tungstenite 0.21.0",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.23.0",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -10857,7 +11260,7 @@ dependencies = [
  "olpc-cjson",
  "pem",
  "percent-encoding",
- "reqwest",
+ "reqwest 0.11.27",
  "ring 0.17.8",
  "serde",
  "serde_json",
@@ -10885,7 +11288,6 @@ dependencies = [
  "tokio",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -10920,7 +11322,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -11087,6 +11489,24 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "tungstenite"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "rand",
+ "sha1",
+ "thiserror",
+ "utf-8",
+]
+
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -11125,7 +11545,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "typify"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/typify#ad1296f6ceb998ae8c247d999b7828703a232bdd"
+source = "git+https://github.com/oxidecomputer/typify#ebdee8c4a68dbe9351c58614330724e8ced1fda8"
 dependencies = [
  "typify-impl",
  "typify-macro",
@@ -11134,18 +11554,18 @@ dependencies = [
 [[package]]
 name = "typify-impl"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/typify#ad1296f6ceb998ae8c247d999b7828703a232bdd"
+source = "git+https://github.com/oxidecomputer/typify#ebdee8c4a68dbe9351c58614330724e8ced1fda8"
 dependencies = [
  "heck 0.5.0",
  "log",
  "proc-macro2",
  "quote",
- "regress",
+ "regress 0.10.0",
  "schemars",
  "semver 1.0.23",
  "serde",
  "serde_json",
- "syn 2.0.74",
+ "syn 2.0.75",
  "thiserror",
  "unicode-ident",
 ]
@@ -11153,7 +11573,7 @@ dependencies = [
 [[package]]
 name = "typify-macro"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/typify#ad1296f6ceb998ae8c247d999b7828703a232bdd"
+source = "git+https://github.com/oxidecomputer/typify#ebdee8c4a68dbe9351c58614330724e8ced1fda8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11162,7 +11582,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.74",
+ "syn 2.0.75",
  "typify-impl",
 ]
 
@@ -11288,7 +11708,7 @@ dependencies = [
  "clap",
  "debug-ignore",
  "display-error-chain",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "futures",
  "hex",
  "hubtools",
@@ -11379,7 +11799,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_tokenstream",
- "syn 2.0.74",
+ "syn 2.0.75",
  "usdt-impl",
 ]
 
@@ -11397,7 +11817,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn 2.0.74",
+ "syn 2.0.75",
  "thiserror",
  "thread-id",
  "version_check",
@@ -11413,7 +11833,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_tokenstream",
- "syn 2.0.74",
+ "syn 2.0.75",
  "usdt-impl",
 ]
 
@@ -11602,7 +12022,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
  "wasm-bindgen-shared",
 ]
 
@@ -11636,7 +12056,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -11676,6 +12096,15 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.4.2"
@@ -11724,7 +12153,7 @@ dependencies = [
  "owo-colors",
  "proptest",
  "ratatui",
- "reqwest",
+ "reqwest 0.12.7",
  "rpassword",
  "serde",
  "serde_json",
@@ -11755,13 +12184,13 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dpd-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "gateway-client",
  "maplit",
  "omicron-common",
  "omicron-workspace-hack",
  "owo-colors",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "schemars",
  "serde",
  "serde_json",
@@ -11811,7 +12240,7 @@ dependencies = [
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "either",
  "expectorate",
  "flate2",
@@ -11823,9 +12252,9 @@ dependencies = [
  "gateway-test-utils",
  "hex",
  "hickory-resolver",
- "http 0.2.12",
+ "http 1.1.0",
  "hubtools",
- "hyper 0.14.30",
+ "hyper 1.4.1",
  "illumos-utils",
  "installinator",
  "installinator-api",
@@ -11844,9 +12273,9 @@ dependencies = [
  "once_cell",
  "openapi-lint",
  "openapiv3",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "rand",
- "reqwest",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -11878,7 +12307,7 @@ name = "wicketd-api"
 version = "0.1.0"
 dependencies = [
  "bootstrap-agent-client",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "gateway-client",
  "omicron-common",
  "omicron-passwords",
@@ -11900,9 +12329,9 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor",
- "regress",
- "reqwest",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "regress 0.9.1",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -11969,6 +12398,36 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -12205,7 +12664,7 @@ dependencies = [
  "flate2",
  "futures",
  "omicron-workspace-hack",
- "reqwest",
+ "reqwest 0.12.7",
  "sha2",
  "slog",
  "slog-async",
@@ -12258,7 +12717,7 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -12269,7 +12728,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -12289,7 +12748,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -12334,12 +12793,12 @@ dependencies = [
  "anyhow",
  "camino",
  "clap",
- "dropshot",
+ "dropshot 0.11.1-dev",
  "illumos-utils",
  "omicron-common",
  "omicron-sled-agent",
  "omicron-workspace-hack",
- "oxnet",
+ "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
  "serde_json",
  "sled-hardware-types",
  "slog",
diff --git a/Cargo.toml b/Cargo.toml
index cfb097ef3c..cc96901e4b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -337,7 +337,8 @@ dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { path = "clients/dpd-client" }
-dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
+# dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
+dropshot = { git = "https://github.com/seanmonstar/dropshot", branch = "hyper-v1-2.4-own-body", features = ["usdt-probes"] }
 dyn-clone = "1.0.17"
 either = "1.13.0"
 expectorate = "1.1.0"
@@ -366,7 +367,7 @@ gateway-types = { path = "gateway-types" }
 gethostname = "0.5.0"
 glob = "0.3.1"
 guppy = "0.17.7"
-headers = "0.3.9"
+headers = "0.4.0"
 heck = "0.5"
 hex = "0.4.3"
 hex-literal = "0.4.1"
@@ -376,13 +377,13 @@ hickory-resolver = "0.24.1"
 hickory-server = "0.24.1"
 highway = "1.2.0"
 hkdf = "0.12.4"
-http = "0.2.12"
+http = "1.1.0"
 httptest = "0.15.5"
 hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" }
 humantime = "2.1.0"
-hyper = "0.14"
+hyper = "1.0"
 hyper-rustls = "0.26.0"
-hyper-staticfile = "0.9.5"
+hyper-staticfile = "0.10.0"
 illumos-utils = { path = "illumos-utils" }
 indent_write = "2.2.0"
 indexmap = "2.4.0"
@@ -408,8 +409,10 @@ 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", 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" }
 multimap = "0.10.0"
 nexus-auth = { path = "nexus/auth" }
 nexus-client = { path = "clients/nexus-client" }
@@ -491,11 +494,15 @@ pretty_assertions = "1.4.0"
 pretty-hex = "0.4.1"
 prettyplease = { version = "0.2.20", features = ["verbatim"] }
 proc-macro2 = "1.0"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
-progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
+# progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
+# progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "dependabot/cargo/reqwest-0.12.4" }
+progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "dependabot/cargo/reqwest-0.12.4" }
 bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+# propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+# propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
 proptest = "1.5.0"
 quote = "1.0"
 rand = "0.8.5"
@@ -509,7 +516,7 @@ reedline = "0.33.0"
 ref-cast = "1.0"
 regex = "1.10.6"
 regress = "0.9.1"
-reqwest = { version = "0.11", default-features = false }
+reqwest = { version = "0.12", default-features = false }
 ring = "0.17.8"
 rpassword = "7.3.1"
 rstest = "0.22.0"
@@ -583,7 +590,7 @@ tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
 tokio = "1.38.1"
 tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
 tokio-stream = "0.1.15"
-tokio-tungstenite = "0.20"
+tokio-tungstenite = "0.23.1"
 tokio-util = { version = "0.7.11", features = ["io", "io-util"] }
 toml = "0.8.19"
 toml_edit = "0.22.20"
diff --git a/clients/oxide-client/src/lib.rs b/clients/oxide-client/src/lib.rs
index 249ea18146..3e5247bbcb 100644
--- a/clients/oxide-client/src/lib.rs
+++ b/clients/oxide-client/src/lib.rs
@@ -70,10 +70,7 @@ impl CustomDnsResolver {
 }
 
 impl reqwest::dns::Resolve for CustomDnsResolver {
-    fn resolve(
-        &self,
-        name: hyper::client::connect::dns::Name,
-    ) -> reqwest::dns::Resolving {
+    fn resolve(&self, name: reqwest::dns::Name) -> reqwest::dns::Resolving {
         let resolver = self.resolver.clone();
         async move {
             let list = resolver.lookup_ip(name.as_str()).await?;
diff --git a/gateway/src/serial_console.rs b/gateway/src/serial_console.rs
index 49aa807e55..12ddbe7e9b 100644
--- a/gateway/src/serial_console.rs
+++ b/gateway/src/serial_console.rs
@@ -8,6 +8,7 @@ use crate::error::SpCommsError;
 use crate::SpIdentifier;
 use dropshot::WebsocketChannelResult;
 use dropshot::WebsocketConnection;
+use dropshot::WebsocketConnectionRaw;
 use futures::stream::SplitSink;
 use futures::stream::SplitStream;
 use futures::SinkExt;
@@ -15,7 +16,6 @@ use futures::StreamExt;
 use gateway_messages::SERIAL_CONSOLE_IDLE_TIMEOUT;
 use gateway_sp_comms::AttachedSerialConsole;
 use gateway_sp_comms::AttachedSerialConsoleSend;
-use hyper::upgrade::Upgraded;
 use slog::error;
 use slog::info;
 use slog::warn;
@@ -155,7 +155,7 @@ pub(crate) async fn run(
 }
 
 async fn ws_sink_task(
-    mut ws_sink: SplitSink<WebSocketStream<Upgraded>, Message>,
+    mut ws_sink: SplitSink<WebSocketStream<WebsocketConnectionRaw>, Message>,
     mut messages: mpsc::Receiver<Message>,
 ) -> Result<(), SerialTaskError> {
     while let Some(message) = messages.recv().await {
@@ -166,7 +166,7 @@ async fn ws_sink_task(
 
 async fn ws_recv_task(
     sp: SpIdentifier,
-    mut ws_stream: SplitStream<WebSocketStream<Upgraded>>,
+    mut ws_stream: SplitStream<WebSocketStream<WebsocketConnectionRaw>>,
     mut console_tx: DetachOnDrop,
     log: Logger,
 ) -> Result<(), SerialTaskError> {
diff --git a/installinator-api/src/lib.rs b/installinator-api/src/lib.rs
index b3b36cc2fe..b42165c31d 100644
--- a/installinator-api/src/lib.rs
+++ b/installinator-api/src/lib.rs
@@ -10,11 +10,11 @@
 
 use anyhow::{anyhow, Result};
 use dropshot::{
-    ConfigDropshot, FreeformBody, HandlerTaskMode, HttpError,
+    Body, ConfigDropshot, FreeformBody, HandlerTaskMode, HttpError,
     HttpResponseHeaders, HttpResponseOk, HttpResponseUpdatedNoContent,
     HttpServerStarter, Path, RequestContext, TypedBody,
 };
-use hyper::{header, Body, StatusCode};
+use hyper::{header, StatusCode};
 use installinator_common::EventReport;
 use omicron_common::update::ArtifactHashId;
 use schemars::JsonSchema;
diff --git a/internal-dns/src/resolver.rs b/internal-dns/src/resolver.rs
index 5d3832a417..a7c739c295 100644
--- a/internal-dns/src/resolver.rs
+++ b/internal-dns/src/resolver.rs
@@ -7,7 +7,6 @@ use hickory_resolver::config::{
 };
 use hickory_resolver::lookup::SrvLookup;
 use hickory_resolver::TokioAsyncResolver;
-use hyper::client::connect::dns::Name;
 use omicron_common::address::{
     Ipv6Subnet, ReservedRackSubnet, AZ_PREFIX, DNS_PORT,
 };
@@ -41,7 +40,7 @@ type BoxError = Box<dyn std::error::Error + Send + Sync>;
 // By implementing this trait, [Resolver] can be used as an argument to
 // [reqwest::ClientBuilder::dns_resolver].
 impl reqwest::dns::Resolve for Resolver {
-    fn resolve(&self, name: Name) -> reqwest::dns::Resolving {
+    fn resolve(&self, name: reqwest::dns::Name) -> reqwest::dns::Resolving {
         let this = self.clone();
         Box::pin(async move {
             this.lookup_sockets_v6_raw(name.as_str())

From 36626b493d62766f7d44f8f2a71288e0c4a2326a Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 13:27:04 -0700
Subject: [PATCH 02/29] progress

---
 Cargo.lock                            | 4 +++-
 end-to-end-tests/Cargo.toml           | 3 ++-
 end-to-end-tests/src/bin/bootstrap.rs | 9 ++++++---
 oximeter/collector/src/agent.rs       | 1 -
 sled-agent/Cargo.toml                 | 1 +
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b6149be8c..392f4f53b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2708,14 +2708,15 @@ dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.22.1",
+ "bytes",
  "chrono",
  "clap",
  "colored",
  "dhcproto",
+ "futures",
  "hickory-resolver",
  "http 1.1.0",
  "humantime",
- "hyper 1.4.1",
  "internet-checksum",
  "ispf",
  "macaddr",
@@ -9246,6 +9247,7 @@ dependencies = [
  "cookie 0.18.1",
  "cookie_store 0.21.0",
  "encoding_rs",
+ "futures-channel",
  "futures-core",
  "futures-util",
  "h2 0.4.6",
diff --git a/end-to-end-tests/Cargo.toml b/end-to-end-tests/Cargo.toml
index 044f70ef23..b5e63179da 100644
--- a/end-to-end-tests/Cargo.toml
+++ b/end-to-end-tests/Cargo.toml
@@ -11,9 +11,10 @@ workspace = true
 anyhow = { workspace = true, features = ["backtrace"] }
 async-trait.workspace = true
 base64.workspace = true
+bytes.workspace = true
 chrono.workspace = true
 http.workspace = true
-hyper.workspace = true
+futures.workspace = true
 omicron-sled-agent.workspace = true
 omicron-test-utils.workspace = true
 oxide-client.workspace = true
diff --git a/end-to-end-tests/src/bin/bootstrap.rs b/end-to-end-tests/src/bin/bootstrap.rs
index ceecb62c76..cc49eabfcc 100644
--- a/end-to-end-tests/src/bin/bootstrap.rs
+++ b/end-to-end-tests/src/bin/bootstrap.rs
@@ -151,9 +151,12 @@ async fn main() -> Result<()> {
 async fn deserialize_byte_stream<T: DeserializeOwned>(
     response: oxide_client::ResponseValue<oxide_client::ByteStream>,
 ) -> Result<T> {
-    let body = dropshot::Body::wrap_stream(response.into_inner_stream());
-    let bytes = dropshot::Body::to_bytes(body).await?;
-    Ok(serde_json::from_slice(&bytes)?)
+    use bytes::buf::Buf;
+    use futures::TryStreamExt;
+
+    let bytes =
+        response.into_inner_stream().try_collect::<bytes::BytesMut>().await?;
+    Ok(serde_json::from_reader(bytes.reader())?)
 }
 
 #[derive(Deserialize)]
diff --git a/oximeter/collector/src/agent.rs b/oximeter/collector/src/agent.rs
index fc1973dfff..60d5a7766b 100644
--- a/oximeter/collector/src/agent.rs
+++ b/oximeter/collector/src/agent.rs
@@ -865,7 +865,6 @@ mod tests {
     use std::net::SocketAddr;
     use std::net::SocketAddrV6;
     use std::time::Duration;
-    use tokio::net::TcpListener;
     use tokio::sync::oneshot;
     use tokio::time::Instant;
     use uuid::Uuid;
diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml
index e0559cb354..0ac6748d64 100644
--- a/sled-agent/Cargo.toml
+++ b/sled-agent/Cargo.toml
@@ -107,6 +107,7 @@ hyper.workspace = true
 omicron-test-utils.workspace = true
 pretty_assertions.workspace = true
 rcgen.workspace = true
+reqwest = { workspace = true, features = ["blocking"] }
 subprocess.workspace = true
 slog-async.workspace = true
 slog-term.workspace = true

From dd719a1dcdfbec33322a041c0b52c705cf962ca0 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 14:22:04 -0700
Subject: [PATCH 03/29] progress

---
 Cargo.lock                                     | 18 ++++++++++--------
 Cargo.toml                                     |  1 +
 nexus/Cargo.toml                               |  1 +
 .../auth/src/authn/external/session_cookie.rs  |  1 -
 nexus/src/external_api/console_api.rs          |  8 ++++++--
 nexus/test-utils/Cargo.toml                    |  1 +
 nexus/test-utils/src/http_testing.rs           | 14 +++++++++++---
 7 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 392f4f53b1..3a1b18136e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1772,14 +1772,14 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#1167ae67674dd8b7263fbf5c95e2081c4ed2475b"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#c6e6780c3af9ca7989c6966970fc31eaa33d3ab9"
 dependencies = [
  "anyhow",
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "reqwest 0.11.27",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -1788,7 +1788,7 @@ dependencies = [
 [[package]]
 name = "crucible-common"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#1167ae67674dd8b7263fbf5c95e2081c4ed2475b"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#c6e6780c3af9ca7989c6966970fc31eaa33d3ab9"
 dependencies = [
  "anyhow",
  "atty",
@@ -1818,14 +1818,14 @@ dependencies = [
 [[package]]
 name = "crucible-pantry-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#1167ae67674dd8b7263fbf5c95e2081c4ed2475b"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#c6e6780c3af9ca7989c6966970fc31eaa33d3ab9"
 dependencies = [
  "anyhow",
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "reqwest 0.11.27",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -1835,7 +1835,7 @@ dependencies = [
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#1167ae67674dd8b7263fbf5c95e2081c4ed2475b"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#c6e6780c3af9ca7989c6966970fc31eaa33d3ab9"
 dependencies = [
  "crucible-workspace-hack",
  "libc",
@@ -5927,6 +5927,7 @@ dependencies = [
  "headers",
  "hickory-resolver",
  "http 1.1.0",
+ "http-body-util",
  "hyper 1.4.1",
  "illumos-utils",
  "internal-dns",
@@ -6605,6 +6606,7 @@ dependencies = [
  "hex",
  "hickory-resolver",
  "http 1.1.0",
+ "http-body-util",
  "httptest",
  "hubtools",
  "hyper 1.4.1",
diff --git a/Cargo.toml b/Cargo.toml
index 6ad887bdc4..678243cbad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -388,6 +388,7 @@ hickory-server = "0.24.1"
 highway = "1.2.0"
 hkdf = "0.12.4"
 http = "1.1.0"
+http-body-util = "0.1.2"
 httpmock = "0.8.0-alpha.1"
 httptest = "0.15.5"
 hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" }
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
index cdad883ca7..1fc4d00abf 100644
--- a/nexus/Cargo.toml
+++ b/nexus/Cargo.toml
@@ -37,6 +37,7 @@ headers.workspace = true
 hex.workspace = true
 hickory-resolver.workspace = true
 http.workspace = true
+http-body-util.workspace = true
 hyper.workspace = true
 illumos-utils.workspace = true
 internal-dns.workspace = true
diff --git a/nexus/auth/src/authn/external/session_cookie.rs b/nexus/auth/src/authn/external/session_cookie.rs
index 1da774fdb3..3a407bc698 100644
--- a/nexus/auth/src/authn/external/session_cookie.rs
+++ b/nexus/auth/src/authn/external/session_cookie.rs
@@ -199,7 +199,6 @@ mod test {
     use async_trait::async_trait;
     use chrono::{DateTime, Duration, Utc};
     use http;
-    use hyper;
     use slog;
     use std::collections::HashMap;
     use std::sync::Mutex;
diff --git a/nexus/src/external_api/console_api.rs b/nexus/src/external_api/console_api.rs
index 2951157680..87ee15fc91 100644
--- a/nexus/src/external_api/console_api.rs
+++ b/nexus/src/external_api/console_api.rs
@@ -24,13 +24,14 @@
 use crate::context::ApiContext;
 use anyhow::Context;
 use camino::{Utf8Path, Utf8PathBuf};
+use dropshot::Body;
 use dropshot::{
     http_response_found, http_response_see_other, HttpError, HttpResponseFound,
     HttpResponseHeaders, HttpResponseSeeOther, HttpResponseUpdatedNoContent,
     Path, Query, RequestContext,
 };
+use futures::TryStreamExt;
 use http::{header, HeaderName, HeaderValue, Response, StatusCode};
-use dropshot::Body;
 use nexus_db_model::AuthenticationMode;
 use nexus_db_queries::authn::silos::IdentityProviderType;
 use nexus_db_queries::context::OpContext;
@@ -750,7 +751,10 @@ async fn serve_static(
     resp = resp.header(http::header::CONTENT_LENGTH, metadata.len());
 
     let stream = FramedRead::new(file, BytesCodec::new());
-    let body = Body::wrap_stream(stream);
+    let body = http_body_util::StreamBody::new(
+        stream.map_ok(|b| hyper::body::Frame::data(b.freeze())),
+    );
+    let body = Body::wrap(body);
     Ok(resp.body(body)?)
 }
 
diff --git a/nexus/test-utils/Cargo.toml b/nexus/test-utils/Cargo.toml
index ff89af7c6c..aa5a3096c4 100644
--- a/nexus/test-utils/Cargo.toml
+++ b/nexus/test-utils/Cargo.toml
@@ -22,6 +22,7 @@ gateway-messages.workspace = true
 gateway-test-utils.workspace = true
 headers.workspace = true
 http.workspace = true
+http-body-util.workspace = true
 hyper.workspace = true
 illumos-utils.workspace = true
 internal-dns.workspace = true
diff --git a/nexus/test-utils/src/http_testing.rs b/nexus/test-utils/src/http_testing.rs
index 325814fdc0..02fb87d74d 100644
--- a/nexus/test-utils/src/http_testing.rs
+++ b/nexus/test-utils/src/http_testing.rs
@@ -10,7 +10,9 @@ use anyhow::Context;
 use camino::Utf8Path;
 use dropshot::test_util::ClientTestContext;
 use dropshot::ResultsPage;
+use futures::TryStreamExt;
 use headers::authorization::Credentials;
+use http_body_util::BodyExt;
 use nexus_db_queries::authn::external::spoof;
 use nexus_db_queries::db::identity::Asset;
 use serde_urlencoded;
@@ -168,7 +170,10 @@ impl<'a> RequestBuilder<'a> {
                         let stream = tokio_util::io::ReaderStream::new(
                             tokio::fs::File::from_std(file),
                         );
-                        self.body = dropshot::Body::wrap_stream(stream);
+                        let body = http_body_util::StreamBody::new(
+                            stream.map_ok(|b| hyper::body::Frame::data(b)),
+                        );
+                        self.body = dropshot::Body::wrap(body);
                     }
                     Err(error) => self.error = Some(error),
                 }
@@ -421,9 +426,12 @@ impl<'a> RequestBuilder<'a> {
         // or malicious server could do damage by sending us an enormous
         // response here.  Since we only use this in a test suite, we ignore
         // that risk.
-        let response_body = dropshot::Body::to_bytes(response.body_mut())
+        let response_body = response
+            .body_mut()
+            .collect()
             .await
-            .context("reading response body")?;
+            .context("reading response body")?
+            .to_bytes();
 
         // For "204 No Content" responses, validate that we got no content in
         // the body.

From a609b3c4092ae71efa990e1b4215de5544e56e0b Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 14:22:19 -0700
Subject: [PATCH 04/29] hakari

---
 Cargo.lock                | 44 ++++----------------
 workspace-hack/Cargo.toml | 88 ++++++++++++++++++++++++++++-----------
 2 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a1b18136e..6be57b92cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1513,17 +1513,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "cookie"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
 [[package]]
 name = "cookie"
 version = "0.18.1"
@@ -1535,30 +1524,13 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "cookie_store"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6"
-dependencies = [
- "cookie 0.17.0",
- "idna 0.3.0",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
 [[package]]
 name = "cookie_store"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
 dependencies = [
- "cookie 0.18.1",
+ "cookie",
  "idna 0.5.0",
  "log",
  "publicsuffix",
@@ -5415,7 +5387,7 @@ dependencies = [
  "authz-macros",
  "base64 0.22.1",
  "chrono",
- "cookie 0.18.1",
+ "cookie",
  "dropshot 0.11.1-dev",
  "futures",
  "headers",
@@ -5976,7 +5948,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "clap",
- "cookie 0.18.1",
+ "cookie",
  "derive-where",
  "derive_more",
  "dns-service-client",
@@ -7036,6 +7008,7 @@ dependencies = [
  "clap_builder",
  "console",
  "const-oid",
+ "cookie",
  "crossbeam-epoch",
  "crossbeam-utils",
  "crypto-common",
@@ -7064,6 +7037,7 @@ dependencies = [
  "hmac",
  "hyper 0.14.30",
  "hyper 1.4.1",
+ "hyper-rustls 0.27.2",
  "hyper-util",
  "indexmap 2.5.0",
  "inout",
@@ -7096,9 +7070,11 @@ dependencies = [
  "regex-automata 0.4.6",
  "regex-syntax 0.8.4",
  "reqwest 0.11.27",
+ "reqwest 0.12.7",
  "ring 0.17.8",
  "rsa",
  "rustix",
+ "rustls 0.21.12",
  "schemars",
  "scopeguard",
  "semver 1.0.23",
@@ -9198,8 +9174,6 @@ checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
- "cookie 0.17.0",
- "cookie_store 0.20.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -9246,8 +9220,8 @@ checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64 0.22.1",
  "bytes",
- "cookie 0.18.1",
- "cookie_store 0.21.0",
+ "cookie",
+ "cookie_store",
  "encoding_rs",
  "futures-channel",
  "futures-core",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 4580173e48..156256ca03 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -19,7 +19,7 @@ workspace = true
 [dependencies]
 ahash = { version = "0.8.11" }
 aho-corasick = { version = "1.1.3" }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+anyhow = { version = "1.0.88", features = ["backtrace"] }
 base16ct = { version = "0.2.0", default-features = false, features = ["alloc"] }
 base64 = { version = "0.22.1" }
 base64ct = { version = "1.6.0", default-features = false, features = ["std"] }
@@ -61,17 +61,15 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
-hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["client", "http1", "http2", "server"] }
-hyper-util = { version = "0.1.3", features = ["client-legacy", "server-auto", "tokio"] }
-indexmap = { version = "2.4.0", features = ["serde"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["full"] }
+indexmap = { version = "2.5.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
 lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2.158", features = ["extra_traits"] }
-log = { version = "0.4.21", default-features = false, features = ["kv_unstable", "std"] }
+log = { version = "0.4.22", default-features = false, features = ["kv_unstable", "std"] }
 managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] }
 memchr = { version = "2.7.2" }
 nom = { version = "7.1.3" }
@@ -87,18 +85,19 @@ pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption"
 postgres-types = { version = "0.2.7", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 predicates = { version = "3.1.2" }
 proc-macro2 = { version = "1.0.86" }
-quote = { version = "1.0.36" }
+quote = { version = "1.0.37" }
 regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.6", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
 regex-syntax = { version = "0.8.4" }
-reqwest = { version = "0.11.27", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12.7", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", default-features = false, features = ["rustls-tls", "stream"] }
 ring = { version = "0.17.8", features = ["std"] }
 rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1.2.0" }
 semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
+serde = { version = "1.0.210", features = ["alloc", "derive", "rc"] }
+serde_json = { version = "1.0.128", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
@@ -107,9 +106,9 @@ smallvec = { version = "1.13.2", default-features = false, features = ["const_ne
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
-syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
+syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.77", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
-tokio = { version = "1.39.3", features = ["full", "test-util"] }
+tokio = { version = "1.40.0", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-stream = { version = "0.1.15", features = ["net", "sync"] }
 tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
@@ -128,7 +127,7 @@ zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
 [build-dependencies]
 ahash = { version = "0.8.11" }
 aho-corasick = { version = "1.1.3" }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+anyhow = { version = "1.0.88", features = ["backtrace"] }
 base16ct = { version = "0.2.0", default-features = false, features = ["alloc"] }
 base64 = { version = "0.22.1" }
 base64ct = { version = "1.6.0", default-features = false, features = ["std"] }
@@ -171,17 +170,15 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
-hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["client", "http1", "http2", "server"] }
-hyper-util = { version = "0.1.3", features = ["client-legacy", "server-auto", "tokio"] }
-indexmap = { version = "2.4.0", features = ["serde"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["full"] }
+indexmap = { version = "2.5.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
 lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2.158", features = ["extra_traits"] }
-log = { version = "0.4.21", default-features = false, features = ["kv_unstable", "std"] }
+log = { version = "0.4.22", default-features = false, features = ["kv_unstable", "std"] }
 managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] }
 memchr = { version = "2.7.2" }
 nom = { version = "7.1.3" }
@@ -197,18 +194,19 @@ pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption"
 postgres-types = { version = "0.2.7", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 predicates = { version = "3.1.2" }
 proc-macro2 = { version = "1.0.86" }
-quote = { version = "1.0.36" }
+quote = { version = "1.0.37" }
 regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.6", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
 regex-syntax = { version = "0.8.4" }
-reqwest = { version = "0.11.27", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12.7", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", default-features = false, features = ["rustls-tls", "stream"] }
 ring = { version = "0.17.8", features = ["std"] }
 rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1.2.0" }
 semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
+serde = { version = "1.0.210", features = ["alloc", "derive", "rc"] }
+serde_json = { version = "1.0.128", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
@@ -218,10 +216,10 @@ spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
 syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] }
-syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
+syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.77", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
 time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
-tokio = { version = "1.39.3", features = ["full", "test-util"] }
+tokio = { version = "1.40.0", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-stream = { version = "0.1.15", features = ["net", "sync"] }
 tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
@@ -239,58 +237,100 @@ zerocopy = { version = "0.7.34", features = ["derive", "simd"] }
 zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.x86_64-unknown-linux-gnu.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.x86_64-apple-darwin.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.x86_64-apple-darwin.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.aarch64-apple-darwin.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.aarch64-apple-darwin.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.x86_64-unknown-illumos.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
 
 [target.x86_64-unknown-illumos.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
 

From ccaae3ac4e6bad05ff2ebc578de06d5e5f1ac36e Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 14:28:12 -0700
Subject: [PATCH 05/29] rustfmt

---
 nexus/src/external_api/device_auth.rs      | 2 +-
 nexus/src/external_api/http_entrypoints.rs | 2 +-
 nexus/src/internal_api/http_entrypoints.rs | 2 +-
 sled-agent/src/fakes/nexus.rs              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nexus/src/external_api/device_auth.rs b/nexus/src/external_api/device_auth.rs
index c493630e0b..76556932ba 100644
--- a/nexus/src/external_api/device_auth.rs
+++ b/nexus/src/external_api/device_auth.rs
@@ -13,11 +13,11 @@ use super::console_api::console_index_or_login_redirect;
 use super::views::DeviceAccessTokenGrant;
 use crate::app::external_endpoints::authority_for_request;
 use crate::ApiContext;
+use dropshot::Body;
 use dropshot::{
     HttpError, HttpResponseUpdatedNoContent, RequestContext, TypedBody,
 };
 use http::{header, Response, StatusCode};
-use dropshot::Body;
 use nexus_db_queries::db::model::DeviceAccessToken;
 use nexus_types::external_api::params;
 use omicron_common::api::external::InternalContext;
diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
index 7e05c9d0ca..d7dcff80f6 100644
--- a/nexus/src/external_api/http_entrypoints.rs
+++ b/nexus/src/external_api/http_entrypoints.rs
@@ -14,6 +14,7 @@ use super::{
     },
 };
 use crate::{context::ApiContext, external_api::shared};
+use dropshot::Body;
 use dropshot::EmptyScanParams;
 use dropshot::HttpError;
 use dropshot::HttpResponseDeleted;
@@ -32,7 +33,6 @@ use dropshot::{HttpResponseAccepted, HttpResponseFound, HttpResponseSeeOther};
 use dropshot::{HttpResponseCreated, HttpResponseHeaders};
 use dropshot::{WebsocketChannelResult, WebsocketConnection};
 use http::Response;
-use dropshot::Body;
 use ipnetwork::IpNetwork;
 use nexus_db_queries::authz;
 use nexus_db_queries::db;
diff --git a/nexus/src/internal_api/http_entrypoints.rs b/nexus/src/internal_api/http_entrypoints.rs
index 04bb45eedf..9bfdc3ead2 100644
--- a/nexus/src/internal_api/http_entrypoints.rs
+++ b/nexus/src/internal_api/http_entrypoints.rs
@@ -7,6 +7,7 @@
 use super::params::{OximeterInfo, RackInitializationRequest};
 use crate::context::ApiContext;
 use dropshot::ApiDescription;
+use dropshot::Body;
 use dropshot::FreeformBody;
 use dropshot::HttpError;
 use dropshot::HttpResponseCreated;
@@ -18,7 +19,6 @@ use dropshot::Query;
 use dropshot::RequestContext;
 use dropshot::ResultsPage;
 use dropshot::TypedBody;
-use dropshot::Body;
 use nexus_internal_api::*;
 use nexus_types::deployment::Blueprint;
 use nexus_types::deployment::BlueprintMetadata;
diff --git a/sled-agent/src/fakes/nexus.rs b/sled-agent/src/fakes/nexus.rs
index 08109b5e63..9e63ad47a9 100644
--- a/sled-agent/src/fakes/nexus.rs
+++ b/sled-agent/src/fakes/nexus.rs
@@ -7,11 +7,11 @@
 //! This must be an exact subset of the Nexus internal interface
 //! to operate correctly.
 
+use dropshot::Body;
 use dropshot::{
     endpoint, ApiDescription, FreeformBody, HttpError, HttpResponseOk,
     HttpResponseUpdatedNoContent, Path, RequestContext, TypedBody,
 };
-use dropshot::Body;
 use internal_dns::ServiceName;
 use nexus_client::types::SledAgentInfo;
 use omicron_common::api::external::Error;

From f42fc325147166bcffc3d0f2e2568339eb286209 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 14:29:06 -0700
Subject: [PATCH 06/29] nit

---
 wicketd/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wicketd/Cargo.toml b/wicketd/Cargo.toml
index a767927184..adb0e43036 100644
--- a/wicketd/Cargo.toml
+++ b/wicketd/Cargo.toml
@@ -8,7 +8,6 @@ license = "MPL-2.0"
 workspace = true
 
 [dependencies]
-http-body-util = "0.1.2"
 anyhow.workspace = true
 async-trait.workspace = true
 base64.workspace = true
@@ -28,6 +27,7 @@ gateway-messages.workspace = true
 hex.workspace = true
 hickory-resolver.workspace = true
 http.workspace = true
+http-body-util.workspace = true
 hubtools.workspace = true
 hyper.workspace = true
 illumos-utils.workspace = true

From 355b03fc3e6eed19d73426ada13e5ff839bd6ce9 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 14:57:24 -0700
Subject: [PATCH 07/29] missed one

---
 nexus/src/app/external_dns.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nexus/src/app/external_dns.rs b/nexus/src/app/external_dns.rs
index 4732146ce2..7a8dacbb98 100644
--- a/nexus/src/app/external_dns.rs
+++ b/nexus/src/app/external_dns.rs
@@ -10,8 +10,8 @@ use hickory_resolver::config::Protocol;
 use hickory_resolver::config::ResolverConfig;
 use hickory_resolver::config::ResolverOpts;
 use hickory_resolver::TokioAsyncResolver;
-use hyper::client::connect::dns::Name;
 use omicron_common::address::DNS_PORT;
+use reqwest::dns::Name;
 
 /// Wrapper around hickory-resolver to provide name resolution
 /// using a given set of DNS servers for use with reqwest.

From b791d7f61053ab7b4fdcb27837e7c19895856b70 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 15:53:07 -0700
Subject: [PATCH 08/29] another client

---
 nexus/tests/integration_tests/authn_http.rs | 31 +++++++++++++--------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/nexus/tests/integration_tests/authn_http.rs b/nexus/tests/integration_tests/authn_http.rs
index c8eb089c16..73066220c4 100644
--- a/nexus/tests/integration_tests/authn_http.rs
+++ b/nexus/tests/integration_tests/authn_http.rs
@@ -9,9 +9,9 @@
 // such invalid requests.
 
 use async_trait::async_trait;
+use bytes::Bytes;
 use chrono::{DateTime, Duration, Utc};
 use dropshot::endpoint;
-use dropshot::test_util::read_json;
 use dropshot::test_util::LogContext;
 use dropshot::test_util::TestContext;
 use dropshot::ApiDescription;
@@ -229,6 +229,7 @@ async fn whoami_request(
     testctx: &TestContext<WhoamiServerState>,
 ) -> Result<WhoamiResponse, (http::StatusCode, HttpErrorResponseBody)> {
     let client_testctx = &testctx.client_testctx;
+
     let mut builder = hyper::Request::builder()
         .method(http::method::Method::GET)
         .uri(client_testctx.url("/whoami"));
@@ -243,21 +244,27 @@ async fn whoami_request(
     }
 
     let request = builder
-        .body(dropshot::Body::empty())
+        .body(Bytes::new())
         .expect("attempted to construct invalid request");
 
-    let mut response = hyper::Client::new()
-        .request(request)
+    let response = reqwest::Client::new()
+        .execute(request.try_into().expect("request conversion failed"))
         .await
         .expect("failed to make request");
-    if response.status() == http::StatusCode::OK {
-        let whoami: WhoamiResponse = read_json(&mut response).await;
-        info!(&testctx.log, "whoami response"; "whoami" => ?whoami);
-        Ok(whoami)
-    } else {
-        let error_body: HttpErrorResponseBody = read_json(&mut response).await;
-        info!(&testctx.log, "whoami error"; "error" => ?error_body);
-        Err((response.status(), error_body))
+
+    match response.status() {
+        reqwest::StatusCode::OK => {
+            let whoami = response.json().await.expect("deserialization failed");
+            info!(&testctx.log, "whoami response"; "whoami" => ?whoami);
+            Ok(whoami)
+        }
+
+        status => {
+            let error_body: HttpErrorResponseBody =
+                response.json().await.expect("deserialization failed");
+            info!(&testctx.log, "whoami error"; "error" => ?error_body);
+            Err((status, error_body))
+        }
     }
 }
 

From c86752b9a8d4fec9771117ffc2cc53d1c18cfc69 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 17:07:29 -0700
Subject: [PATCH 09/29] update bhyve_api

---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6be57b92cc..4557032413 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -654,9 +654,9 @@ dependencies = [
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9#24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
 dependencies = [
- "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9)",
+ "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "libc",
  "strum",
 ]
@@ -674,7 +674,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9#24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
 dependencies = [
  "libc",
  "strum",
@@ -4011,7 +4011,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -4249,7 +4249,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=24a74d0c76b6a63961ecef76acb1516b6e66c5c9)",
+ "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "byteorder",
  "camino",
  "camino-tempfile",
diff --git a/Cargo.toml b/Cargo.toml
index 678243cbad..2eb1c26f3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -515,9 +515,10 @@ proc-macro2 = "1.0"
 # progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "dependabot/cargo/reqwest-0.12.4" }
 progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "dependabot/cargo/reqwest-0.12.4" }
-bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+#bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
 # propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
 # propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
 propolis-client = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
 propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
 proptest = "1.5.0"

From d0f46933462459c09f36a3c590aa0d24cbbbf119 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 17:50:40 -0700
Subject: [PATCH 10/29] update libfalcon

---
 Cargo.lock                | 252 ++++++--------------------------------
 Cargo.toml                |   2 +-
 workspace-hack/Cargo.toml |   2 +
 3 files changed, 43 insertions(+), 213 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4557032413..59694d1aee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -223,12 +223,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
-[[package]]
-name = "ascii"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
-
 [[package]]
 name = "ascii-canvas"
 version = "3.0.0"
@@ -656,17 +650,7 @@ name = "bhyve_api"
 version = "0.0.0"
 source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
 dependencies = [
- "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
- "libc",
- "strum",
-]
-
-[[package]]
-name = "bhyve_api"
-version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af)",
+ "bhyve_api_sys",
  "libc",
  "strum",
 ]
@@ -680,15 +664,6 @@ dependencies = [
  "strum",
 ]
 
-[[package]]
-name = "bhyve_api_sys"
-version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "libc",
- "strum",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.69.4"
@@ -759,26 +734,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitstruct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b10c3912af09af44ea1dafe307edb5ed374b2a32658eb610e372270c9017b4"
-dependencies = [
- "bitstruct_derive",
-]
-
-[[package]]
-name = "bitstruct_derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35fd19022c2b750d14eb9724c204d08ab7544570105b3b466d8a9f2f3feded27"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -1569,9 +1524,8 @@ dependencies = [
 [[package]]
 name = "cpuid_profile_config"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
+source = "git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad#5267be82e10d851a64196a8148893691b0b9f8ad"
 dependencies = [
- "propolis",
  "serde",
  "serde_derive",
  "thiserror",
@@ -2285,15 +2239,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d305e5a3904ee14166439a70feef04853c1234226dbb27ede127b88dc5a4a9d"
 
-[[package]]
-name = "dladm"
-version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "libc",
- "strum",
-]
-
 [[package]]
 name = "dlpi"
 version = "0.2.0"
@@ -2739,19 +2684,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.2"
@@ -2769,15 +2701,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
-[[package]]
-name = "erased-serde"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "errno"
 version = "0.3.9"
@@ -4249,7 +4172,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
+ "bhyve_api",
  "byteorder",
  "camino",
  "camino-tempfile",
@@ -4781,7 +4704,7 @@ checksum = "b024e211b1b371da58cd69e4fb8fa4ed16915edcc0e2e1fb04ac4bad61959f25"
 [[package]]
 name = "libfalcon"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/falcon?rev=e69694a1f7cc9fe31fab27f321017280531fb5f7#e69694a1f7cc9fe31fab27f321017280531fb5f7"
+source = "git+https://github.com/oxidecomputer/falcon?branch=main#16fedf00d636d0b3e870c99043d2ce005976e8b7"
 dependencies = [
  "anstyle",
  "anyhow",
@@ -4789,10 +4712,10 @@ dependencies = [
  "clap",
  "colored",
  "futures",
+ "indicatif",
  "libc",
  "libnet 0.1.0 (git+https://github.com/oxidecomputer/netadm-sys?branch=main)",
- "portpicker",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad)",
  "propolis-server-config",
  "rand",
  "regex",
@@ -4810,6 +4733,7 @@ dependencies = [
  "tokio-tungstenite 0.21.0",
  "toml 0.7.8",
  "uuid",
+ "xz2",
  "zone 0.1.8",
 ]
 
@@ -4854,7 +4778,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 [[package]]
 name = "libnet"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/netadm-sys?branch=main#4ceaf96e02acb8258ea4aa403326c08932324835"
+source = "git+https://github.com/oxidecomputer/netadm-sys?branch=main#e07ad76458eb50601e0da4f9da16dbc942bfc2ba"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -4864,10 +4788,13 @@ dependencies = [
  "num_enum",
  "nvpair",
  "nvpair-sys",
+ "oxnet",
+ "rand",
  "rusty-doors",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "thiserror",
  "tracing",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -5038,7 +4965,7 @@ dependencies = [
  "const-oid",
  "crc-any",
  "der",
- "env_logger 0.10.2",
+ "env_logger",
  "hex",
  "log",
  "lpc55_areas",
@@ -5072,6 +4999,17 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "macaddr"
 version = "1.0.1"
@@ -7040,6 +6978,7 @@ dependencies = [
  "hyper-rustls 0.27.2",
  "hyper-util",
  "indexmap 2.5.0",
+ "indicatif",
  "inout",
  "itertools 0.10.5",
  "itertools 0.12.1",
@@ -8251,15 +8190,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 
-[[package]]
-name = "portpicker"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
-dependencies = [
- "rand",
-]
-
 [[package]]
 name = "postcard"
 version = "1.0.8"
@@ -8577,36 +8507,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "propolis"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "anyhow",
- "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af)",
- "bitflags 2.6.0",
- "bitstruct",
- "byteorder",
- "dladm",
- "erased-serde",
- "futures",
- "lazy_static",
- "libc",
- "pin-project-lite",
- "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af)",
- "rfb",
- "serde",
- "serde_arrays",
- "serde_json",
- "slog",
- "strum",
- "thiserror",
- "tokio",
- "usdt",
- "uuid",
- "viona_api",
-]
-
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
@@ -8631,7 +8531,7 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
+source = "git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad#5267be82e10d851a64196a8148893691b0b9f8ad"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -8645,7 +8545,7 @@ dependencies = [
  "slog",
  "thiserror",
  "tokio",
- "tokio-tungstenite 0.20.1",
+ "tokio-tungstenite 0.21.0",
  "uuid",
 ]
 
@@ -8662,7 +8562,7 @@ dependencies = [
  "futures",
  "hyper 1.4.1",
  "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
- "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
+ "propolis_types",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -8682,7 +8582,7 @@ dependencies = [
 [[package]]
 name = "propolis-server-config"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
+source = "git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad#5267be82e10d851a64196a8148893691b0b9f8ad"
 dependencies = [
  "cpuid_profile_config",
  "serde",
@@ -8700,15 +8600,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "propolis_types"
-version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "proptest"
 version = "1.5.0"
@@ -9275,21 +9166,6 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "rfb"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/rfb?rev=0cac8d9c25eb27acfa35df80f3b9d371de98ab3b#0cac8d9c25eb27acfa35df80f3b9d371de98ab3b"
-dependencies = [
- "ascii",
- "async-trait",
- "bitflags 1.3.2",
- "env_logger 0.9.3",
- "futures",
- "log",
- "thiserror",
- "tokio",
-]
-
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -9725,7 +9601,7 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 [[package]]
 name = "rusty-doors"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/rusty-doors#42ad0104095425eea76934b5d735b4c6a438ef66"
+source = "git+https://github.com/oxidecomputer/rusty-doors#0e3a1495dcf8b7b5e11a6921c2cf1cf957c5a5bf"
 dependencies = [
  "libc",
  "rusty-doors-macros",
@@ -9734,7 +9610,7 @@ dependencies = [
 [[package]]
 name = "rusty-doors-macros"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/rusty-doors#42ad0104095425eea76934b5d735b4c6a438ef66"
+source = "git+https://github.com/oxidecomputer/rusty-doors#0e3a1495dcf8b7b5e11a6921c2cf1cf957c5a5bf"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -10007,15 +9883,6 @@ dependencies = [
  "smallvec 0.6.14",
 ]
 
-[[package]]
-name = "serde_arrays"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38636132857f68ec3d5f3eb121166d2af33cb55174c4d5ff645db6165cbef0fd"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.210"
@@ -11576,18 +11443,6 @@ dependencies = [
  "tokio-util",
 ]
 
-[[package]]
-name = "tokio-tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.20.1",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.21.0"
@@ -11924,25 +11779,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 0.2.12",
- "httparse",
- "log",
- "rand",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.21.0"
@@ -12379,23 +12215,6 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "viona_api"
-version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "libc",
- "viona_api_sys",
-]
-
-[[package]]
-name = "viona_api_sys"
-version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "vsss-rs"
 version = "3.3.4"
@@ -13160,6 +12979,15 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
 [[package]]
 name = "yansi"
 version = "0.5.1"
diff --git a/Cargo.toml b/Cargo.toml
index 2eb1c26f3f..bb5dcb8993 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -417,7 +417,7 @@ key-manager = { path = "key-manager" }
 kstat-rs = "0.2.4"
 libc = "0.2.158"
 libipcc = { git = "https://github.com/oxidecomputer/libipcc", rev = "fdffa212373a8f92473ea5f411088912bf458d5f" }
-libfalcon = { git = "https://github.com/oxidecomputer/falcon", rev = "e69694a1f7cc9fe31fab27f321017280531fb5f7" }
+libfalcon = { git = "https://github.com/oxidecomputer/falcon", branch = "main" }
 libnvme = { git = "https://github.com/oxidecomputer/libnvme", rev = "dd5bb221d327a1bc9287961718c3c10d6bd37da0" }
 linear-map = "1.2.0"
 live-tests-macros = { path = "live-tests/macros" }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 156256ca03..2f0f189abb 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -312,6 +312,7 @@ dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
 hyper-util = { version = "0.1.7", features = ["full"] }
+indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
@@ -326,6 +327,7 @@ dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
 hyper-util = { version = "0.1.7", features = ["full"] }
+indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }

From ef24bb370d1aba6cbc827819d561f6f181b2b758 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Sat, 14 Sep 2024 21:19:31 -0700
Subject: [PATCH 11/29] fix some tests

---
 dev-tools/omdb/tests/env.out                  | 8 ++++----
 internal-dns/src/resolver.rs                  | 8 ++++----
 nexus/tests/integration_tests/certificates.rs | 4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dev-tools/omdb/tests/env.out b/dev-tools/omdb/tests/env.out
index c57a9c9dce..e9b95f3e74 100644
--- a/dev-tools/omdb/tests/env.out
+++ b/dev-tools/omdb/tests/env.out
@@ -183,8 +183,8 @@ note: using Nexus URL junk
 Error: listing background tasks
 
 Caused by:
-    0: Communication Error: builder error: relative URL without a base
-    1: builder error: relative URL without a base
+    0: Communication Error: builder error
+    1: builder error
     2: relative URL without a base
 =============================================
 EXECUTING COMMAND: omdb ["nexus", "background-tasks", "doc"]
@@ -549,8 +549,8 @@ note: using Oximeter URL junk
 Error: failed to fetch collector info
 
 Caused by:
-    0: Communication Error: builder error: relative URL without a base
-    1: builder error: relative URL without a base
+    0: Communication Error: builder error
+    1: builder error
     2: relative URL without a base
 =============================================
 EXECUTING COMMAND: omdb ["oxql", "--clickhouse-url", "junk"]
diff --git a/internal-dns/src/resolver.rs b/internal-dns/src/resolver.rs
index a7c739c295..d9039e3a37 100644
--- a/internal-dns/src/resolver.rs
+++ b/internal-dns/src/resolver.rs
@@ -833,8 +833,8 @@ mod test {
         // The DNS server is running, but has no records. Expect a failure.
         let err = client.test_endpoint().await.unwrap_err();
         assert!(
-            err.to_string().contains("no record found"),
-            "Unexpected Error (expected 'no record found'): {err}",
+            err.to_string().contains("error sending request"),
+            "Unexpected Error (expected 'error sending request'): {err}",
         );
 
         // Add a record for the new service.
@@ -913,8 +913,8 @@ mod test {
         // The DNS server is running, but has no records. Expect a failure.
         let err = client.test_endpoint().await.unwrap_err();
         assert!(
-            err.to_string().contains("no record found"),
-            "Unexpected Error (expected 'no record found'): {err}",
+            err.to_string().contains("error sending request"),
+            "Unexpected Error (expected 'error sending request'): {err}",
         );
 
         // Add a record for the new service, but only to the second DNS server.
diff --git a/nexus/tests/integration_tests/certificates.rs b/nexus/tests/integration_tests/certificates.rs
index ab9566d4ad..43fe32d390 100644
--- a/nexus/tests/integration_tests/certificates.rs
+++ b/nexus/tests/integration_tests/certificates.rs
@@ -602,7 +602,9 @@ async fn test_silo_certificates() {
         assert!(
             error.to_string().contains("invalid peer certificate")
                 || error.to_string().contains("self-signed certificate")
-                || error.to_string().contains("self signed certificate")
+                || error.to_string().contains("self signed certificate"),
+            "Unexpected error: {}",
+            error,
         );
     } else {
         panic!(

From 9f30be58f9501a301a38bae31c0d3d923a2ac1f8 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 12:47:12 -0700
Subject: [PATCH 12/29] update to hyper-util 0.1.9 for the retry fix

---
 Cargo.lock                | 28 +++-------------------------
 Cargo.toml                |  4 ++--
 workspace-hack/Cargo.toml | 16 ++++++++--------
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59694d1aee..2bc12fd9bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4063,9 +4063,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -4076,7 +4076,6 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -4766,7 +4765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -11603,27 +11602,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
 [[package]]
 name = "tower-service"
 version = "0.3.2"
diff --git a/Cargo.toml b/Cargo.toml
index bb5dcb8993..7ddbbffaba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -393,8 +393,8 @@ httpmock = "0.8.0-alpha.1"
 httptest = "0.15.5"
 hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" }
 humantime = "2.1.0"
-hyper = "1.0"
-hyper-util = "0.1"
+hyper = "1.4.1"
+hyper-util = "0.1.9"
 hyper-rustls = "0.26.0"
 hyper-staticfile = "0.10.0"
 illumos-utils = { path = "illumos-utils" }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 2f0f189abb..0555d25237 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -241,7 +241,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
@@ -254,7 +254,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
@@ -266,7 +266,7 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -277,7 +277,7 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -288,7 +288,7 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -299,7 +299,7 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -311,7 +311,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
@@ -326,7 +326,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.2", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }

From 0c77777c6fb62d85428319bfae5c99b65c962d2e Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 13:11:34 -0700
Subject: [PATCH 13/29] get more error output

---
 nexus/tests/integration_tests/certificates.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nexus/tests/integration_tests/certificates.rs b/nexus/tests/integration_tests/certificates.rs
index 43fe32d390..47a48156b9 100644
--- a/nexus/tests/integration_tests/certificates.rs
+++ b/nexus/tests/integration_tests/certificates.rs
@@ -28,6 +28,7 @@ use oxide_client::ClientSessionExt;
 use oxide_client::ClientSilosExt;
 use oxide_client::ClientSystemSilosExt;
 use oxide_client::CustomDnsResolver;
+use std::error::Error;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -603,8 +604,9 @@ async fn test_silo_certificates() {
             error.to_string().contains("invalid peer certificate")
                 || error.to_string().contains("self-signed certificate")
                 || error.to_string().contains("self signed certificate"),
-            "Unexpected error: {}",
+            "Unexpected error: {} {}",
             error,
+            error.source().map_or_else(String::new, |e| e.to_string()),
         );
     } else {
         panic!(

From bdd1ada31ac5559e7bac9abd336be433157c2963 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 13:57:19 -0700
Subject: [PATCH 14/29] more output

---
 nexus/tests/integration_tests/certificates.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nexus/tests/integration_tests/certificates.rs b/nexus/tests/integration_tests/certificates.rs
index 47a48156b9..65a2eed288 100644
--- a/nexus/tests/integration_tests/certificates.rs
+++ b/nexus/tests/integration_tests/certificates.rs
@@ -600,6 +600,11 @@ async fn test_silo_certificates() {
         );
     if let oxide_client::Error::CommunicationError(error) = error {
         assert!(error.is_connect());
+        let mut xxx = &error as &dyn Error;
+        while let Some(e) = xxx.source() {
+            eprintln!("source: {}", e);
+            xxx = e;
+        }
         assert!(
             error.to_string().contains("invalid peer certificate")
                 || error.to_string().contains("self-signed certificate")

From 5d93b8fa23a7f2daecbbc3b5f420d3c9125aa575 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 15:07:53 -0700
Subject: [PATCH 15/29] error chain

---
 nexus/tests/integration_tests/certificates.rs | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/nexus/tests/integration_tests/certificates.rs b/nexus/tests/integration_tests/certificates.rs
index 65a2eed288..882e6c7b17 100644
--- a/nexus/tests/integration_tests/certificates.rs
+++ b/nexus/tests/integration_tests/certificates.rs
@@ -4,6 +4,7 @@
 
 //! Integration tests for operating on certificates
 
+use display_error_chain::ErrorChainExt;
 use dropshot::test_util::ClientTestContext;
 use dropshot::HttpErrorResponseBody;
 use futures::TryStreamExt;
@@ -28,7 +29,6 @@ use oxide_client::ClientSessionExt;
 use oxide_client::ClientSilosExt;
 use oxide_client::ClientSystemSilosExt;
 use oxide_client::CustomDnsResolver;
-use std::error::Error;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -600,19 +600,7 @@ async fn test_silo_certificates() {
         );
     if let oxide_client::Error::CommunicationError(error) = error {
         assert!(error.is_connect());
-        let mut xxx = &error as &dyn Error;
-        while let Some(e) = xxx.source() {
-            eprintln!("source: {}", e);
-            xxx = e;
-        }
-        assert!(
-            error.to_string().contains("invalid peer certificate")
-                || error.to_string().contains("self-signed certificate")
-                || error.to_string().contains("self signed certificate"),
-            "Unexpected error: {} {}",
-            error,
-            error.source().map_or_else(String::new, |e| e.to_string()),
-        );
+        assert!(error.chain().to_string().contains("self-signed certificate"));
     } else {
         panic!(
             "unexpected error connecting with wrong certificate: {:#}",

From 3cdcda9a877ec352b52af36cdc21290c9a1c4a0d Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 15:23:44 -0700
Subject: [PATCH 16/29] update hakari

---
 Cargo.lock                | 47 +++++--------------
 workspace-hack/Cargo.toml | 98 +++++++++++++++++++++++++++++++--------
 2 files changed, 90 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba1e490986..8222d11b8f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1487,17 +1487,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "cookie"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
 [[package]]
 name = "cookie"
 version = "0.18.1"
@@ -1509,30 +1498,13 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "cookie_store"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6"
-dependencies = [
- "cookie 0.17.0",
- "idna 0.3.0",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
 [[package]]
 name = "cookie_store"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
 dependencies = [
- "cookie 0.18.1",
+ "cookie",
  "idna 0.5.0",
  "log",
  "publicsuffix",
@@ -5414,7 +5386,7 @@ dependencies = [
  "authz-macros",
  "base64 0.22.1",
  "chrono",
- "cookie 0.18.1",
+ "cookie",
  "dropshot 0.11.1-dev",
  "futures",
  "headers",
@@ -5979,7 +5951,7 @@ dependencies = [
  "chrono",
  "clap",
  "clickhouse-admin-types",
- "cookie 0.18.1",
+ "cookie",
  "derive-where",
  "derive_more",
  "dns-service-client",
@@ -7060,6 +7032,7 @@ dependencies = [
  "clap",
  "clap_builder",
  "console",
+ "cookie",
  "crossbeam-epoch",
  "crossbeam-utils",
  "crypto-common",
@@ -7090,8 +7063,10 @@ dependencies = [
  "hmac",
  "hyper 0.14.30",
  "hyper 1.4.1",
+ "hyper-rustls 0.27.3",
  "hyper-util",
  "indexmap 2.5.0",
+ "indicatif",
  "inout",
  "itertools 0.10.5",
  "itertools 0.12.1",
@@ -7122,9 +7097,12 @@ dependencies = [
  "regex-automata 0.4.6",
  "regex-syntax 0.8.4",
  "reqwest 0.11.27",
+ "reqwest 0.12.7",
  "ring 0.17.8",
  "rsa",
  "rustix",
+ "rustls 0.21.12",
+ "rustls 0.23.10",
  "schemars",
  "scopeguard",
  "semver 1.0.23",
@@ -7145,6 +7123,7 @@ dependencies = [
  "time-macros",
  "tokio",
  "tokio-postgres",
+ "tokio-rustls 0.26.0",
  "tokio-stream",
  "tokio-util",
  "toml 0.7.8",
@@ -9189,8 +9168,6 @@ checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
- "cookie 0.17.0",
- "cookie_store 0.20.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -9237,8 +9214,8 @@ checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64 0.22.1",
  "bytes",
- "cookie 0.18.1",
- "cookie_store 0.21.0",
+ "cookie",
+ "cookie_store",
  "encoding_rs",
  "futures-channel",
  "futures-core",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index ab8ea2a74b..087eb15ac0 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -62,17 +62,15 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
-hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["client", "http1", "http2", "server"] }
-hyper-util = { version = "0.1.7", features = ["client-legacy", "server-auto"] }
-indexmap = { version = "2.4.0", features = ["serde"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["full"] }
+indexmap = { version = "2.5.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
 lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2.158", features = ["extra_traits"] }
-log = { version = "0.4.21", default-features = false, features = ["kv_unstable", "std"] }
+log = { version = "0.4.22", default-features = false, features = ["kv_unstable", "std"] }
 managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] }
 memchr = { version = "2.7.2" }
 nom = { version = "7.1.3" }
@@ -88,18 +86,19 @@ pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption"
 postgres-types = { version = "0.2.7", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 predicates = { version = "3.1.2" }
 proc-macro2 = { version = "1.0.86" }
-quote = { version = "1.0.36" }
+quote = { version = "1.0.37" }
 regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.6", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
 regex-syntax = { version = "0.8.4" }
-reqwest = { version = "0.11.27", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12.7", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", default-features = false, features = ["rustls-tls", "stream"] }
 ring = { version = "0.17.8", features = ["std"] }
 rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1.2.0" }
 semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
+serde = { version = "1.0.210", features = ["alloc", "derive", "rc"] }
+serde_json = { version = "1.0.128", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
@@ -108,7 +107,7 @@ smallvec = { version = "1.13.2", default-features = false, features = ["const_ne
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
-syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
+syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.77", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
 tokio = { version = "1.39.3", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
@@ -174,17 +173,15 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
-hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["client", "http1", "http2", "server"] }
-hyper-util = { version = "0.1.7", features = ["client-legacy", "server-auto"] }
-indexmap = { version = "2.4.0", features = ["serde"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["full"] }
+indexmap = { version = "2.5.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
 lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2.158", features = ["extra_traits"] }
-log = { version = "0.4.21", default-features = false, features = ["kv_unstable", "std"] }
+log = { version = "0.4.22", default-features = false, features = ["kv_unstable", "std"] }
 managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] }
 memchr = { version = "2.7.2" }
 nom = { version = "7.1.3" }
@@ -200,18 +197,19 @@ pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption"
 postgres-types = { version = "0.2.7", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 predicates = { version = "3.1.2" }
 proc-macro2 = { version = "1.0.86" }
-quote = { version = "1.0.36" }
+quote = { version = "1.0.37" }
 regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.6", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
 regex-syntax = { version = "0.8.4" }
-reqwest = { version = "0.11.27", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12.7", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", default-features = false, features = ["rustls-tls", "stream"] }
 ring = { version = "0.17.8", features = ["std"] }
 rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1.2.0" }
 semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
+serde = { version = "1.0.210", features = ["alloc", "derive", "rc"] }
+serde_json = { version = "1.0.128", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
@@ -221,7 +219,7 @@ spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
 syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] }
-syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
+syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.77", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
 time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
 tokio = { version = "1.39.3", features = ["full", "test-util"] }
@@ -243,59 +241,119 @@ zerocopy = { version = "0.7.34", features = ["derive", "simd"] }
 zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
 [target.x86_64-unknown-linux-gnu.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
 [target.x86_64-apple-darwin.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
 [target.x86_64-apple-darwin.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
 [target.aarch64-apple-darwin.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
 [target.aarch64-apple-darwin.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
 [target.x86_64-unknown-illumos.dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
+indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
 
 [target.x86_64-unknown-illumos.build-dependencies]
+cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
+hyper-util = { version = "0.1.7", features = ["full"] }
+indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
+rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
+tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
 
 ### END HAKARI SECTION

From ebe03030a2f9db60b9cac421742ec2f147d06838 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 15:51:59 -0700
Subject: [PATCH 17/29] fix clippy

---
 dev-tools/omdb/src/bin/omdb/crucible_agent.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-tools/omdb/src/bin/omdb/crucible_agent.rs b/dev-tools/omdb/src/bin/omdb/crucible_agent.rs
index b5c36e0b3d..102f7b4c7e 100644
--- a/dev-tools/omdb/src/bin/omdb/crucible_agent.rs
+++ b/dev-tools/omdb/src/bin/omdb/crucible_agent.rs
@@ -143,8 +143,7 @@ async fn cmd_snapshot_list(
             Err(e) => {
                 println!(
                     "Error {} looking at region {} for snapshots",
-                    e,
-                    region.id.to_string()
+                    e, region.id,
                 );
                 continue;
             }

From d19990ad09c89d7567a124ad222b067eedc68132 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 19:02:47 -0700
Subject: [PATCH 18/29] update hyper-util and fix next certificate test

---
 Cargo.lock                                    | 28 ++-----------------
 nexus/tests/integration_tests/certificates.rs |  6 +---
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8222d11b8f..3d0e29553b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3998,7 +3998,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -4127,9 +4127,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -4140,7 +4140,6 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -11746,27 +11745,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
 [[package]]
 name = "tower-service"
 version = "0.3.2"
diff --git a/nexus/tests/integration_tests/certificates.rs b/nexus/tests/integration_tests/certificates.rs
index 882e6c7b17..e855a7e57b 100644
--- a/nexus/tests/integration_tests/certificates.rs
+++ b/nexus/tests/integration_tests/certificates.rs
@@ -619,11 +619,7 @@ async fn test_silo_certificates() {
         );
     if let oxide_client::Error::CommunicationError(error) = error {
         assert!(error.is_connect());
-        assert!(
-            error.to_string().contains("invalid peer certificate")
-                || error.to_string().contains("self-signed certificate")
-                || error.to_string().contains("self signed certificate")
-        );
+        assert!(error.chain().to_string().contains("self-signed certificate"));
     } else {
         panic!(
             "unexpected error connecting with wrong certificate: {:#}",

From 6eaba3788e60367a5734f89addfb28a8e9aefc19 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 19:04:27 -0700
Subject: [PATCH 19/29] hakarrrrriiiiiiii!!!!!

---
 workspace-hack/Cargo.toml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 087eb15ac0..1e87687144 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -245,7 +245,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
@@ -260,7 +260,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
@@ -274,7 +274,7 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -287,7 +287,7 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -300,7 +300,7 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -313,7 +313,7 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
@@ -327,7 +327,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
@@ -344,7 +344,7 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.30", features = ["full"] }
 hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
-hyper-util = { version = "0.1.7", features = ["full"] }
+hyper-util = { version = "0.1.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }

From 491391179c3eb95f96ea607d7a1ef7b63fb08e9a Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 25 Sep 2024 19:19:02 -0700
Subject: [PATCH 20/29] liblzma.so.5 is a thing I guess

---
 .cargo/xtask.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cargo/xtask.toml b/.cargo/xtask.toml
index 0055cf723c..cb539378d5 100644
--- a/.cargo/xtask.toml
+++ b/.cargo/xtask.toml
@@ -13,6 +13,7 @@
 [libraries."libgcc_s.so.1"]
 [libraries."libipcc.so.1"]
 [libraries."libkstat.so.1"]
+[libraries."liblzma.so.5"]
 [libraries."libm.so.2"]
 [libraries."libnsl.so.1"]
 [libraries."libnvpair.so.1"]

From ffbb6fc817f2d63eaffd25708ed6fc9a292033be Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 13:24:09 -0700
Subject: [PATCH 21/29] update deps

---
 Cargo.lock | 213 ++++++++++++++++++++++++++++++++---------------------
 Cargo.toml |   9 +--
 2 files changed, 134 insertions(+), 88 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b0e49c665..1a951d3ed9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -876,7 +876,7 @@ dependencies = [
 name = "bootstrap-agent-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "nexus-client",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -895,7 +895,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -1141,7 +1141,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "libc",
  "omicron-common",
@@ -1287,7 +1287,7 @@ name = "clickhouse-admin-api"
 version = "0.1.0"
 dependencies = [
  "clickhouse-admin-types",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1351,7 +1351,7 @@ name = "cockroach-admin-api"
 version = "0.1.0"
 dependencies = [
  "cockroach-admin-types",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1366,7 +1366,7 @@ dependencies = [
  "chrono",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1576,7 +1576,7 @@ name = "crdb-seed"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "slog",
@@ -1728,7 +1728,7 @@ dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body)",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -2289,7 +2289,7 @@ dependencies = [
  "clap",
  "dns-server-api",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "hickory-client",
  "hickory-proto",
@@ -2322,7 +2322,7 @@ name = "dns-server-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "omicron-workspace-hack",
  "schemars",
  "serde",
@@ -2337,7 +2337,7 @@ dependencies = [
  "expectorate",
  "http 1.1.0",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -2380,8 +2380,8 @@ dependencies = [
  "http 1.1.0",
  "omicron-workspace-hack",
  "omicron-zone-package",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "quote",
  "rand",
  "regress 0.9.1",
@@ -2453,7 +2453,54 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.11.1-dev",
+ "dropshot_endpoint 0.11.1-dev (git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body)",
+ "form_urlencoded",
+ "futures",
+ "hostname 0.4.0",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "indexmap 2.5.0",
+ "multer",
+ "openapiv3",
+ "paste",
+ "percent-encoding",
+ "rustls 0.22.4",
+ "rustls-pemfile 2.1.3",
+ "schemars",
+ "scopeguard",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sha1",
+ "slog",
+ "slog-async",
+ "slog-bunyan",
+ "slog-json",
+ "slog-term",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "toml 0.8.19",
+ "uuid",
+ "version_check",
+ "waitgroup",
+]
+
+[[package]]
+name = "dropshot"
+version = "0.11.1-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#e257f44fd36e358ff88793363aed6bf2108910de"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "base64 0.22.1",
+ "bytes",
+ "camino",
+ "chrono",
+ "debug-ignore",
+ "dropshot_endpoint 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2515,6 +2562,19 @@ dependencies = [
  "syn 2.0.77",
 ]
 
+[[package]]
+name = "dropshot_endpoint"
+version = "0.11.1-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#e257f44fd36e358ff88793363aed6bf2108910de"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_tokenstream",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "dsl_auto_type"
 version = "0.1.2"
@@ -3160,7 +3220,7 @@ dependencies = [
 name = "gateway-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "gateway-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -3201,7 +3261,7 @@ dependencies = [
  "chrono",
  "gateway-messages",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -3265,7 +3325,7 @@ name = "gateway-test-utils"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "gateway-messages",
  "gateway-types",
  "omicron-gateway",
@@ -3312,15 +3372,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.14"
@@ -3990,7 +4041,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -4397,7 +4448,7 @@ name = "installinator-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "hyper 1.4.1",
  "installinator-common",
  "omicron-common",
@@ -4415,7 +4466,7 @@ dependencies = [
  "installinator-common",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -4465,7 +4516,7 @@ dependencies = [
  "chrono",
  "dns-server",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "hickory-resolver",
@@ -4474,7 +4525,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "reqwest 0.12.7",
  "serde",
  "serde_json",
@@ -4492,7 +4543,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "hickory-resolver",
  "internal-dns",
  "omicron-common",
@@ -4821,7 +4872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5378,7 +5429,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "cookie",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "headers",
  "http 1.1.0",
@@ -5419,7 +5470,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -5435,7 +5486,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "libc",
  "omicron-common",
@@ -5527,7 +5578,7 @@ dependencies = [
  "db-macros",
  "diesel",
  "diesel-dtrace",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "gateway-client",
@@ -5609,7 +5660,7 @@ name = "nexus-external-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "http 1.1.0",
  "hyper 1.4.1",
  "ipnetwork",
@@ -5626,7 +5677,7 @@ dependencies = [
 name = "nexus-internal-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "nexus-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -5885,7 +5936,7 @@ dependencies = [
  "crucible-agent-client",
  "dns-server",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "gateway-messages",
  "gateway-test-utils",
@@ -5946,7 +5997,7 @@ dependencies = [
  "derive-where",
  "derive_more",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "gateway-client",
  "http 1.1.0",
@@ -6286,7 +6337,7 @@ dependencies = [
  "clickhouse-admin-api",
  "clickhouse-admin-types",
  "clickward",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6325,7 +6376,7 @@ dependencies = [
  "cockroach-admin-api",
  "cockroach-admin-types",
  "csv",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6367,7 +6418,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "hex",
@@ -6381,8 +6432,8 @@ dependencies = [
  "once_cell",
  "oxnet",
  "parse-display",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "proptest",
  "rand",
  "regress 0.9.1",
@@ -6412,7 +6463,7 @@ dependencies = [
  "either",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "reqwest 0.12.7",
  "serde",
  "sled-hardware-types",
@@ -6428,7 +6479,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "libc",
@@ -6468,7 +6519,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "gateway-api",
@@ -6512,7 +6563,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "internal-dns",
  "live-tests-macros",
@@ -6581,7 +6632,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "fatfs",
  "futures",
@@ -6650,7 +6701,7 @@ dependencies = [
  "petgraph",
  "pq-sys",
  "pretty_assertions",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rand",
  "rcgen",
@@ -6707,7 +6758,7 @@ dependencies = [
  "crucible-agent-client",
  "csv",
  "diesel",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "dyn-clone",
  "expectorate",
  "futures",
@@ -6872,7 +6923,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "flate2",
  "flume",
@@ -6960,7 +7011,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "filetime",
  "futures",
@@ -7207,7 +7258,7 @@ dependencies = [
  "clickhouse-admin-api",
  "cockroach-admin-api",
  "dns-server-api",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "fs-err",
  "gateway-api",
  "indent_write",
@@ -7377,7 +7428,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "rand",
  "regress 0.9.1",
  "reqwest 0.12.7",
@@ -7426,7 +7477,7 @@ name = "oximeter-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -7442,7 +7493,7 @@ dependencies = [
  "futures",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "reqwest 0.12.7",
  "serde",
  "slog",
@@ -7457,7 +7508,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "httpmock",
@@ -7507,7 +7558,7 @@ dependencies = [
  "criterion",
  "crossterm 0.28.1",
  "display-error-chain",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "futures",
  "gethostname",
@@ -7552,7 +7603,7 @@ version = "0.1.0"
 dependencies = [
  "cfg-if",
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "http 1.1.0",
  "hyper 1.4.1",
@@ -7588,7 +7639,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "internal-dns",
  "nexus-client",
  "omicron-common",
@@ -8487,12 +8538,11 @@ dependencies = [
 [[package]]
 name = "progenitor"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "progenitor-macro 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "serde_json",
 ]
 
 [[package]]
@@ -8512,12 +8562,12 @@ dependencies = [
 [[package]]
 name = "progenitor-client"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "bytes",
  "futures-core",
  "percent-encoding",
- "reqwest 0.11.27",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -8547,11 +8597,10 @@ dependencies = [
 [[package]]
 name = "progenitor-impl"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
- "getopts",
  "heck 0.5.0",
- "http 0.2.12",
+ "http 1.1.0",
  "indexmap 2.5.0",
  "openapiv3",
  "proc-macro2",
@@ -8586,7 +8635,7 @@ dependencies = [
 [[package]]
 name = "progenitor-macro"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "openapiv3",
  "proc-macro2",
@@ -8651,7 +8700,7 @@ dependencies = [
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body)",
  "futures",
  "hyper 1.4.1",
  "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
@@ -8973,7 +9022,7 @@ dependencies = [
  "camino-tempfile",
  "clap",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "expectorate",
  "humantime",
  "indexmap 2.5.0",
@@ -10303,7 +10352,7 @@ name = "sled-agent-api"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -10327,7 +10376,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -10674,7 +10723,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "gateway-messages",
  "gateway-types",
@@ -12124,7 +12173,7 @@ dependencies = [
  "clap",
  "debug-ignore",
  "display-error-chain",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "hex",
  "hubtools",
@@ -12593,7 +12642,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "gateway-client",
  "maplit",
  "omicron-common",
@@ -12649,7 +12698,7 @@ dependencies = [
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "either",
  "expectorate",
  "flate2",
@@ -12717,7 +12766,7 @@ name = "wicketd-api"
 version = "0.1.0"
 dependencies = [
  "bootstrap-agent-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "gateway-client",
  "omicron-common",
  "omicron-passwords",
@@ -12739,7 +12788,7 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -13216,7 +13265,7 @@ dependencies = [
  "anyhow",
  "camino",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "illumos-utils",
  "omicron-common",
  "omicron-sled-agent",
diff --git a/Cargo.toml b/Cargo.toml
index 770f9d679e..260109308f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -349,8 +349,7 @@ dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { path = "clients/dpd-client" }
-# dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
-dropshot = { git = "https://github.com/seanmonstar/dropshot", branch = "hyper-v1-2.4-own-body", features = ["usdt-probes"] }
+dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
 dyn-clone = "1.0.17"
 either = "1.13.0"
 expectorate = "1.1.0"
@@ -514,10 +513,8 @@ pretty_assertions = "1.4.1"
 pretty-hex = "0.4.1"
 prettyplease = { version = "0.2.22", features = ["verbatim"] }
 proc-macro2 = "1.0"
-# progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
-# progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
-progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "dependabot/cargo/reqwest-0.12.4" }
-progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "dependabot/cargo/reqwest-0.12.4" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
+progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 # bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
 # propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "a9c5fdac442fa6fd5a65e413ea874fe3c62c3fd9" }
 # propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "a9c5fdac442fa6fd5a65e413ea874fe3c62c3fd9" }

From d638ed3d499845026cdf5b31b6c910e6b73e543d Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 14:07:46 -0700
Subject: [PATCH 22/29] lock

---
 Cargo.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a951d3ed9..6196b7674b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -663,7 +663,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
 dependencies = [
  "bhyve_api_sys",
  "libc",
@@ -673,7 +673,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
 dependencies = [
  "libc",
  "strum",
@@ -2444,7 +2444,7 @@ dependencies = [
 [[package]]
 name = "dropshot"
 version = "0.11.1-dev"
-source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#9075a2a56f0e6cd8797ecc3a0842922718f0560b"
+source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#35c897b26aa0f9241c5b523a84ec009e8999ba97"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2552,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.11.1-dev"
-source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#9075a2a56f0e6cd8797ecc3a0842922718f0560b"
+source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#35c897b26aa0f9241c5b523a84ec009e8999ba97"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -4872,7 +4872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8528,7 +8528,7 @@ dependencies = [
 [[package]]
 name = "progenitor"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#e6b4ef462cce01e5f65ec78b13f7bfda7c5953db"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
  "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
@@ -8548,7 +8548,7 @@ dependencies = [
 [[package]]
 name = "progenitor-client"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#e6b4ef462cce01e5f65ec78b13f7bfda7c5953db"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "bytes",
  "futures-core",
@@ -8576,10 +8576,10 @@ dependencies = [
 [[package]]
 name = "progenitor-impl"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#e6b4ef462cce01e5f65ec78b13f7bfda7c5953db"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "heck 0.5.0",
- "http 0.2.12",
+ "http 1.1.0",
  "indexmap 2.5.0",
  "openapiv3",
  "proc-macro2",
@@ -8618,7 +8618,7 @@ dependencies = [
 [[package]]
 name = "progenitor-macro"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#e6b4ef462cce01e5f65ec78b13f7bfda7c5953db"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
  "openapiv3",
  "proc-macro2",
@@ -8652,12 +8652,12 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -8694,16 +8694,16 @@ dependencies = [
 [[package]]
 name = "propolis-mock-server"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
 dependencies = [
  "anyhow",
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body)",
+ "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
  "futures",
  "hyper 1.4.1",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "propolis_types",
  "rand",
  "reqwest 0.12.7",
@@ -8736,7 +8736,7 @@ dependencies = [
 [[package]]
 name = "propolis_types"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#81e04b69611e8c8814dd96e081ec311d489c9e57"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
 dependencies = [
  "schemars",
  "serde",

From 450e96ffccf7231827698ed00338c837cd373a42 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 14:17:44 -0700
Subject: [PATCH 23/29] deps

---
 Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 260109308f..84758339b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -513,8 +513,8 @@ pretty_assertions = "1.4.1"
 pretty-hex = "0.4.1"
 prettyplease = { version = "0.2.22", features = ["verbatim"] }
 proc-macro2 = "1.0"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
-progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
+progenitor = "0.8.0"
+progenitor-client = "0.8.0"
 # bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
 # propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "a9c5fdac442fa6fd5a65e413ea874fe3c62c3fd9" }
 # propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "a9c5fdac442fa6fd5a65e413ea874fe3c62c3fd9" }

From eddc0944b7df3b1c69e89b6262d4b7030a5392b1 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 14:47:07 -0700
Subject: [PATCH 24/29] more

---
 Cargo.lock                            | 335 +++++++++++++++-----------
 oximeter/instruments/src/kstat/mod.rs |   1 -
 2 files changed, 194 insertions(+), 142 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6196b7674b..1aa859be3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -876,7 +876,7 @@ dependencies = [
 name = "bootstrap-agent-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "nexus-client",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -895,7 +895,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -1141,7 +1141,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "libc",
  "omicron-common",
@@ -1287,7 +1287,7 @@ name = "clickhouse-admin-api"
 version = "0.1.0"
 dependencies = [
  "clickhouse-admin-types",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1351,7 +1351,7 @@ name = "cockroach-admin-api"
 version = "0.1.0"
 dependencies = [
  "cockroach-admin-types",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1366,7 +1366,7 @@ dependencies = [
  "chrono",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1576,7 +1576,7 @@ name = "crdb-seed"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "slog",
@@ -1707,13 +1707,13 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#f3e30fc4267b6c6f3b6423ffede679657ac817d0"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
 dependencies = [
  "anyhow",
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1723,12 +1723,12 @@ dependencies = [
 [[package]]
 name = "crucible-common"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#f3e30fc4267b6c6f3b6423ffede679657ac817d0"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
 dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.11.1-dev (git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body)",
+ "dropshot 0.11.1-dev",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -1753,13 +1753,13 @@ dependencies = [
 [[package]]
 name = "crucible-pantry-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#f3e30fc4267b6c6f3b6423ffede679657ac817d0"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
 dependencies = [
  "anyhow",
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1770,7 +1770,7 @@ dependencies = [
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#f3e30fc4267b6c6f3b6423ffede679657ac817d0"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
 dependencies = [
  "crucible-workspace-hack",
  "libc",
@@ -2289,7 +2289,7 @@ dependencies = [
  "clap",
  "dns-server-api",
  "dns-service-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "hickory-client",
  "hickory-proto",
@@ -2322,7 +2322,7 @@ name = "dns-server-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "omicron-workspace-hack",
  "schemars",
  "serde",
@@ -2337,7 +2337,7 @@ dependencies = [
  "expectorate",
  "http 1.1.0",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -2380,8 +2380,8 @@ dependencies = [
  "http 1.1.0",
  "omicron-workspace-hack",
  "omicron-zone-package",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
+ "progenitor-client 0.8.0",
  "quote",
  "rand",
  "regress 0.9.1",
@@ -2441,53 +2441,6 @@ dependencies = [
  "waitgroup",
 ]
 
-[[package]]
-name = "dropshot"
-version = "0.11.1-dev"
-source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#35c897b26aa0f9241c5b523a84ec009e8999ba97"
-dependencies = [
- "async-stream",
- "async-trait",
- "base64 0.22.1",
- "bytes",
- "camino",
- "chrono",
- "debug-ignore",
- "dropshot_endpoint 0.11.1-dev (git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body)",
- "form_urlencoded",
- "futures",
- "hostname 0.4.0",
- "http 1.1.0",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "indexmap 2.5.0",
- "multer",
- "openapiv3",
- "paste",
- "percent-encoding",
- "rustls 0.22.4",
- "rustls-pemfile 2.1.3",
- "schemars",
- "scopeguard",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
- "slog",
- "slog-async",
- "slog-bunyan",
- "slog-json",
- "slog-term",
- "tokio",
- "tokio-rustls 0.25.0",
- "toml 0.8.19",
- "uuid",
- "version_check",
- "waitgroup",
-]
-
 [[package]]
 name = "dropshot"
 version = "0.11.1-dev"
@@ -2500,7 +2453,7 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot_endpoint 0.11.1-dev",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2549,19 +2502,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "dropshot_endpoint"
-version = "0.11.1-dev"
-source = "git+https://github.com/seanmonstar/dropshot?branch=hyper-v1-2.4-own-body#35c897b26aa0f9241c5b523a84ec009e8999ba97"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "serde",
- "serde_tokenstream",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "dropshot_endpoint"
 version = "0.11.1-dev"
@@ -3220,7 +3160,7 @@ dependencies = [
 name = "gateway-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "gateway-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -3261,7 +3201,7 @@ dependencies = [
  "chrono",
  "gateway-messages",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -3325,7 +3265,7 @@ name = "gateway-test-utils"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "gateway-messages",
  "gateway-types",
  "omicron-gateway",
@@ -4448,7 +4388,7 @@ name = "installinator-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "hyper 1.4.1",
  "installinator-common",
  "omicron-common",
@@ -4466,7 +4406,7 @@ dependencies = [
  "installinator-common",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -4516,7 +4456,7 @@ dependencies = [
  "chrono",
  "dns-server",
  "dns-service-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "hickory-resolver",
@@ -4525,7 +4465,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "serde",
  "serde_json",
@@ -4543,7 +4483,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "hickory-resolver",
  "internal-dns",
  "omicron-common",
@@ -4872,7 +4812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5429,7 +5369,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "cookie",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "headers",
  "http 1.1.0",
@@ -5470,7 +5410,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -5486,7 +5426,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "libc",
  "omicron-common",
@@ -5578,7 +5518,7 @@ dependencies = [
  "db-macros",
  "diesel",
  "diesel-dtrace",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "gateway-client",
@@ -5660,7 +5600,7 @@ name = "nexus-external-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "http 1.1.0",
  "hyper 1.4.1",
  "ipnetwork",
@@ -5677,7 +5617,7 @@ dependencies = [
 name = "nexus-internal-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "nexus-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -5936,7 +5876,7 @@ dependencies = [
  "crucible-agent-client",
  "dns-server",
  "dns-service-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "gateway-messages",
  "gateway-test-utils",
@@ -5997,7 +5937,7 @@ dependencies = [
  "derive-where",
  "derive_more",
  "dns-service-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "gateway-client",
  "http 1.1.0",
@@ -6337,7 +6277,7 @@ dependencies = [
  "clickhouse-admin-api",
  "clickhouse-admin-types",
  "clickward",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6376,7 +6316,7 @@ dependencies = [
  "cockroach-admin-api",
  "cockroach-admin-types",
  "csv",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6418,7 +6358,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "hex",
@@ -6432,8 +6372,8 @@ dependencies = [
  "once_cell",
  "oxnet",
  "parse-display",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
+ "progenitor-client 0.8.0",
  "proptest",
  "rand",
  "regress 0.9.1",
@@ -6463,7 +6403,7 @@ dependencies = [
  "either",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-client 0.8.0",
  "reqwest 0.12.7",
  "serde",
  "sled-hardware-types",
@@ -6479,7 +6419,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "libc",
@@ -6519,7 +6459,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "gateway-api",
@@ -6563,7 +6503,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "internal-dns",
  "live-tests-macros",
@@ -6632,7 +6572,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "fatfs",
  "futures",
@@ -6701,7 +6641,7 @@ dependencies = [
  "petgraph",
  "pq-sys",
  "pretty_assertions",
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-client 0.8.0",
  "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rand",
  "rcgen",
@@ -6758,7 +6698,7 @@ dependencies = [
  "crucible-agent-client",
  "csv",
  "diesel",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "dyn-clone",
  "expectorate",
  "futures",
@@ -6923,7 +6863,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "flate2",
  "flume",
@@ -7011,7 +6951,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "filetime",
  "futures",
@@ -7258,7 +7198,7 @@ dependencies = [
  "clickhouse-admin-api",
  "cockroach-admin-api",
  "dns-server-api",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "fs-err",
  "gateway-api",
  "indent_write",
@@ -7428,7 +7368,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "rand",
  "regress 0.9.1",
  "reqwest 0.12.7",
@@ -7477,7 +7417,7 @@ name = "oximeter-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -7493,7 +7433,7 @@ dependencies = [
  "futures",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "serde",
  "slog",
@@ -7508,7 +7448,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "httpmock",
@@ -7558,7 +7498,7 @@ dependencies = [
  "criterion",
  "crossterm 0.28.1",
  "display-error-chain",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "futures",
  "gethostname",
@@ -7603,7 +7543,7 @@ version = "0.1.0"
 dependencies = [
  "cfg-if",
  "chrono",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "http 1.1.0",
  "hyper 1.4.1",
@@ -7639,7 +7579,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "internal-dns",
  "nexus-client",
  "omicron-common",
@@ -8545,6 +8485,17 @@ dependencies = [
  "progenitor-macro 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
 ]
 
+[[package]]
+name = "progenitor"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331"
+dependencies = [
+ "progenitor-client 0.8.0",
+ "progenitor-impl 0.8.0",
+ "progenitor-macro 0.8.0",
+]
+
 [[package]]
 name = "progenitor-client"
 version = "0.7.0"
@@ -8573,6 +8524,21 @@ dependencies = [
  "serde_urlencoded",
 ]
 
+[[package]]
+name = "progenitor-client"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a5db54eac3cae7007a0785854bc3e89fd418cca7dfc2207b99b43979154c1b"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "percent-encoding",
+ "reqwest 0.12.7",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+]
+
 [[package]]
 name = "progenitor-impl"
 version = "0.7.0"
@@ -8590,7 +8556,7 @@ dependencies = [
  "serde_json",
  "syn 2.0.77",
  "thiserror",
- "typify",
+ "typify 0.2.0 (git+https://github.com/oxidecomputer/typify)",
  "unicode-ident",
 ]
 
@@ -8611,7 +8577,29 @@ dependencies = [
  "serde_json",
  "syn 2.0.77",
  "thiserror",
- "typify",
+ "typify 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "unicode-ident",
+]
+
+[[package]]
+name = "progenitor-impl"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66"
+dependencies = [
+ "heck 0.5.0",
+ "http 1.1.0",
+ "indexmap 2.5.0",
+ "openapiv3",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "schemars",
+ "serde",
+ "serde_json",
+ "syn 2.0.77",
+ "thiserror",
+ "typify 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-ident",
 ]
 
@@ -8649,6 +8637,24 @@ dependencies = [
  "syn 2.0.77",
 ]
 
+[[package]]
+name = "progenitor-macro"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b"
+dependencies = [
+ "openapiv3",
+ "proc-macro2",
+ "progenitor-impl 0.8.0",
+ "quote",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_tokenstream",
+ "serde_yaml",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
@@ -8700,7 +8706,7 @@ dependencies = [
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "hyper 1.4.1",
  "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
@@ -9022,7 +9028,7 @@ dependencies = [
  "camino-tempfile",
  "clap",
  "dns-service-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "expectorate",
  "humantime",
  "indexmap 2.5.0",
@@ -10352,7 +10358,7 @@ name = "sled-agent-api"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -10376,7 +10382,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -10723,7 +10729,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "gateway-messages",
  "gateway-types",
@@ -12009,17 +12015,47 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "typify"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/typify#0ef24964a92b600a82f07a980067d8dac5600e40"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a"
 dependencies = [
- "typify-impl",
- "typify-macro",
+ "typify-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typify-macro 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "typify"
+version = "0.2.0"
+source = "git+https://github.com/oxidecomputer/typify#50d969668dcad42300423f893de9b3903f11b65c"
+dependencies = [
+ "typify-impl 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "typify-macro 0.2.0 (git+https://github.com/oxidecomputer/typify)",
 ]
 
 [[package]]
 name = "typify-impl"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/typify#0ef24964a92b600a82f07a980067d8dac5600e40"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11"
+dependencies = [
+ "heck 0.5.0",
+ "log",
+ "proc-macro2",
+ "quote",
+ "regress 0.10.1",
+ "schemars",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "syn 2.0.77",
+ "thiserror",
+ "unicode-ident",
+]
+
+[[package]]
+name = "typify-impl"
+version = "0.2.0"
+source = "git+https://github.com/oxidecomputer/typify#50d969668dcad42300423f893de9b3903f11b65c"
 dependencies = [
  "heck 0.5.0",
  "log",
@@ -12037,8 +12073,25 @@ dependencies = [
 
 [[package]]
 name = "typify-macro"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/typify#0ef24964a92b600a82f07a980067d8dac5600e40"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "schemars",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "serde_tokenstream",
+ "syn 2.0.77",
+ "typify-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "typify-macro"
+version = "0.2.0"
+source = "git+https://github.com/oxidecomputer/typify#50d969668dcad42300423f893de9b3903f11b65c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12048,7 +12101,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "syn 2.0.77",
- "typify-impl",
+ "typify-impl 0.2.0 (git+https://github.com/oxidecomputer/typify)",
 ]
 
 [[package]]
@@ -12173,7 +12226,7 @@ dependencies = [
  "clap",
  "debug-ignore",
  "display-error-chain",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "futures",
  "hex",
  "hubtools",
@@ -12642,7 +12695,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dpd-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "gateway-client",
  "maplit",
  "omicron-common",
@@ -12698,7 +12751,7 @@ dependencies = [
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "either",
  "expectorate",
  "flate2",
@@ -12766,7 +12819,7 @@ name = "wicketd-api"
 version = "0.1.0"
 dependencies = [
  "bootstrap-agent-client",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "gateway-client",
  "omicron-common",
  "omicron-passwords",
@@ -12788,7 +12841,7 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -13265,7 +13318,7 @@ dependencies = [
  "anyhow",
  "camino",
  "clap",
- "dropshot 0.11.1-dev (git+https://github.com/oxidecomputer/dropshot?branch=main)",
+ "dropshot 0.11.1-dev",
  "illumos-utils",
  "omicron-common",
  "omicron-sled-agent",
diff --git a/oximeter/instruments/src/kstat/mod.rs b/oximeter/instruments/src/kstat/mod.rs
index 7b0082a396..a5020b9b61 100644
--- a/oximeter/instruments/src/kstat/mod.rs
+++ b/oximeter/instruments/src/kstat/mod.rs
@@ -91,7 +91,6 @@ use std::time::Duration;
 pub mod link;
 mod sampler;
 
-pub use link::SledDataLink;
 pub use sampler::CollectionDetails;
 pub use sampler::ExpirationBehavior;
 pub use sampler::KstatSampler;

From 6bf8c861e4ed1cf4e4ed46bb62ff0f229c921a68 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 15:03:05 -0700
Subject: [PATCH 25/29] more

---
 Cargo.lock | 220 ++++++++++++++++++++++++++---------------------------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1aa859be3c..fd8c061175 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -663,7 +663,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
 dependencies = [
  "bhyve_api_sys",
  "libc",
@@ -673,7 +673,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
 dependencies = [
  "libc",
  "strum",
@@ -876,7 +876,7 @@ dependencies = [
 name = "bootstrap-agent-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "nexus-client",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -895,7 +895,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -1141,7 +1141,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "libc",
  "omicron-common",
@@ -1287,7 +1287,7 @@ name = "clickhouse-admin-api"
 version = "0.1.0"
 dependencies = [
  "clickhouse-admin-types",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1351,7 +1351,7 @@ name = "cockroach-admin-api"
 version = "0.1.0"
 dependencies = [
  "cockroach-admin-types",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1366,7 +1366,7 @@ dependencies = [
  "chrono",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1576,7 +1576,7 @@ name = "crdb-seed"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "slog",
@@ -1713,7 +1713,7 @@ dependencies = [
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1728,7 +1728,7 @@ dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -1759,7 +1759,7 @@ dependencies = [
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1979,7 +1979,7 @@ source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#7390265
 dependencies = [
  "oxnet",
  "percent-encoding",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0",
  "reqwest 0.12.7",
  "serde",
  "serde_json",
@@ -2289,7 +2289,7 @@ dependencies = [
  "clap",
  "dns-server-api",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "hickory-client",
  "hickory-proto",
@@ -2322,7 +2322,7 @@ name = "dns-server-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "omicron-workspace-hack",
  "schemars",
  "serde",
@@ -2337,7 +2337,7 @@ dependencies = [
  "expectorate",
  "http 1.1.0",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -2380,8 +2380,8 @@ dependencies = [
  "http 1.1.0",
  "omicron-workspace-hack",
  "omicron-zone-package",
- "progenitor 0.8.0",
- "progenitor-client 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote",
  "rand",
  "regress 0.9.1",
@@ -2443,8 +2443,8 @@ dependencies = [
 
 [[package]]
 name = "dropshot"
-version = "0.11.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#e257f44fd36e358ff88793363aed6bf2108910de"
+version = "0.12.1-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2453,7 +2453,7 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.11.1-dev",
+ "dropshot_endpoint 0.12.1-dev",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2504,8 +2504,8 @@ dependencies = [
 
 [[package]]
 name = "dropshot_endpoint"
-version = "0.11.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#e257f44fd36e358ff88793363aed6bf2108910de"
+version = "0.12.1-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3160,7 +3160,7 @@ dependencies = [
 name = "gateway-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "gateway-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -3201,7 +3201,7 @@ dependencies = [
  "chrono",
  "gateway-messages",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -3265,7 +3265,7 @@ name = "gateway-test-utils"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "gateway-messages",
  "gateway-types",
  "omicron-gateway",
@@ -4388,7 +4388,7 @@ name = "installinator-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "hyper 1.4.1",
  "installinator-common",
  "omicron-common",
@@ -4406,7 +4406,7 @@ dependencies = [
  "installinator-common",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -4456,7 +4456,7 @@ dependencies = [
  "chrono",
  "dns-server",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "hickory-resolver",
@@ -4465,7 +4465,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "serde",
  "serde_json",
@@ -4483,7 +4483,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "hickory-resolver",
  "internal-dns",
  "omicron-common",
@@ -4812,7 +4812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5150,7 +5150,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "percent-encoding",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor 0.7.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -5369,7 +5369,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "cookie",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "headers",
  "http 1.1.0",
@@ -5410,7 +5410,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -5426,7 +5426,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "libc",
  "omicron-common",
@@ -5518,7 +5518,7 @@ dependencies = [
  "db-macros",
  "diesel",
  "diesel-dtrace",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "gateway-client",
@@ -5600,7 +5600,7 @@ name = "nexus-external-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "http 1.1.0",
  "hyper 1.4.1",
  "ipnetwork",
@@ -5617,7 +5617,7 @@ dependencies = [
 name = "nexus-internal-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "nexus-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -5876,7 +5876,7 @@ dependencies = [
  "crucible-agent-client",
  "dns-server",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "gateway-messages",
  "gateway-test-utils",
@@ -5937,7 +5937,7 @@ dependencies = [
  "derive-where",
  "derive_more",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "gateway-client",
  "http 1.1.0",
@@ -6277,7 +6277,7 @@ dependencies = [
  "clickhouse-admin-api",
  "clickhouse-admin-types",
  "clickward",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6316,7 +6316,7 @@ dependencies = [
  "cockroach-admin-api",
  "cockroach-admin-types",
  "csv",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6358,7 +6358,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "hex",
@@ -6372,8 +6372,8 @@ dependencies = [
  "once_cell",
  "oxnet",
  "parse-display",
- "progenitor 0.8.0",
- "progenitor-client 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest",
  "rand",
  "regress 0.9.1",
@@ -6403,7 +6403,7 @@ dependencies = [
  "either",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor-client 0.8.0",
+ "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "serde",
  "sled-hardware-types",
@@ -6419,7 +6419,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "libc",
@@ -6459,7 +6459,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "gateway-api",
@@ -6503,7 +6503,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "internal-dns",
  "live-tests-macros",
@@ -6572,7 +6572,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "fatfs",
  "futures",
@@ -6641,7 +6641,7 @@ dependencies = [
  "petgraph",
  "pq-sys",
  "pretty_assertions",
- "progenitor-client 0.8.0",
+ "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rand",
  "rcgen",
@@ -6698,7 +6698,7 @@ dependencies = [
  "crucible-agent-client",
  "csv",
  "diesel",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "dyn-clone",
  "expectorate",
  "futures",
@@ -6863,7 +6863,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "flate2",
  "flume",
@@ -6951,7 +6951,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "filetime",
  "futures",
@@ -7198,7 +7198,7 @@ dependencies = [
  "clickhouse-admin-api",
  "cockroach-admin-api",
  "dns-server-api",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "fs-err",
  "gateway-api",
  "indent_write",
@@ -7368,7 +7368,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand",
  "regress 0.9.1",
  "reqwest 0.12.7",
@@ -7417,7 +7417,7 @@ name = "oximeter-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -7433,7 +7433,7 @@ dependencies = [
  "futures",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.12.7",
  "serde",
  "slog",
@@ -7448,7 +7448,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "httpmock",
@@ -7498,7 +7498,7 @@ dependencies = [
  "criterion",
  "crossterm 0.28.1",
  "display-error-chain",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "futures",
  "gethostname",
@@ -7543,7 +7543,7 @@ version = "0.1.0"
 dependencies = [
  "cfg-if",
  "chrono",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "http 1.1.0",
  "hyper 1.4.1",
@@ -7579,7 +7579,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "internal-dns",
  "nexus-client",
  "omicron-common",
@@ -8470,30 +8470,30 @@ name = "progenitor"
 version = "0.7.0"
 source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
 dependencies = [
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
- "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
- "progenitor-macro 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-client 0.7.0",
+ "progenitor-impl 0.7.0",
+ "progenitor-macro 0.7.0",
 ]
 
 [[package]]
 name = "progenitor"
-version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331"
 dependencies = [
- "progenitor-client 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "progenitor-macro 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-impl 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-macro 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "progenitor"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
 dependencies = [
- "progenitor-client 0.8.0",
- "progenitor-impl 0.8.0",
- "progenitor-macro 0.8.0",
+ "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-impl 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-macro 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
 ]
 
 [[package]]
@@ -8512,8 +8512,9 @@ dependencies = [
 
 [[package]]
 name = "progenitor-client"
-version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a5db54eac3cae7007a0785854bc3e89fd418cca7dfc2207b99b43979154c1b"
 dependencies = [
  "bytes",
  "futures-core",
@@ -8527,8 +8528,7 @@ dependencies = [
 [[package]]
 name = "progenitor-client"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a5db54eac3cae7007a0785854bc3e89fd418cca7dfc2207b99b43979154c1b"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
 dependencies = [
  "bytes",
  "futures-core",
@@ -8562,8 +8562,9 @@ dependencies = [
 
 [[package]]
 name = "progenitor-impl"
-version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66"
 dependencies = [
  "heck 0.5.0",
  "http 1.1.0",
@@ -8577,15 +8578,14 @@ dependencies = [
  "serde_json",
  "syn 2.0.77",
  "thiserror",
- "typify 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "typify 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-ident",
 ]
 
 [[package]]
 name = "progenitor-impl"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
 dependencies = [
  "heck 0.5.0",
  "http 1.1.0",
@@ -8599,7 +8599,7 @@ dependencies = [
  "serde_json",
  "syn 2.0.77",
  "thiserror",
- "typify 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typify 0.2.0 (git+https://github.com/oxidecomputer/typify)",
  "unicode-ident",
 ]
 
@@ -8610,7 +8610,7 @@ source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/carg
 dependencies = [
  "openapiv3",
  "proc-macro2",
- "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4)",
+ "progenitor-impl 0.7.0",
  "quote",
  "schemars",
  "serde",
@@ -8622,12 +8622,13 @@ dependencies = [
 
 [[package]]
 name = "progenitor-macro"
-version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b"
 dependencies = [
  "openapiv3",
  "proc-macro2",
- "progenitor-impl 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-impl 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote",
  "schemars",
  "serde",
@@ -8640,12 +8641,11 @@ dependencies = [
 [[package]]
 name = "progenitor-macro"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
 dependencies = [
  "openapiv3",
  "proc-macro2",
- "progenitor-impl 0.8.0",
+ "progenitor-impl 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "quote",
  "schemars",
  "serde",
@@ -8658,12 +8658,12 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -8684,7 +8684,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
  "rand",
  "reqwest 0.11.27",
  "schemars",
@@ -8700,16 +8700,16 @@ dependencies = [
 [[package]]
 name = "propolis-mock-server"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
 dependencies = [
  "anyhow",
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "hyper 1.4.1",
- "progenitor 0.7.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "propolis_types",
  "rand",
  "reqwest 0.12.7",
@@ -8742,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "propolis_types"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#5b65dc6923420c2bfe0863825be7bcbee895ca09"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
 dependencies = [
  "schemars",
  "serde",
@@ -9028,7 +9028,7 @@ dependencies = [
  "camino-tempfile",
  "clap",
  "dns-service-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "expectorate",
  "humantime",
  "indexmap 2.5.0",
@@ -10358,7 +10358,7 @@ name = "sled-agent-api"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -10382,7 +10382,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -10729,7 +10729,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "gateway-messages",
  "gateway-types",
@@ -12226,7 +12226,7 @@ dependencies = [
  "clap",
  "debug-ignore",
  "display-error-chain",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "futures",
  "hex",
  "hubtools",
@@ -12695,7 +12695,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "gateway-client",
  "maplit",
  "omicron-common",
@@ -12751,7 +12751,7 @@ dependencies = [
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "either",
  "expectorate",
  "flate2",
@@ -12819,7 +12819,7 @@ name = "wicketd-api"
 version = "0.1.0"
 dependencies = [
  "bootstrap-agent-client",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "gateway-client",
  "omicron-common",
  "omicron-passwords",
@@ -12841,7 +12841,7 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -13318,7 +13318,7 @@ dependencies = [
  "anyhow",
  "camino",
  "clap",
- "dropshot 0.11.1-dev",
+ "dropshot 0.12.1-dev",
  "illumos-utils",
  "omicron-common",
  "omicron-sled-agent",

From 7dd467196a28f6c6acd221e3d83990667d5fd032 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 15:11:38 -0700
Subject: [PATCH 26/29] x

---
 Cargo.lock | 385 +++++++++++++++++++++++++++--------------------------
 Cargo.toml |   2 +-
 2 files changed, 194 insertions(+), 193 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fd8c061175..568f4b6367 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -876,7 +876,7 @@ dependencies = [
 name = "bootstrap-agent-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "nexus-client",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -895,7 +895,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -1032,9 +1032,9 @@ dependencies = [
 
 [[package]]
 name = "cargo_toml"
-version = "0.20.4"
+version = "0.20.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965"
+checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0"
 dependencies = [
  "serde",
  "toml 0.8.19",
@@ -1141,7 +1141,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "libc",
  "omicron-common",
@@ -1287,7 +1287,7 @@ name = "clickhouse-admin-api"
 version = "0.1.0"
 dependencies = [
  "clickhouse-admin-types",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1351,7 +1351,7 @@ name = "cockroach-admin-api"
 version = "0.1.0"
 dependencies = [
  "cockroach-admin-types",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1366,7 +1366,7 @@ dependencies = [
  "chrono",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1576,7 +1576,7 @@ name = "crdb-seed"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "slog",
@@ -1707,13 +1707,13 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
 dependencies = [
  "anyhow",
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1723,12 +1723,12 @@ dependencies = [
 [[package]]
 name = "crucible-common"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
 dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.12.1-dev",
+ "dropshot 0.10.2-dev",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -1753,13 +1753,13 @@ dependencies = [
 [[package]]
 name = "crucible-pantry-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
 dependencies = [
  "anyhow",
  "chrono",
  "crucible-workspace-hack",
  "percent-encoding",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -1770,7 +1770,7 @@ dependencies = [
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#d74e4a0acef5b992222707cd12e1625416ff78d5"
+source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
 dependencies = [
  "crucible-workspace-hack",
  "libc",
@@ -1975,7 +1975,7 @@ dependencies = [
 [[package]]
 name = "ddm-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#739026523a1f4b5fa9548de1d01861ed603f09b8"
+source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#1dbbe4944631efb962a311c13b70f883a6a845dc"
 dependencies = [
  "oxnet",
  "percent-encoding",
@@ -2289,7 +2289,7 @@ dependencies = [
  "clap",
  "dns-server-api",
  "dns-service-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "hickory-client",
  "hickory-proto",
@@ -2322,7 +2322,7 @@ name = "dns-server-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "omicron-workspace-hack",
  "schemars",
  "serde",
@@ -2337,7 +2337,7 @@ dependencies = [
  "expectorate",
  "http 1.1.0",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "schemars",
  "serde",
@@ -2380,8 +2380,8 @@ dependencies = [
  "http 1.1.0",
  "omicron-workspace-hack",
  "omicron-zone-package",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
+ "progenitor-client 0.8.0",
  "quote",
  "rand",
  "regress 0.9.1",
@@ -2443,8 +2443,8 @@ dependencies = [
 
 [[package]]
 name = "dropshot"
-version = "0.12.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
+version = "0.10.2-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#06c8dab40e28d313f8bb0e15e1027eeace3bce89"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2453,7 +2453,54 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.12.1-dev",
+ "dropshot_endpoint 0.10.2-dev",
+ "form_urlencoded",
+ "futures",
+ "hostname 0.4.0",
+ "http 0.2.12",
+ "hyper 0.14.30",
+ "indexmap 2.5.0",
+ "multer",
+ "openapiv3",
+ "paste",
+ "percent-encoding",
+ "rustls 0.22.4",
+ "rustls-pemfile 2.1.3",
+ "schemars",
+ "scopeguard",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sha1",
+ "slog",
+ "slog-async",
+ "slog-bunyan",
+ "slog-json",
+ "slog-term",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "toml 0.8.19",
+ "usdt",
+ "uuid",
+ "version_check",
+ "waitgroup",
+]
+
+[[package]]
+name = "dropshot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab804b8d4ab58d96e1e19c8ef87e1747a70d2819e92b659d6fe8d5ac5ac44d50"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "base64 0.22.1",
+ "bytes",
+ "camino",
+ "chrono",
+ "debug-ignore",
+ "dropshot_endpoint 0.12.0",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2504,8 +2551,22 @@ dependencies = [
 
 [[package]]
 name = "dropshot_endpoint"
-version = "0.12.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
+version = "0.10.2-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#06c8dab40e28d313f8bb0e15e1027eeace3bce89"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_tokenstream",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "dropshot_endpoint"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796be76b11b79de0decd7be2105add01220f8bbe04cf1f83214c0b801414a722"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3160,7 +3221,7 @@ dependencies = [
 name = "gateway-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "gateway-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -3201,7 +3262,7 @@ dependencies = [
  "chrono",
  "gateway-messages",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -3265,7 +3326,7 @@ name = "gateway-test-utils"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "gateway-messages",
  "gateway-types",
  "omicron-gateway",
@@ -3312,6 +3373,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.14"
@@ -3981,7 +4051,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -4388,7 +4458,7 @@ name = "installinator-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "hyper 1.4.1",
  "installinator-common",
  "omicron-common",
@@ -4406,7 +4476,7 @@ dependencies = [
  "installinator-common",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -4456,7 +4526,7 @@ dependencies = [
  "chrono",
  "dns-server",
  "dns-service-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "hickory-resolver",
@@ -4465,7 +4535,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "serde",
  "serde_json",
@@ -4483,7 +4553,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "hickory-resolver",
  "internal-dns",
  "omicron-common",
@@ -5145,7 +5215,7 @@ dependencies = [
 [[package]]
 name = "mg-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#739026523a1f4b5fa9548de1d01861ed603f09b8"
+source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#1dbbe4944631efb962a311c13b70f883a6a845dc"
 dependencies = [
  "anyhow",
  "chrono",
@@ -5369,7 +5439,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "cookie",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "headers",
  "http 1.1.0",
@@ -5410,7 +5480,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -5426,7 +5496,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "libc",
  "omicron-common",
@@ -5518,7 +5588,7 @@ dependencies = [
  "db-macros",
  "diesel",
  "diesel-dtrace",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "gateway-client",
@@ -5600,7 +5670,7 @@ name = "nexus-external-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "http 1.1.0",
  "hyper 1.4.1",
  "ipnetwork",
@@ -5617,7 +5687,7 @@ dependencies = [
 name = "nexus-internal-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "nexus-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -5876,7 +5946,7 @@ dependencies = [
  "crucible-agent-client",
  "dns-server",
  "dns-service-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "gateway-messages",
  "gateway-test-utils",
@@ -5937,7 +6007,7 @@ dependencies = [
  "derive-where",
  "derive_more",
  "dns-service-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "gateway-client",
  "http 1.1.0",
@@ -6277,7 +6347,7 @@ dependencies = [
  "clickhouse-admin-api",
  "clickhouse-admin-types",
  "clickward",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6316,7 +6386,7 @@ dependencies = [
  "cockroach-admin-api",
  "cockroach-admin-types",
  "csv",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6358,7 +6428,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "hex",
@@ -6372,8 +6442,8 @@ dependencies = [
  "once_cell",
  "oxnet",
  "parse-display",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
+ "progenitor-client 0.8.0",
  "proptest",
  "rand",
  "regress 0.9.1",
@@ -6403,7 +6473,7 @@ dependencies = [
  "either",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-client 0.8.0",
  "reqwest 0.12.7",
  "serde",
  "sled-hardware-types",
@@ -6419,7 +6489,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "libc",
@@ -6459,7 +6529,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "gateway-api",
@@ -6503,7 +6573,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "internal-dns",
  "live-tests-macros",
@@ -6572,7 +6642,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "fatfs",
  "futures",
@@ -6641,7 +6711,7 @@ dependencies = [
  "petgraph",
  "pq-sys",
  "pretty_assertions",
- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-client 0.8.0",
  "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
  "rand",
  "rcgen",
@@ -6698,7 +6768,7 @@ dependencies = [
  "crucible-agent-client",
  "csv",
  "diesel",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "dyn-clone",
  "expectorate",
  "futures",
@@ -6863,7 +6933,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "flate2",
  "flume",
@@ -6951,7 +7021,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "filetime",
  "futures",
@@ -7198,7 +7268,7 @@ dependencies = [
  "clickhouse-admin-api",
  "cockroach-admin-api",
  "dns-server-api",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "fs-err",
  "gateway-api",
  "indent_write",
@@ -7368,7 +7438,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "rand",
  "regress 0.9.1",
  "reqwest 0.12.7",
@@ -7417,7 +7487,7 @@ name = "oximeter-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -7433,7 +7503,7 @@ dependencies = [
  "futures",
  "omicron-common",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "reqwest 0.12.7",
  "serde",
  "slog",
@@ -7448,7 +7518,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "httpmock",
@@ -7498,7 +7568,7 @@ dependencies = [
  "criterion",
  "crossterm 0.28.1",
  "display-error-chain",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "futures",
  "gethostname",
@@ -7543,7 +7613,7 @@ version = "0.1.0"
 dependencies = [
  "cfg-if",
  "chrono",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "http 1.1.0",
  "hyper 1.4.1",
@@ -7579,7 +7649,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "internal-dns",
  "nexus-client",
  "omicron-common",
@@ -8303,9 +8373,9 @@ dependencies = [
 
 [[package]]
 name = "postgres-types"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9"
+checksum = "f66ea23a2d0e5734297357705193335e0a957696f34bed2f2faefacb2fec336f"
 dependencies = [
  "bytes",
  "chrono",
@@ -8468,11 +8538,12 @@ dependencies = [
 [[package]]
 name = "progenitor"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
 dependencies = [
  "progenitor-client 0.7.0",
  "progenitor-impl 0.7.0",
  "progenitor-macro 0.7.0",
+ "serde_json",
 ]
 
 [[package]]
@@ -8481,30 +8552,20 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331"
 dependencies = [
- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "progenitor-impl 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "progenitor-macro 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "progenitor"
-version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
-dependencies = [
- "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "progenitor-impl 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
- "progenitor-macro 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-client 0.8.0",
+ "progenitor-impl 0.8.0",
+ "progenitor-macro 0.8.0",
 ]
 
 [[package]]
 name = "progenitor-client"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
 dependencies = [
  "bytes",
  "futures-core",
  "percent-encoding",
- "reqwest 0.12.7",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -8525,27 +8586,14 @@ dependencies = [
  "serde_urlencoded",
 ]
 
-[[package]]
-name = "progenitor-client"
-version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
-dependencies = [
- "bytes",
- "futures-core",
- "percent-encoding",
- "reqwest 0.12.7",
- "serde",
- "serde_json",
- "serde_urlencoded",
-]
-
 [[package]]
 name = "progenitor-impl"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
 dependencies = [
+ "getopts",
  "heck 0.5.0",
- "http 1.1.0",
+ "http 0.2.12",
  "indexmap 2.5.0",
  "openapiv3",
  "proc-macro2",
@@ -8556,7 +8604,7 @@ dependencies = [
  "serde_json",
  "syn 2.0.77",
  "thiserror",
- "typify 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "typify 0.1.0",
  "unicode-ident",
 ]
 
@@ -8578,35 +8626,14 @@ dependencies = [
  "serde_json",
  "syn 2.0.77",
  "thiserror",
- "typify 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-ident",
-]
-
-[[package]]
-name = "progenitor-impl"
-version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
-dependencies = [
- "heck 0.5.0",
- "http 1.1.0",
- "indexmap 2.5.0",
- "openapiv3",
- "proc-macro2",
- "quote",
- "regex",
- "schemars",
- "serde",
- "serde_json",
- "syn 2.0.77",
- "thiserror",
- "typify 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "typify 0.2.0",
  "unicode-ident",
 ]
 
 [[package]]
 name = "progenitor-macro"
 version = "0.7.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=dependabot/cargo/reqwest-0.12.4#ab69e4e7f5147f0f12deb84d03aa145e144d9e53"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#c59c6d64ed2a206bbbc9949abd3457bc0e3810e2"
 dependencies = [
  "openapiv3",
  "proc-macro2",
@@ -8628,24 +8655,7 @@ checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b"
 dependencies = [
  "openapiv3",
  "proc-macro2",
- "progenitor-impl 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote",
- "schemars",
- "serde",
- "serde_json",
- "serde_tokenstream",
- "serde_yaml",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "progenitor-macro"
-version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#4a9a8ddc10fb3dea3ea839b0b7520c7f6b4ef682"
-dependencies = [
- "openapiv3",
- "proc-macro2",
- "progenitor-impl 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor-impl 0.8.0",
  "quote",
  "schemars",
  "serde",
@@ -8663,7 +8673,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "rand",
  "reqwest 0.12.7",
  "schemars",
@@ -8684,7 +8694,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "futures",
- "progenitor 0.8.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)",
+ "progenitor 0.7.0",
  "rand",
  "reqwest 0.11.27",
  "schemars",
@@ -8706,10 +8716,10 @@ dependencies = [
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.10.2-dev",
  "futures",
  "hyper 1.4.1",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "propolis_types",
  "rand",
  "reqwest 0.12.7",
@@ -9028,7 +9038,7 @@ dependencies = [
  "camino-tempfile",
  "clap",
  "dns-service-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "expectorate",
  "humantime",
  "indexmap 2.5.0",
@@ -9070,15 +9080,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.1"
@@ -10358,7 +10359,7 @@ name = "sled-agent-api"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -10382,7 +10383,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -10729,7 +10730,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "gateway-messages",
  "gateway-types",
@@ -11212,9 +11213,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
 dependencies = [
  "filetime",
  "libc",
@@ -11558,9 +11559,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-postgres"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3"
+checksum = "3b5d3742945bc7d7f210693b0c58ae542c6fd47b17adbbda0885f3dcb34a6bdb"
 dependencies = [
  "async-trait",
  "byteorder",
@@ -12015,34 +12016,33 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "typify"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/typify#ad1296f6ceb998ae8c247d999b7828703a232bdd"
 dependencies = [
- "typify-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "typify-macro 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typify-impl 0.1.0",
+ "typify-macro 0.1.0",
 ]
 
 [[package]]
 name = "typify"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/typify#50d969668dcad42300423f893de9b3903f11b65c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a"
 dependencies = [
- "typify-impl 0.2.0 (git+https://github.com/oxidecomputer/typify)",
- "typify-macro 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "typify-impl 0.2.0",
+ "typify-macro 0.2.0",
 ]
 
 [[package]]
 name = "typify-impl"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/typify#ad1296f6ceb998ae8c247d999b7828703a232bdd"
 dependencies = [
  "heck 0.5.0",
  "log",
  "proc-macro2",
  "quote",
- "regress 0.10.1",
+ "regress 0.9.1",
  "schemars",
  "semver 1.0.23",
  "serde",
@@ -12055,7 +12055,8 @@ dependencies = [
 [[package]]
 name = "typify-impl"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/typify#50d969668dcad42300423f893de9b3903f11b65c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11"
 dependencies = [
  "heck 0.5.0",
  "log",
@@ -12073,9 +12074,8 @@ dependencies = [
 
 [[package]]
 name = "typify-macro"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/typify#ad1296f6ceb998ae8c247d999b7828703a232bdd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12085,13 +12085,14 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "syn 2.0.77",
- "typify-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typify-impl 0.1.0",
 ]
 
 [[package]]
 name = "typify-macro"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/typify#50d969668dcad42300423f893de9b3903f11b65c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12101,7 +12102,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "syn 2.0.77",
- "typify-impl 0.2.0 (git+https://github.com/oxidecomputer/typify)",
+ "typify-impl 0.2.0",
 ]
 
 [[package]]
@@ -12226,7 +12227,7 @@ dependencies = [
  "clap",
  "debug-ignore",
  "display-error-chain",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "futures",
  "hex",
  "hubtools",
@@ -12629,11 +12630,11 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.1",
  "wasite",
  "web-sys",
 ]
@@ -12695,7 +12696,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dpd-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "gateway-client",
  "maplit",
  "omicron-common",
@@ -12751,7 +12752,7 @@ dependencies = [
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "either",
  "expectorate",
  "flate2",
@@ -12819,7 +12820,7 @@ name = "wicketd-api"
 version = "0.1.0"
 dependencies = [
  "bootstrap-agent-client",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "gateway-client",
  "omicron-common",
  "omicron-passwords",
@@ -12841,7 +12842,7 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "progenitor 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor 0.8.0",
  "regress 0.9.1",
  "reqwest 0.12.7",
  "schemars",
@@ -13318,7 +13319,7 @@ dependencies = [
  "anyhow",
  "camino",
  "clap",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "illumos-utils",
  "omicron-common",
  "omicron-sled-agent",
diff --git a/Cargo.toml b/Cargo.toml
index 84758339b3..0b60487e27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -349,7 +349,7 @@ dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { path = "clients/dpd-client" }
-dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
+dropshot = { version = "0.12.0", features = [ "usdt-probes" ] }
 dyn-clone = "1.0.17"
 either = "1.13.0"
 expectorate = "1.1.0"

From e562f5641f73e9cb3cc195f387e19b129fff0fd7 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 15:35:44 -0700
Subject: [PATCH 27/29] leave the old maghemite

---
 Cargo.lock                          | 55 +++++++++++++++--------------
 Cargo.toml                          |  7 ++--
 clients/ddm-admin-client/Cargo.toml |  1 +
 clients/ddm-admin-client/src/lib.rs |  4 +--
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 568f4b6367..5a59337cf1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -663,7 +663,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
 dependencies = [
  "bhyve_api_sys",
  "libc",
@@ -673,7 +673,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
 dependencies = [
  "libc",
  "strum",
@@ -1728,7 +1728,7 @@ dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.10.2-dev",
+ "dropshot 0.12.1-dev",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -1975,12 +1975,12 @@ dependencies = [
 [[package]]
 name = "ddm-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#1dbbe4944631efb962a311c13b70f883a6a845dc"
+source = "git+https://github.com/oxidecomputer/maghemite?rev=9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42#9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42"
 dependencies = [
  "oxnet",
  "percent-encoding",
  "progenitor 0.7.0",
- "reqwest 0.12.7",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "slog",
@@ -2443,8 +2443,9 @@ dependencies = [
 
 [[package]]
 name = "dropshot"
-version = "0.10.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#06c8dab40e28d313f8bb0e15e1027eeace3bce89"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab804b8d4ab58d96e1e19c8ef87e1747a70d2819e92b659d6fe8d5ac5ac44d50"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2453,12 +2454,14 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.10.2-dev",
+ "dropshot_endpoint 0.12.0",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
  "indexmap 2.5.0",
  "multer",
  "openapiv3",
@@ -2489,9 +2492,8 @@ dependencies = [
 
 [[package]]
 name = "dropshot"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab804b8d4ab58d96e1e19c8ef87e1747a70d2819e92b659d6fe8d5ac5ac44d50"
+version = "0.12.1-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2500,7 +2502,7 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.12.0",
+ "dropshot_endpoint 0.12.1-dev",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2551,8 +2553,9 @@ dependencies = [
 
 [[package]]
 name = "dropshot_endpoint"
-version = "0.10.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#06c8dab40e28d313f8bb0e15e1027eeace3bce89"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796be76b11b79de0decd7be2105add01220f8bbe04cf1f83214c0b801414a722"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2564,9 +2567,8 @@ dependencies = [
 
 [[package]]
 name = "dropshot_endpoint"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "796be76b11b79de0decd7be2105add01220f8bbe04cf1f83214c0b801414a722"
+version = "0.12.1-dev"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -4051,7 +4053,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -5215,13 +5217,13 @@ dependencies = [
 [[package]]
 name = "mg-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#1dbbe4944631efb962a311c13b70f883a6a845dc"
+source = "git+https://github.com/oxidecomputer/maghemite?rev=9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42#9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42"
 dependencies = [
  "anyhow",
  "chrono",
  "percent-encoding",
  "progenitor 0.7.0",
- "reqwest 0.12.7",
+ "reqwest 0.11.27",
  "schemars",
  "serde",
  "serde_json",
@@ -6474,6 +6476,7 @@ dependencies = [
  "omicron-common",
  "omicron-workspace-hack",
  "progenitor-client 0.8.0",
+ "reqwest 0.11.27",
  "reqwest 0.12.7",
  "serde",
  "sled-hardware-types",
@@ -8668,7 +8671,7 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -8710,13 +8713,13 @@ dependencies = [
 [[package]]
 name = "propolis-mock-server"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
 dependencies = [
  "anyhow",
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.10.2-dev",
+ "dropshot 0.12.0",
  "futures",
  "hyper 1.4.1",
  "progenitor 0.8.0",
@@ -8752,7 +8755,7 @@ dependencies = [
 [[package]]
 name = "propolis_types"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#9035d46325f70b7a3c5dffc170b4d32788ca5cfb"
+source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
 dependencies = [
  "schemars",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 0b60487e27..801ddc6187 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/clients/ddm-admin-client/Cargo.toml b/clients/ddm-admin-client/Cargo.toml
index 298f58ac0d..6bc556c94a 100644
--- a/clients/ddm-admin-client/Cargo.toml
+++ b/clients/ddm-admin-client/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
diff --git a/clients/ddm-admin-client/src/lib.rs b/clients/ddm-admin-client/src/lib.rs
index d15de8c0ca..2d62c3fd78 100644
--- a/clients/ddm-admin-client/src/lib.rs
+++ b/clients/ddm-admin-client/src/lib.rs
@@ -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()?;

From 5ff9f007fa06b4a31255f7de4066f7c8896e5a97 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 15:40:56 -0700
Subject: [PATCH 28/29] hakari

---
 Cargo.lock                |  1 -
 workspace-hack/Cargo.toml | 38 ++++++++++++++------------------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a59337cf1..66386e15b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7156,7 +7156,6 @@ dependencies = [
  "ring 0.17.8",
  "rsa",
  "rustix",
- "rustls 0.21.12",
  "rustls 0.23.10",
  "schemars",
  "scopeguard",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 07c0fbe90c..522e71fc1b 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -83,7 +83,7 @@ peg-runtime = { version = "0.8.3", default-features = false, features = ["std"]
 pem-rfc7468 = { version = "0.7.0", default-features = false, features = ["std"] }
 petgraph = { version = "0.6.5", features = ["serde-1"] }
 pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption", "pem", "std"] }
-postgres-types = { version = "0.2.7", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
+postgres-types = { version = "0.2.8", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 predicates = { version = "3.1.2" }
 proc-macro2 = { version = "1.0.86" }
 quote = { version = "1.0.37" }
@@ -91,7 +91,7 @@ regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.6", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
 regex-syntax = { version = "0.8.4" }
 reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12.7", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
-reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", default-features = false, features = ["rustls-tls", "stream"] }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json", "rustls-tls", "stream"] }
 ring = { version = "0.17.8", features = ["std"] }
 rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
@@ -110,7 +110,7 @@ subtle = { version = "2.5.0" }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.77", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
 tokio = { version = "1.39.3", features = ["full", "test-util"] }
-tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
+tokio-postgres = { version = "0.7.12", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-stream = { version = "0.1.16", features = ["net", "sync"] }
 tokio-util = { version = "0.7.12", features = ["codec", "io-util"] }
 toml = { version = "0.7.8" }
@@ -194,7 +194,7 @@ peg-runtime = { version = "0.8.3", default-features = false, features = ["std"]
 pem-rfc7468 = { version = "0.7.0", default-features = false, features = ["std"] }
 petgraph = { version = "0.6.5", features = ["serde-1"] }
 pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption", "pem", "std"] }
-postgres-types = { version = "0.2.7", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
+postgres-types = { version = "0.2.8", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 predicates = { version = "3.1.2" }
 proc-macro2 = { version = "1.0.86" }
 quote = { version = "1.0.37" }
@@ -202,7 +202,7 @@ regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.6", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
 regex-syntax = { version = "0.8.4" }
 reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12.7", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] }
-reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", default-features = false, features = ["rustls-tls", "stream"] }
+reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json", "rustls-tls", "stream"] }
 ring = { version = "0.17.8", features = ["std"] }
 rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
@@ -223,7 +223,7 @@ syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.77", features = ["extra
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
 time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
 tokio = { version = "1.39.3", features = ["full", "test-util"] }
-tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
+tokio-postgres = { version = "0.7.12", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-stream = { version = "0.1.16", features = ["net", "sync"] }
 tokio-util = { version = "0.7.12", features = ["codec", "io-util"] }
 toml = { version = "0.7.8" }
@@ -250,8 +250,7 @@ linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
@@ -265,8 +264,7 @@ linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
@@ -278,8 +276,7 @@ hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
@@ -291,8 +288,7 @@ hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
@@ -304,8 +300,7 @@ hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
@@ -317,8 +312,7 @@ hyper-util = { version = "0.1.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 
@@ -331,10 +325,8 @@ hyper-util = { version = "0.1.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
-reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
@@ -348,10 +340,8 @@ hyper-util = { version = "0.1.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
-reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11.27", features = ["json"] }
 rustix = { version = "0.38.34", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] }
-rustls-2b5c6dc72f624058 = { package = "rustls", version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-rustls-647d43efb71741da = { package = "rustls", version = "0.21.12", features = ["dangerous_configuration"] }
+rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }

From 0742018b3c4e94084818dde880b92e15f1ab0d29 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Thu, 26 Sep 2024 20:16:17 -0700
Subject: [PATCH 29/29] switch to crucible and propolis main revs

---
 Cargo.lock | 87 ++++++++----------------------------------------------
 Cargo.toml | 21 +++++--------
 2 files changed, 20 insertions(+), 88 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 66386e15b0..9e53405d13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -663,7 +663,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
 dependencies = [
  "bhyve_api_sys",
  "libc",
@@ -673,7 +673,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
 dependencies = [
  "libc",
  "strum",
@@ -1707,7 +1707,7 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
+source = "git+https://github.com/oxidecomputer/crucible?rev=74286f952a2953cd08512015076f0947050deba7#74286f952a2953cd08512015076f0947050deba7"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1723,12 +1723,12 @@ dependencies = [
 [[package]]
 name = "crucible-common"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
+source = "git+https://github.com/oxidecomputer/crucible?rev=74286f952a2953cd08512015076f0947050deba7#74286f952a2953cd08512015076f0947050deba7"
 dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.12.1-dev",
+ "dropshot 0.12.0",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -1753,7 +1753,7 @@ dependencies = [
 [[package]]
 name = "crucible-pantry-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
+source = "git+https://github.com/oxidecomputer/crucible?rev=74286f952a2953cd08512015076f0947050deba7#74286f952a2953cd08512015076f0947050deba7"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1770,7 +1770,7 @@ dependencies = [
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#e712665aa838c706e695c77e0e7637b29f88fa2c"
+source = "git+https://github.com/oxidecomputer/crucible?rev=74286f952a2953cd08512015076f0947050deba7#74286f952a2953cd08512015076f0947050deba7"
 dependencies = [
  "crucible-workspace-hack",
  "libc",
@@ -2490,54 +2490,6 @@ dependencies = [
  "waitgroup",
 ]
 
-[[package]]
-name = "dropshot"
-version = "0.12.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
-dependencies = [
- "async-stream",
- "async-trait",
- "base64 0.22.1",
- "bytes",
- "camino",
- "chrono",
- "debug-ignore",
- "dropshot_endpoint 0.12.1-dev",
- "form_urlencoded",
- "futures",
- "hostname 0.4.0",
- "http 1.1.0",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "indexmap 2.5.0",
- "multer",
- "openapiv3",
- "paste",
- "percent-encoding",
- "rustls 0.22.4",
- "rustls-pemfile 2.1.3",
- "schemars",
- "scopeguard",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
- "slog",
- "slog-async",
- "slog-bunyan",
- "slog-json",
- "slog-term",
- "tokio",
- "tokio-rustls 0.25.0",
- "toml 0.8.19",
- "usdt",
- "uuid",
- "version_check",
- "waitgroup",
-]
-
 [[package]]
 name = "dropshot_endpoint"
 version = "0.10.1"
@@ -2565,19 +2517,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "dropshot_endpoint"
-version = "0.12.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#7d8cd2205072e93119856d90e6766dae29554a22"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "serde",
- "serde_tokenstream",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "dsl_auto_type"
 version = "0.1.2"
@@ -6715,7 +6654,7 @@ dependencies = [
  "pq-sys",
  "pretty_assertions",
  "progenitor-client 0.8.0",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2)",
  "rand",
  "rcgen",
  "ref-cast",
@@ -6973,7 +6912,7 @@ dependencies = [
  "oximeter-producer",
  "oxnet",
  "pretty_assertions",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2)",
  "propolis-mock-server",
  "rand",
  "rcgen",
@@ -8670,7 +8609,7 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -8712,7 +8651,7 @@ dependencies = [
 [[package]]
 name = "propolis-mock-server"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
 dependencies = [
  "anyhow",
  "atty",
@@ -8754,7 +8693,7 @@ dependencies = [
 [[package]]
 name = "propolis_types"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#156c0936f7fffdaf49cc1e7f993857a0e16165f2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
 dependencies = [
  "schemars",
  "serde",
@@ -10411,7 +10350,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)",
+ "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2)",
  "rcgen",
  "schemars",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 801ddc6187..813aac9183 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -325,14 +325,10 @@ cookie = "0.18"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
 crossterm = { version = "0.28.1", features = ["event-stream"] }
-# crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "a551f245e8a26f52098382903ccf0a982b7c54fa"}
-# crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "a551f245e8a26f52098382903ccf0a982b7c54fa"}
-# crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "a551f245e8a26f52098382903ccf0a982b7c54fa"}
-# crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "a551f245e8a26f52098382903ccf0a982b7c54fa"}
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", branch = "hyper-v1"}
-crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", branch = "hyper-v1" }
-crucible-smf = { git = "https://github.com/oxidecomputer/crucible", branch = "hyper-v1" }
-crucible-common = { git = "https://github.com/oxidecomputer/crucible", branch = "hyper-v1" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "74286f952a2953cd08512015076f0947050deba7" }
+crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "74286f952a2953cd08512015076f0947050deba7" }
+crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "74286f952a2953cd08512015076f0947050deba7" }
+crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "74286f952a2953cd08512015076f0947050deba7" }
 csv = "1.3.0"
 curve25519-dalek = "4"
 datatest-stable = "0.2.9"
@@ -513,12 +509,9 @@ prettyplease = { version = "0.2.22", features = ["verbatim"] }
 proc-macro2 = "1.0"
 progenitor = "0.8.0"
 progenitor-client = "0.8.0"
-# bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
-# propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "a9c5fdac442fa6fd5a65e413ea874fe3c62c3fd9" }
-# propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "a9c5fdac442fa6fd5a65e413ea874fe3c62c3fd9" }
-bhyve_api = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", branch = "hyper-v1" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "4ba9c33817c89d5d48b96e037a64421fb7a026e2" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "4ba9c33817c89d5d48b96e037a64421fb7a026e2" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "4ba9c33817c89d5d48b96e037a64421fb7a026e2" }
 proptest = "1.5.0"
 qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master" }
 quote = "1.0"