diff --git a/Cargo.lock b/Cargo.lock index e15afdfbabe..a3c2a5fb2f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2159,7 +2159,7 @@ dependencies = [ "base64", "chrono", "http 0.2.11", - "hyper 0.14.27", + "hyper 1.1.0", "omicron-sled-agent", "omicron-test-utils", "omicron-workspace-hack", @@ -3526,7 +3526,7 @@ dependencies = [ "clap 4.5.0", "dropshot", "expectorate", - "hyper 0.14.27", + "hyper 1.1.0", "installinator-common", "omicron-common", "omicron-test-utils", @@ -3582,7 +3582,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper 0.14.27", + "hyper 1.1.0", "omicron-common", "omicron-test-utils", "omicron-workspace-hack", @@ -4376,7 +4376,7 @@ dependencies = [ "gateway-client", "headers", "http 0.2.11", - "hyper 0.14.27", + "hyper 1.1.0", "hyper-rustls 0.26.0", "illumos-utils", "internal-dns", @@ -4529,7 +4529,7 @@ dependencies = [ "gateway-test-utils", "headers", "http 0.2.11", - "hyper 0.14.27", + "hyper 1.1.0", "internal-dns", "nexus-db-queries", "nexus-test-interface", @@ -4958,7 +4958,7 @@ dependencies = [ "gateway-test-utils", "hex", "http 0.2.11", - "hyper 0.14.27", + "hyper 1.1.0", "illumos-utils", "ipcc", "omicron-common", @@ -5020,7 +5020,7 @@ dependencies = [ "http 0.2.11", "httptest", "hubtools", - "hyper 0.14.27", + "hyper 1.1.0", "hyper-rustls 0.26.0", "illumos-utils", "internal-dns", @@ -5245,7 +5245,7 @@ dependencies = [ "guppy", "hex", "http 0.2.11", - "hyper 0.14.27", + "hyper 1.1.0", "hyper-staticfile", "illumos-utils", "installinator-common", @@ -5395,6 +5395,7 @@ dependencies = [ "hex", "hmac", "hyper 0.14.27", + "hyper 1.1.0", "indexmap 2.2.3", "inout", "ipnetwork", @@ -5669,7 +5670,7 @@ dependencies = [ "chrono", "futures", "http 0.2.11", - "hyper 0.14.27", + "hyper 1.1.0", "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "rand 0.8.5", @@ -5745,7 +5746,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper 0.14.27", + "hyper 1.1.0", "internal-dns", "nexus-client", "nexus-types", @@ -10425,7 +10426,7 @@ dependencies = [ "hex", "http 0.2.11", "hubtools", - "hyper 0.14.27", + "hyper 1.1.0", "illumos-utils", "installinator", "installinator-artifact-client", diff --git a/Cargo.toml b/Cargo.toml index db37547ea0d..9de3e5a78f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -227,7 +227,7 @@ http = "0.2.11" httptest = "0.15.5" hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" } humantime = "2.1.0" -hyper = "0.14" +hyper = "1.1" 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 ebe683e51a7..c48ed53b514 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.27", features = ["full"] } +hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.1.0", features = ["client", "http1"] } indexmap = { version = "2.2.3", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } @@ -164,7 +164,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.27", features = ["full"] } +hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.1.0", features = ["client", "http1"] } indexmap = { version = "2.2.3", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } @@ -231,6 +231,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.0", default-features = false, features = ["std"] } dof = { version = "0.3.0", default-features = false, features = ["des"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.31", features = ["fs", "termios"] } @@ -238,30 +239,35 @@ rustix = { version = "0.38.31", features = ["fs", "termios"] } [target.x86_64-unknown-linux-gnu.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } dof = { version = "0.3.0", default-features = false, features = ["des"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", 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.0", default-features = false, features = ["std"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", 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.0", default-features = false, features = ["std"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", 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.0", default-features = false, features = ["std"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", 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.0", default-features = false, features = ["std"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.31", features = ["fs", "termios"] } @@ -269,6 +275,7 @@ rustix = { version = "0.38.31", features = ["fs", "termios"] } [target.x86_64-unknown-illumos.dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } dof = { version = "0.3.0", default-features = false, features = ["des"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.31", features = ["fs", "termios"] } @@ -278,6 +285,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.0", default-features = false, features = ["std"] } dof = { version = "0.3.0", default-features = false, features = ["des"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.27", features = ["full"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.31", features = ["fs", "termios"] }