diff --git a/Cargo.lock b/Cargo.lock index 53aca15bb9270..4c7b2c3ec6890 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -470,7 +470,7 @@ dependencies = [ "chrono", "fnv", "futures-util", - "http", + "http 0.2.9", "indexmap 2.1.0", "mime", "multer", @@ -607,7 +607,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "futures 0.3.29", - "http", + "http 0.2.9", "memchr", "nkeys 0.3.2", "nuid", @@ -781,7 +781,7 @@ dependencies = [ "aws-types", "bytes 1.5.0", "hex", - "http", + "http 0.2.9", "hyper", "ring 0.16.20", "time", @@ -811,7 +811,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "http", + "http 0.2.9", "regex", "tracing 0.1.40", ] @@ -826,8 +826,8 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "lazy_static", "percent-encoding", "pin-project-lite", @@ -853,7 +853,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -876,7 +876,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -899,7 +899,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -922,7 +922,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tower", ] @@ -944,7 +944,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -973,8 +973,8 @@ dependencies = [ "bytes 1.5.0", "bytes-utils", "fastrand 1.9.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -1003,7 +1003,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1028,7 +1028,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1051,7 +1051,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1076,7 +1076,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tower", "tracing 0.1.40", @@ -1092,7 +1092,7 @@ dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", "aws-types", - "http", + "http 0.2.9", "tracing 0.1.40", ] @@ -1107,7 +1107,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.9", "once_cell", "percent-encoding", "regex", @@ -1138,8 +1138,8 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -1159,8 +1159,8 @@ dependencies = [ "aws-smithy-types", "bytes 1.5.0", "fastrand 1.9.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-rustls 0.23.2", "hyper-tls", @@ -1192,8 +1192,8 @@ dependencies = [ "bytes 1.5.0", "bytes-utils", "futures-core", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "once_cell", "percent-encoding", @@ -1210,8 +1210,8 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes 1.5.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "pin-project-lite", "tower", "tracing 0.1.40", @@ -1231,7 +1231,7 @@ version = "0.54.1" source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" dependencies = [ "assert-json-diff 1.1.0", - "http", + "http 0.2.9", "pretty_assertions", "regex", "roxmltree 0.14.1", @@ -1278,7 +1278,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.9", "rustc_version 0.4.0", "tracing 0.1.40", ] @@ -1294,8 +1294,8 @@ dependencies = [ "bitflags 1.3.2", "bytes 1.5.0", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "itoa", "matchit", @@ -1321,8 +1321,8 @@ dependencies = [ "async-trait", "bytes 1.5.0", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -1608,7 +1608,7 @@ dependencies = [ "futures-util", "hex", "home", - "http", + "http 0.2.9", "hyper", "hyper-rustls 0.24.2", "hyperlocal", @@ -3820,7 +3820,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -3891,7 +3891,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", "sha1", @@ -3903,7 +3903,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -4139,6 +4139,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes 1.5.0", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -4146,7 +4157,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes 1.5.0", - "http", + "http 0.2.9", + "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 1.5.0", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -4162,7 +4196,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ - "http", + "http 0.2.9", "serde", ] @@ -4176,7 +4210,7 @@ dependencies = [ "async-channel", "base64 0.13.1", "futures-lite", - "http", + "http 0.2.9", "infer 0.2.3", "pin-project-lite", "rand 0.7.3", @@ -4216,8 +4250,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -4235,7 +4269,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" dependencies = [ - "http", + "http 0.2.9", "hyper", "linked_hash_set", "once_cell", @@ -4256,7 +4290,7 @@ dependencies = [ "bytes 1.5.0", "futures 0.3.29", "headers", - "http", + "http 0.2.9", "hyper", "openssl", "tokio", @@ -4270,7 +4304,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", + "http 0.2.9", "hyper", "log", "rustls 0.20.9", @@ -4286,7 +4320,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.9", "hyper", "log", "rustls 0.21.8", @@ -4682,7 +4716,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "chrono", - "http", + "http 0.2.9", "percent-encoding", "serde", "serde-value", @@ -4763,8 +4797,8 @@ dependencies = [ "dirs-next", "either", "futures 0.3.29", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-openssl", "hyper-timeout", @@ -4782,7 +4816,7 @@ dependencies = [ "tokio", "tokio-util", "tower", - "tower-http", + "tower-http 0.4.4", "tracing 0.1.40", ] @@ -4794,7 +4828,7 @@ checksum = "25983d07f414dfffba08c5951fe110f649113416b1d8e22f7c89c750eb2555a7" dependencies = [ "chrono", "form_urlencoded", - "http", + "http 0.2.9", "json-patch", "k8s-openapi 0.18.0", "once_cell", @@ -5408,7 +5442,7 @@ dependencies = [ "bytes 1.5.0", "encoding_rs", "futures-util", - "http", + "http 0.2.9", "httparse", "log", "memchr", @@ -5820,7 +5854,7 @@ dependencies = [ "base64 0.13.1", "chrono", "getrandom 0.2.11", - "http", + "http 0.2.9", "rand 0.8.5", "reqwest", "serde", @@ -5913,7 +5947,7 @@ dependencies = [ "chrono", "flagset", "futures 0.3.29", - "http", + "http 0.2.9", "log", "md-5", "once_cell", @@ -5939,7 +5973,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http", + "http 0.2.9", "itertools 0.10.5", "log", "oauth2", @@ -7440,8 +7474,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-rustls 0.24.2", "hyper-tls", @@ -9228,8 +9262,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-timeout", "percent-encoding", @@ -9258,8 +9292,8 @@ dependencies = [ "bytes 1.5.0", "flate2", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-timeout", "percent-encoding", @@ -9329,17 +9363,35 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "async-compression", "base64 0.21.5", "bitflags 2.4.1", "bytes 1.5.0", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "mime", "pin-project-lite", + "tower-layer", + "tower-service", + "tracing 0.1.40", +] + +[[package]] +name = "tower-http" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d" +dependencies = [ + "async-compression", + "bitflags 2.4.1", + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "pin-project-lite", "tokio", "tokio-util", "tower-layer", @@ -9589,7 +9641,7 @@ dependencies = [ "byteorder", "bytes 1.5.0", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", "rand 0.8.5", @@ -9981,8 +10033,8 @@ dependencies = [ "hex", "hickory-proto", "hostname", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-serde", "hyper", "hyper-openssl", @@ -10073,7 +10125,7 @@ dependencies = [ "tonic 0.10.2", "tonic-build 0.10.2", "tower", - "tower-http", + "tower-http 0.5.0", "tower-test", "tracing 0.1.40", "tracing-core 0.1.32", @@ -10201,7 +10253,7 @@ dependencies = [ "chrono", "chrono-tz", "encoding_rs", - "http", + "http 0.2.9", "indexmap 2.1.0", "inventory", "no-proxy", @@ -10270,7 +10322,7 @@ dependencies = [ "futures 0.3.29", "futures-util", "headers", - "http", + "http 0.2.9", "hyper-proxy", "indexmap 2.1.0", "metrics", @@ -10584,7 +10636,7 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http", + "http 0.2.9", "hyper", "log", "mime", diff --git a/Cargo.toml b/Cargo.toml index dfac6f1798b92..eb53c7223ba8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -187,7 +187,7 @@ opendal = {version = "0.42", default-features = false, features = ["native-tls", # Tower tower = { version = "0.4.13", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] } -tower-http = { version = "0.4.4", default-features = false, features = ["decompression-gzip", "trace"]} +tower-http = { version = "0.5.0", default-features = false, features = ["decompression-gzip", "trace"]} # Serde serde = { version = "1.0.193", default-features = false, features = ["derive"] } serde-toml-merge = { version = "0.3.3", default-features = false }