diff --git a/Cargo.lock b/Cargo.lock index 8f855f5219f..3916ba18c43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1786,7 +1786,7 @@ dependencies = [ "dns-service-client", "dropshot", "expectorate", - "http", + "http 0.2.11", "omicron-test-utils", "omicron-workspace-hack", "openapi-lint", @@ -1818,7 +1818,7 @@ name = "dns-service-client" version = "0.1.0" dependencies = [ "chrono", - "http", + "http 0.2.11", "omicron-workspace-hack", "progenitor", "reqwest", @@ -1856,7 +1856,7 @@ dependencies = [ "anyhow", "chrono", "futures", - "http", + "http 0.2.11", "ipnetwork", "omicron-workspace-hack", "omicron-zone-package", @@ -1891,8 +1891,8 @@ dependencies = [ "form_urlencoded", "futures", "hostname", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "indexmap 2.1.0", "multer", "openapiv3", @@ -2039,7 +2039,7 @@ dependencies = [ "async-trait", "base64 0.21.5", "chrono", - "http", + "http 0.2.11", "omicron-sled-agent", "omicron-test-utils", "omicron-workspace-hack", @@ -2629,7 +2629,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -2682,7 +2682,7 @@ dependencies = [ "base64 0.21.5", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -2694,7 +2694,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -2810,6 +2810,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -2817,10 +2828,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + [[package]] name = "http-range" version = "0.1.5" @@ -2850,8 +2871,8 @@ dependencies = [ "crossbeam-channel", "form_urlencoded", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "log", "once_cell", "regex", @@ -2937,8 +2958,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -2950,6 +2971,21 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2957,8 +2993,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "log", "rustls", "rustls-native-certs", @@ -2973,10 +3009,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "318ca89e4827e7fe4ddd2824f52337239796ae8ecc761a663324407dc3d8d7e7" dependencies = [ "futures-util", - "http", + "http 0.2.11", "http-range", "httpdate", - "hyper", + "hyper 0.14.27", "mime_guess", "percent-encoding", "rand 0.8.5", @@ -2992,7 +3028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", @@ -3182,7 +3218,7 @@ dependencies = [ "futures", "hex", "hex-literal", - "http", + "http 0.2.11", "illumos-utils", "installinator-artifact-client", "installinator-common", @@ -3239,7 +3275,7 @@ dependencies = [ "clap 4.4.3", "dropshot", "expectorate", - "hyper", + "hyper 1.0.1", "installinator-common", "omicron-common", "omicron-test-utils", @@ -3291,7 +3327,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper", + "hyper 1.0.1", "omicron-common", "omicron-test-utils", "omicron-workspace-hack", @@ -3882,7 +3918,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -4020,8 +4056,8 @@ dependencies = [ "futures", "gateway-client", "headers", - "http", - "hyper", + "http 0.2.11", + "hyper 1.0.1", "hyper-rustls", "internal-dns", "ipnetwork", @@ -4129,8 +4165,8 @@ dependencies = [ "gateway-messages", "gateway-test-utils", "headers", - "http", - "hyper", + "http 0.2.11", + "hyper 1.0.1", "internal-dns", "nexus-db-queries", "nexus-test-interface", @@ -4465,7 +4501,7 @@ dependencies = [ "expectorate", "futures", "hex", - "http", + "http 0.2.11", "ipnetwork", "lazy_static", "libc", @@ -4555,8 +4591,8 @@ dependencies = [ "gateway-sp-comms", "gateway-test-utils", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 1.0.1", "illumos-utils", "ipcc-key-value", "omicron-common", @@ -4612,10 +4648,10 @@ dependencies = [ "gateway-test-utils", "headers", "hex", - "http", + "http 0.2.11", "httptest", "hubtools", - "hyper", + "hyper 1.0.1", "hyper-rustls", "internal-dns", "ipnetwork", @@ -4822,8 +4858,8 @@ dependencies = [ "futures", "gateway-client", "glob", - "http", - "hyper", + "http 0.2.11", + "hyper 1.0.1", "hyper-staticfile", "illumos-utils", "internal-dns", @@ -4891,7 +4927,7 @@ dependencies = [ "filetime", "headers", "hex", - "http", + "http 0.2.11", "libc", "omicron-common", "omicron-workspace-hack", @@ -4951,7 +4987,7 @@ dependencies = [ "getrandom 0.2.10", "hashbrown 0.13.2", "hex", - "hyper", + "hyper 0.14.27", "hyper-rustls", "indexmap 2.1.0", "inout", @@ -5218,8 +5254,8 @@ dependencies = [ "base64 0.21.5", "chrono", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 1.0.1", "omicron-workspace-hack", "progenitor", "rand 0.8.5", @@ -5293,7 +5329,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper", + "hyper 1.0.1", "internal-dns", "nexus-client", "nexus-types", @@ -5366,7 +5402,7 @@ dependencies = [ "chrono", "dropshot", "futures", - "http", + "http 0.2.11", "kstat-rs", "omicron-workspace-hack", "oximeter", @@ -6066,7 +6102,7 @@ source = "git+https://github.com/oxidecomputer/progenitor?branch=main#9339b57628 dependencies = [ "getopts", "heck 0.4.1", - "http", + "http 0.2.11", "indexmap 2.1.0", "openapiv3", "proc-macro2", @@ -6130,7 +6166,7 @@ dependencies = [ "clap 4.4.3", "dropshot", "futures", - "hyper", + "hyper 0.14.27", "progenitor", "propolis_types", "rand 0.8.5", @@ -6564,9 +6600,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "hyper-tls", "ipnet", @@ -8901,7 +8937,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand 0.8.5", @@ -9520,9 +9556,9 @@ dependencies = [ "gateway-messages", "gateway-test-utils", "hex", - "http", + "http 0.2.11", "hubtools", - "hyper", + "hyper 1.0.1", "illumos-utils", "installinator", "installinator-artifact-client", diff --git a/Cargo.toml b/Cargo.toml index 931d885e7a5..1f6dad146ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -212,7 +212,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.0" hyper-rustls = "0.24.2" hyper-staticfile = "0.9.5" illumos-utils = { path = "illumos-utils" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index fe7c3bdc818..54a86d75966 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -49,7 +49,6 @@ generic-array = { version = "0.14.7", default-features = false, features = ["mor getrandom = { version = "0.2.10", default-features = false, features = ["js", "rdrand", "std"] } hashbrown = { version = "0.13.2" } hex = { version = "0.4.3", features = ["serde"] } -hyper = { version = "0.14.27", features = ["full"] } indexmap = { version = "2.1.0", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } @@ -144,7 +143,6 @@ generic-array = { version = "0.14.7", default-features = false, features = ["mor getrandom = { version = "0.2.10", default-features = false, features = ["js", "rdrand", "std"] } hashbrown = { version = "0.13.2" } hex = { version = "0.4.3", features = ["serde"] } -hyper = { version = "0.14.27", features = ["full"] } indexmap = { version = "2.1.0", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } @@ -206,6 +204,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"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -213,6 +212,7 @@ rustix = { version = "0.38.25", features = ["fs", "termios"] } [target.x86_64-unknown-linux-gnu.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -221,6 +221,7 @@ rustix = { version = "0.38.25", features = ["fs", "termios"] } [target.x86_64-apple-darwin.dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.2", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -229,6 +230,7 @@ rustix = { version = "0.38.25", features = ["fs", "termios"] } [target.x86_64-apple-darwin.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.2", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -237,6 +239,7 @@ rustix = { version = "0.38.25", features = ["fs", "termios"] } [target.aarch64-apple-darwin.dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.2", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -245,6 +248,7 @@ rustix = { version = "0.38.25", features = ["fs", "termios"] } [target.aarch64-apple-darwin.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.2", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -253,6 +257,7 @@ rustix = { version = "0.38.25", features = ["fs", "termios"] } [target.x86_64-unknown-illumos.dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.2", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] } @@ -263,6 +268,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"] } errno = { version = "0.3.2", default-features = false, features = ["std"] } +hyper = { version = "0.14.27", features = ["full"] } hyper-rustls = { version = "0.24.2" } mio = { version = "0.8.9", features = ["net", "os-ext"] } once_cell = { version = "1.18.0", features = ["unstable"] }