From 8e5ef402837843d2af3f64ded2397e02e0613aba Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 4 Oct 2024 11:39:34 -0700
Subject: [PATCH] [dependencies] update qorb (#6773)

This removes the last use of the previous Dropshot version.
---
 Cargo.lock                | 158 ++++++++++++--------------------------
 workspace-hack/Cargo.toml |  12 +--
 2 files changed, 51 insertions(+), 119 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c319e3f24..b427d779ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -876,7 +876,7 @@ dependencies = [
 name = "bootstrap-agent-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.12.0",
+ "dropshot",
  "nexus-client",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -1141,7 +1141,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "libc",
  "omicron-common",
@@ -1287,7 +1287,7 @@ name = "clickhouse-admin-api"
 version = "0.1.0"
 dependencies = [
  "clickhouse-admin-types",
- "dropshot 0.12.0",
+ "dropshot",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1367,7 +1367,7 @@ name = "cockroach-admin-api"
 version = "0.1.0"
 dependencies = [
  "cockroach-admin-types",
- "dropshot 0.12.0",
+ "dropshot",
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
@@ -1592,7 +1592,7 @@ name = "crdb-seed"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.12.0",
+ "dropshot",
  "omicron-test-utils",
  "omicron-workspace-hack",
  "slog",
@@ -1757,7 +1757,7 @@ dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.12.0",
+ "dropshot",
  "nix 0.29.0",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -2318,7 +2318,7 @@ dependencies = [
  "clap",
  "dns-server-api",
  "dns-service-client",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "hickory-client",
  "hickory-proto",
@@ -2351,7 +2351,7 @@ name = "dns-server-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.12.0",
+ "dropshot",
  "omicron-workspace-hack",
  "schemars",
  "serde",
@@ -2424,52 +2424,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "dropshot"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a391eeedf8a75a188eb670327c704b7ab10eb2bb890e2ec0880dd21d609fb6e8"
-dependencies = [
- "async-stream",
- "async-trait",
- "base64 0.22.1",
- "bytes",
- "camino",
- "chrono",
- "debug-ignore",
- "dropshot_endpoint 0.10.1",
- "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",
- "uuid",
- "version_check",
- "waitgroup",
-]
-
 [[package]]
 name = "dropshot"
 version = "0.12.0"
@@ -2483,7 +2437,7 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.12.0",
+ "dropshot_endpoint",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -2519,19 +2473,6 @@ dependencies = [
  "waitgroup",
 ]
 
-[[package]]
-name = "dropshot_endpoint"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9058c9c7e4a6b378cd12e71dc155bb15d0d4f8e1e6039ce2cf0a7c0c81043e33"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_tokenstream",
- "syn 2.0.79",
-]
-
 [[package]]
 name = "dropshot_endpoint"
 version = "0.12.0"
@@ -3191,7 +3132,7 @@ dependencies = [
 name = "gateway-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.12.0",
+ "dropshot",
  "gateway-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -3296,7 +3237,7 @@ name = "gateway-test-utils"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.12.0",
+ "dropshot",
  "gateway-messages",
  "gateway-types",
  "omicron-gateway",
@@ -4012,7 +3953,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -4392,7 +4333,7 @@ name = "installinator-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.12.0",
+ "dropshot",
  "hyper 1.4.1",
  "installinator-common",
  "omicron-common",
@@ -4460,7 +4401,7 @@ dependencies = [
  "chrono",
  "dns-server",
  "dns-service-client",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "hickory-resolver",
@@ -4487,7 +4428,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "hickory-resolver",
  "internal-dns",
  "omicron-common",
@@ -5376,7 +5317,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "cookie",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "headers",
  "http 1.1.0",
@@ -5433,7 +5374,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "camino",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "libc",
  "omicron-common",
@@ -5526,7 +5467,7 @@ dependencies = [
  "db-macros",
  "diesel",
  "diesel-dtrace",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "gateway-client",
@@ -5608,7 +5549,7 @@ name = "nexus-external-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dropshot 0.12.0",
+ "dropshot",
  "http 1.1.0",
  "hyper 1.4.1",
  "ipnetwork",
@@ -5625,7 +5566,7 @@ dependencies = [
 name = "nexus-internal-api"
 version = "0.1.0"
 dependencies = [
- "dropshot 0.12.0",
+ "dropshot",
  "nexus-types",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -5891,7 +5832,7 @@ dependencies = [
  "crucible-agent-client",
  "dns-server",
  "dns-service-client",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "gateway-messages",
  "gateway-test-utils",
@@ -5952,7 +5893,7 @@ dependencies = [
  "derive-where",
  "derive_more",
  "dns-service-client",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "gateway-client",
  "http 1.1.0",
@@ -6292,7 +6233,7 @@ dependencies = [
  "clickhouse-admin-api",
  "clickhouse-admin-types",
  "clickward",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6331,7 +6272,7 @@ dependencies = [
  "cockroach-admin-api",
  "cockroach-admin-types",
  "csv",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "http 1.1.0",
  "illumos-utils",
@@ -6373,7 +6314,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "hex",
@@ -6433,7 +6374,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "libc",
@@ -6473,7 +6414,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "gateway-api",
@@ -6517,7 +6458,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "internal-dns",
  "live-tests-macros",
@@ -6586,7 +6527,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "fatfs",
  "futures",
@@ -6712,7 +6653,7 @@ dependencies = [
  "crucible-agent-client",
  "csv",
  "diesel",
- "dropshot 0.12.0",
+ "dropshot",
  "dyn-clone",
  "expectorate",
  "futures",
@@ -6877,7 +6818,7 @@ dependencies = [
  "dns-server",
  "dns-service-client",
  "dpd-client",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "flate2",
  "flume",
@@ -6966,7 +6907,7 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "chrono",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "filetime",
  "futures",
@@ -7058,7 +6999,6 @@ dependencies = [
  "hex",
  "hickory-proto",
  "hmac",
- "hyper 0.14.30",
  "hyper 1.4.1",
  "hyper-rustls 0.27.3",
  "hyper-util",
@@ -7211,7 +7151,7 @@ dependencies = [
  "clickhouse-admin-api",
  "cockroach-admin-api",
  "dns-server-api",
- "dropshot 0.12.0",
+ "dropshot",
  "fs-err",
  "gateway-api",
  "indent_write",
@@ -7430,7 +7370,7 @@ name = "oximeter-api"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dropshot 0.12.0",
+ "dropshot",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -7461,7 +7401,7 @@ dependencies = [
  "camino",
  "chrono",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "httpmock",
@@ -7511,7 +7451,7 @@ dependencies = [
  "criterion",
  "crossterm 0.28.1",
  "display-error-chain",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "futures",
  "gethostname",
@@ -7556,7 +7496,7 @@ version = "0.1.0"
 dependencies = [
  "cfg-if",
  "chrono",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "http 1.1.0",
  "hyper 1.4.1",
@@ -7592,7 +7532,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "internal-dns",
  "nexus-client",
  "omicron-common",
@@ -8595,7 +8535,7 @@ dependencies = [
  "atty",
  "base64 0.21.7",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "hyper 1.4.1",
  "progenitor",
@@ -8689,13 +8629,13 @@ dependencies = [
 [[package]]
 name = "qorb"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/qorb?branch=master#163a77838a3cfe8f7741d32e443f76d995b89df3"
+source = "git+https://github.com/oxidecomputer/qorb?branch=master#9d0cdc4861f8d10cadd90c278e36b8dd833561ec"
 dependencies = [
  "anyhow",
  "async-trait",
  "debug-ignore",
  "derive-where",
- "dropshot 0.10.1",
+ "dropshot",
  "futures",
  "hickory-resolver",
  "rand",
@@ -8930,7 +8870,7 @@ dependencies = [
  "camino-tempfile",
  "clap",
  "dns-service-client",
- "dropshot 0.12.0",
+ "dropshot",
  "expectorate",
  "humantime",
  "indexmap 2.5.0",
@@ -10243,7 +10183,7 @@ name = "sled-agent-api"
 version = "0.1.0"
 dependencies = [
  "camino",
- "dropshot 0.12.0",
+ "dropshot",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-uuid-kinds",
@@ -10614,7 +10554,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "gateway-messages",
  "gateway-types",
@@ -12068,7 +12008,7 @@ dependencies = [
  "clap",
  "debug-ignore",
  "display-error-chain",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "hex",
  "hubtools",
@@ -12531,7 +12471,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dpd-client",
- "dropshot 0.12.0",
+ "dropshot",
  "gateway-client",
  "maplit",
  "omicron-common",
@@ -12587,7 +12527,7 @@ dependencies = [
  "debug-ignore",
  "display-error-chain",
  "dpd-client",
- "dropshot 0.12.0",
+ "dropshot",
  "either",
  "expectorate",
  "flate2",
@@ -12655,7 +12595,7 @@ name = "wicketd-api"
 version = "0.1.0"
 dependencies = [
  "bootstrap-agent-client",
- "dropshot 0.12.0",
+ "dropshot",
  "gateway-client",
  "omicron-common",
  "omicron-passwords",
@@ -13154,7 +13094,7 @@ dependencies = [
  "anyhow",
  "camino",
  "clap",
- "dropshot 0.12.0",
+ "dropshot",
  "illumos-utils",
  "omicron-common",
  "omicron-sled-agent",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 00f377503d..78dca016fd 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -62,7 +62,7 @@ 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-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["full"] }
+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" }
@@ -172,7 +172,7 @@ 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-dff4ba8e3ae991db = { package = "hyper", version = "1.4.1", features = ["full"] }
+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" }
@@ -241,7 +241,6 @@ 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.9", features = ["full"] }
 linux-raw-sys = { version = "0.4.14", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
@@ -255,7 +254,6 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 [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.9", features = ["full"] }
 linux-raw-sys = { version = "0.4.14", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "std", "system", "xdp"] }
@@ -268,7 +266,6 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 
 [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.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
@@ -280,7 +277,6 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 
 [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.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
@@ -292,7 +288,6 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 
 [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.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
@@ -304,7 +299,6 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 
 [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.9", features = ["full"] }
 mio = { version = "1.0.2", features = ["net", "os-ext"] }
@@ -317,7 +311,6 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg
 [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.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }
@@ -332,7 +325,6 @@ toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", featu
 [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.9", features = ["full"] }
 indicatif = { version = "0.17.8", features = ["rayon"] }