diff --git a/Cargo.lock b/Cargo.lock index a93912c9a32..5bf7233889b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2214,7 +2214,7 @@ dependencies = [ "dhcproto", "http 0.2.12", "humantime", - "hyper 0.14.28", + "hyper 1.2.0", "internet-checksum", "ispf", "macaddr", @@ -3242,9 +3242,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", @@ -3254,6 +3254,7 @@ dependencies = [ "httparse", "itoa", "pin-project-lite", + "smallvec 1.13.1", "tokio", "want", ] @@ -3280,7 +3281,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", @@ -3334,7 +3335,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", @@ -3596,7 +3597,7 @@ dependencies = [ "clap 4.5.1", "dropshot", "expectorate", - "hyper 0.14.28", + "hyper 1.2.0", "installinator-common", "omicron-common", "omicron-test-utils", @@ -3652,7 +3653,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper 0.14.28", + "hyper 1.2.0", "omicron-common", "omicron-test-utils", "omicron-workspace-hack", @@ -4452,7 +4453,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", @@ -4679,7 +4680,7 @@ dependencies = [ "gateway-test-utils", "headers", "http 0.2.12", - "hyper 0.14.28", + "hyper 1.2.0", "illumos-utils", "internal-dns", "nexus-config", @@ -5146,7 +5147,7 @@ dependencies = [ "gateway-test-utils", "hex", "http 0.2.12", - "hyper 0.14.28", + "hyper 1.2.0", "illumos-utils", "ipcc", "omicron-common", @@ -5208,7 +5209,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", @@ -5441,7 +5442,7 @@ dependencies = [ "guppy", "hex", "http 0.2.12", - "hyper 0.14.28", + "hyper 1.2.0", "hyper-staticfile", "illumos-utils", "installinator-common", @@ -5598,6 +5599,7 @@ dependencies = [ "hex", "hmac", "hyper 0.14.28", + "hyper 1.2.0", "indexmap 2.2.5", "inout", "ipnetwork", @@ -5637,6 +5639,7 @@ dependencies = [ "sha2", "similar", "slog", + "smallvec 1.13.1", "spin 0.9.8", "string_cache", "subtle", @@ -5872,7 +5875,7 @@ dependencies = [ "chrono", "futures", "http 0.2.12", - "hyper 0.14.28", + "hyper 1.2.0", "omicron-workspace-hack", "progenitor", "rand 0.8.5", @@ -5949,7 +5952,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper 0.14.28", + "hyper 1.2.0", "internal-dns", "nexus-client", "nexus-types", @@ -10664,7 +10667,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 6e5b23b6acc..182c028fa55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -237,7 +237,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"] }