From 2f7defda962361897ff5c9beb8ebf09487544a1b Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 03:10:01 +0000
Subject: [PATCH] Update Rust crate hyper to v1

---
 Cargo.lock                | 33 ++++++++++++++++++---------------
 Cargo.toml                |  2 +-
 workspace-hack/Cargo.toml | 14 ++++++++++++--
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1df69b6086..e3ad2a11412 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2307,7 +2307,7 @@ dependencies = [
  "dhcproto",
  "http 0.2.12",
  "humantime",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "internet-checksum",
  "ispf",
  "macaddr",
@@ -3357,9 +3357,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3369,6 +3369,7 @@ dependencies = [
  "httparse",
  "itoa",
  "pin-project-lite",
+ "smallvec 1.13.1",
  "tokio",
  "want",
 ]
@@ -3395,7 +3396,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
  "http 1.0.0",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "hyper-util",
  "log",
  "rustls 0.22.2",
@@ -3449,7 +3450,7 @@ dependencies = [
  "futures-util",
  "http 1.0.0",
  "http-body 1.0.0",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "pin-project-lite",
  "socket2 0.5.5",
  "tokio",
@@ -3712,7 +3713,7 @@ dependencies = [
  "clap 4.5.1",
  "dropshot",
  "expectorate",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "installinator-common",
  "omicron-common",
  "omicron-test-utils",
@@ -3768,7 +3769,7 @@ dependencies = [
  "dropshot",
  "expectorate",
  "futures",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "omicron-common",
  "omicron-test-utils",
  "omicron-workspace-hack",
@@ -4623,7 +4624,7 @@ dependencies = [
  "gateway-client",
  "headers",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "hyper-rustls 0.26.0",
  "illumos-utils",
  "internal-dns",
@@ -4878,7 +4879,7 @@ dependencies = [
  "gateway-test-utils",
  "headers",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "illumos-utils",
  "internal-dns",
  "nexus-config",
@@ -5346,7 +5347,7 @@ dependencies = [
  "gateway-test-utils",
  "hex",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "illumos-utils",
  "ipcc",
  "omicron-common",
@@ -5408,7 +5409,7 @@ dependencies = [
  "http 0.2.12",
  "httptest",
  "hubtools",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "hyper-rustls 0.26.0",
  "illumos-utils",
  "internal-dns",
@@ -5642,7 +5643,7 @@ dependencies = [
  "guppy",
  "hex",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "hyper-staticfile",
  "illumos-utils",
  "installinator-common",
@@ -5801,6 +5802,7 @@ dependencies = [
  "hex",
  "hmac",
  "hyper 0.14.28",
+ "hyper 1.2.0",
  "indexmap 2.2.5",
  "inout",
  "ipnetwork",
@@ -5840,6 +5842,7 @@ dependencies = [
  "sha2",
  "similar",
  "slog",
+ "smallvec 1.13.1",
  "spin 0.9.8",
  "string_cache",
  "subtle",
@@ -6075,7 +6078,7 @@ dependencies = [
  "chrono",
  "futures",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "omicron-workspace-hack",
  "progenitor",
  "rand 0.8.5",
@@ -6152,7 +6155,7 @@ dependencies = [
  "dropshot",
  "expectorate",
  "futures",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "internal-dns",
  "nexus-client",
  "nexus-types",
@@ -11049,7 +11052,7 @@ dependencies = [
  "hex",
  "http 0.2.12",
  "hubtools",
- "hyper 0.14.28",
+ "hyper 1.2.0",
  "illumos-utils",
  "installinator",
  "installinator-artifact-client",
diff --git a/Cargo.toml b/Cargo.toml
index a384c8bed6a..21fc8cbd281 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -242,7 +242,7 @@ http = "0.2.12"
 httptest = "0.15.5"
 hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" }
 humantime = "2.1.0"
-hyper = "0.14"
+hyper = "1.2"
 hyper-rustls = "0.26.0"
 hyper-staticfile = "0.9.5"
 illumos-utils = { path = "illumos-utils" }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index a2d853ac230..ca7d715ef67 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -57,7 +57,7 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] }
 hashbrown = { version = "0.14.3", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper = { version = "0.14.28", features = ["full"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.2.0", features = ["client", "http1"] }
 indexmap = { version = "2.2.5", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
@@ -94,6 +94,7 @@ serde_json = { version = "1.0.114", features = ["raw_value", "unbounded_depth"]
 sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.4.0", features = ["inline", "unicode"] }
 slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
+smallvec = { version = "1.13.1", default-features = false, features = ["const_new"] }
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
@@ -162,7 +163,7 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] }
 hashbrown = { version = "0.14.3", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper = { version = "0.14.28", features = ["full"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.2.0", features = ["client", "http1"] }
 indexmap = { version = "2.2.5", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
@@ -199,6 +200,7 @@ serde_json = { version = "1.0.114", features = ["raw_value", "unbounded_depth"]
 sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.4.0", features = ["inline", "unicode"] }
 slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
+smallvec = { version = "1.13.1", default-features = false, features = ["const_new"] }
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
@@ -227,6 +229,7 @@ zip = { version = "0.6.6", default-features = false, features = ["bzip2", "defla
 [target.x86_64-unknown-linux-gnu.dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
@@ -234,30 +237,35 @@ rustix = { version = "0.38.31", features = ["fs", "termios"] }
 [target.x86_64-unknown-linux-gnu.build-dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
 
 [target.x86_64-apple-darwin.dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
 
 [target.x86_64-apple-darwin.build-dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
 
 [target.aarch64-apple-darwin.dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
 
 [target.aarch64-apple-darwin.build-dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
@@ -265,6 +273,7 @@ rustix = { version = "0.38.31", features = ["fs", "termios"] }
 [target.x86_64-unknown-illumos.dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }
@@ -274,6 +283,7 @@ toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", featu
 [target.x86_64-unknown-illumos.build-dependencies]
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.2", default-features = false, features = ["std"] }
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
 mio = { version = "0.8.11", features = ["net", "os-ext"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.31", features = ["fs", "termios"] }