diff --git a/Cargo.lock b/Cargo.lock index cabd48eba30..73ff5a47bb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1818,7 +1818,7 @@ dependencies = [ "dns-service-client", "dropshot", "expectorate", - "http", + "http 0.2.11", "omicron-test-utils", "omicron-workspace-hack", "openapi-lint", @@ -1850,7 +1850,7 @@ name = "dns-service-client" version = "0.1.0" dependencies = [ "chrono", - "http", + "http 0.2.11", "omicron-workspace-hack", "progenitor", "reqwest", @@ -1888,7 +1888,7 @@ dependencies = [ "anyhow", "chrono", "futures", - "http", + "http 0.2.11", "ipnetwork", "omicron-workspace-hack", "omicron-zone-package", @@ -1923,7 +1923,7 @@ dependencies = [ "form_urlencoded", "futures", "hostname", - "http", + "http 0.2.11", "hyper", "indexmap 2.1.0", "multer", @@ -2094,7 +2094,7 @@ dependencies = [ "async-trait", "base64 0.21.5", "chrono", - "http", + "http 0.2.11", "omicron-sled-agent", "omicron-test-utils", "omicron-workspace-hack", @@ -2498,7 +2498,7 @@ dependencies = [ "slog-term", "termios", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "uuid", ] @@ -2684,7 +2684,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -2737,7 +2737,7 @@ dependencies = [ "base64 0.21.5", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -2749,7 +2749,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -2865,6 +2865,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" @@ -2872,7 +2883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -2905,7 +2916,7 @@ dependencies = [ "crossbeam-channel", "form_urlencoded", "futures", - "http", + "http 0.2.11", "hyper", "log", "once_cell", @@ -2992,7 +3003,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -3012,7 +3023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", "log", "rustls", @@ -3028,7 +3039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "318ca89e4827e7fe4ddd2824f52337239796ae8ecc761a663324407dc3d8d7e7" dependencies = [ "futures-util", - "http", + "http 0.2.11", "http-range", "httpdate", "hyper", @@ -3237,7 +3248,7 @@ dependencies = [ "futures", "hex", "hex-literal", - "http", + "http 0.2.11", "illumos-utils", "installinator-artifact-client", "installinator-common", @@ -3937,7 +3948,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -4075,7 +4086,7 @@ dependencies = [ "futures", "gateway-client", "headers", - "http", + "http 0.2.11", "hyper", "hyper-rustls", "internal-dns", @@ -4185,7 +4196,7 @@ dependencies = [ "gateway-messages", "gateway-test-utils", "headers", - "http", + "http 0.2.11", "hyper", "internal-dns", "nexus-db-queries", @@ -4521,7 +4532,7 @@ dependencies = [ "expectorate", "futures", "hex", - "http", + "http 0.2.11", "ipnetwork", "lazy_static", "libc", @@ -4611,7 +4622,7 @@ dependencies = [ "gateway-sp-comms", "gateway-test-utils", "hex", - "http", + "http 0.2.11", "hyper", "illumos-utils", "ipcc-key-value", @@ -4633,7 +4644,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "toml 0.8.8", "uuid", ] @@ -4668,7 +4679,7 @@ dependencies = [ "gateway-test-utils", "headers", "hex", - "http", + "http 0.2.11", "httptest", "hubtools", "hyper", @@ -4878,7 +4889,7 @@ dependencies = [ "futures", "gateway-client", "glob", - "http", + "http 0.2.11", "hyper", "hyper-staticfile", "illumos-utils", @@ -4947,7 +4958,7 @@ dependencies = [ "filetime", "headers", "hex", - "http", + "http 0.2.11", "libc", "omicron-common", "omicron-workspace-hack", @@ -5278,7 +5289,7 @@ dependencies = [ "base64 0.21.5", "chrono", "futures", - "http", + "http 0.2.11", "hyper", "omicron-workspace-hack", "progenitor", @@ -5425,7 +5436,7 @@ dependencies = [ "chrono", "dropshot", "futures", - "http", + "http 0.2.11", "kstat-rs", "omicron-workspace-hack", "oximeter", @@ -6132,7 +6143,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", @@ -6181,7 +6192,7 @@ dependencies = [ "slog", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "uuid", ] @@ -6211,7 +6222,7 @@ dependencies = [ "slog-term", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "uuid", ] @@ -6630,7 +6641,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -8629,7 +8640,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", ] [[package]] @@ -8996,7 +9019,26 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", "httparse", "log", "rand 0.8.5", @@ -9615,7 +9657,7 @@ dependencies = [ "gateway-messages", "gateway-test-utils", "hex", - "http", + "http 0.2.11", "hubtools", "hyper", "illumos-utils", diff --git a/Cargo.toml b/Cargo.toml index 98c83eb6e7e..c50afbbcf81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -368,7 +368,7 @@ tofino = { git = "http://github.com/oxidecomputer/tofino", branch = "main" } tokio = "1.34.0" tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] } tokio-stream = "0.1.14" -tokio-tungstenite = "0.20" +tokio-tungstenite = "0.21" tokio-util = { version = "0.7.10", features = ["io", "io-util"] } toml = "0.8.8" toml_edit = "0.21.0"