diff --git a/Cargo.lock b/Cargo.lock index 429d62308abd4..2ace09fadf734 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -994,7 +994,7 @@ dependencies = [ "bytes", "fastrand 2.0.1", "http 0.2.9", - "hyper", + "hyper 0.14.27", "time", "tokio", "tracing", @@ -1023,7 +1023,7 @@ dependencies = [ "aws-types", "bytes", "http 0.2.9", - "http-body", + "http-body 0.4.5", "pin-project-lite", "tracing", ] @@ -1046,7 +1046,7 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ede3d6e360a48436fee127cb81710834407b1ec0c48a001cc29dec9005f73e" dependencies = [ - "bindgen 0.69.4", + "bindgen", "cmake", "dunce", "fs_extra", @@ -1120,7 +1120,7 @@ dependencies = [ "aws-types", "bytes", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -1203,7 +1203,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -1235,7 +1235,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "pin-project-lite", @@ -1275,8 +1275,8 @@ dependencies = [ "bytes", "fastrand 2.0.1", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "once_cell", "pin-project-lite", @@ -1312,8 +1312,8 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "itoa", "num-integer", "pin-project-lite", @@ -1366,13 +1366,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "itoa", "matchit", "memchr", @@ -1384,13 +1384,47 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tower", "tower-layer", "tower-service", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.0", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -1401,11 +1435,32 @@ dependencies = [ "bytes", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1575,25 +1630,6 @@ dependencies = [ "virtue", ] -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", -] - [[package]] name = "bindgen" version = "0.69.4" @@ -1603,7 +1639,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -2188,7 +2224,7 @@ dependencies = [ "clickhouse-derive", "clickhouse-rs-cityhash-sys", "futures", - "hyper", + "hyper 0.14.27", "hyper-tls", "lz4", "sealed", @@ -4644,7 +4680,7 @@ dependencies = [ "async-stream", "async-trait", "dyn-clone", - "hyper", + "hyper 0.14.27", "hyper-rustls", "log", "reqwest", @@ -5093,6 +5129,29 @@ dependencies = [ "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-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range-header" version = "0.3.1" @@ -5129,7 +5188,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -5141,6 +5200,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -5149,7 +5227,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.9", - "hyper", + "hyper 0.14.27", "log", "rustls 0.21.10", "rustls-native-certs 0.6.3", @@ -5164,7 +5242,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.27", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -5177,12 +5255,28 @@ 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", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.6", + "tokio", +] + [[package]] name = "hytra" version = "0.1.2" @@ -6453,7 +6547,7 @@ checksum = "8a60cb978c0a1d654edcc1460f8d6092dacf21346ed6017d81fb76a23ef5a8de" dependencies = [ "base64 0.21.7", "bigdecimal 0.4.2", - "bindgen 0.59.2", + "bindgen", "bitflags 2.5.0", "bitvec", "btoi", @@ -6827,7 +6921,7 @@ dependencies = [ "chrono", "futures", "humantime", - "hyper", + "hyper 0.14.27", "itertools 0.11.0", "parking_lot 0.12.1", "percent-encoding", @@ -7103,7 +7197,7 @@ name = "otlp-embedded" version = "0.0.1" source = "git+https://github.com/risingwavelabs/otlp-embedded?rev=58c1f003484449d7c6dd693b348bf19dd44889cb#58c1f003484449d7c6dd693b348bf19dd44889cb" dependencies = [ - "axum", + "axum 0.6.20", "datasize", "hex", "itertools 0.12.1", @@ -7416,12 +7510,6 @@ dependencies = [ "hmac", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "1.1.1" @@ -8686,8 +8774,8 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "hyper-tls", "ipnet", @@ -9056,7 +9144,7 @@ dependencies = [ "governor", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "humantime", "hytra", "itertools 0.12.1", @@ -9165,8 +9253,8 @@ dependencies = [ "easy-ext", "futures", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hytra", "itertools 0.12.1", "libc", @@ -9205,7 +9293,7 @@ version = "1.7.0-alpha" dependencies = [ "async-trait", "futures", - "hyper", + "hyper 0.14.27", "madsim-tokio", "madsim-tonic", "prometheus", @@ -9284,7 +9372,7 @@ dependencies = [ "foyer", "futures", "futures-async-stream", - "hyper", + "hyper 0.14.27", "itertools 0.12.1", "madsim-tokio", "madsim-tonic", @@ -9358,7 +9446,7 @@ dependencies = [ "glob", "google-cloud-pubsub", "http 0.2.9", - "hyper", + "hyper 0.14.27", "hyper-tls", "icelake", "indexmap 1.9.3", @@ -9862,7 +9950,7 @@ dependencies = [ "assert_matches", "async-trait", "aws-config", - "axum", + "axum 0.7.5", "base64-url", "bytes", "chrono", @@ -9877,7 +9965,7 @@ dependencies = [ "function_name", "futures", "hex", - "hyper", + "hyper 0.14.27", "itertools 0.12.1", "madsim-etcd-client", "madsim-tokio", @@ -9932,11 +10020,11 @@ name = "risingwave_meta_dashboard" version = "1.7.0-alpha" dependencies = [ "anyhow", - "axum", + "axum 0.7.5", "bytes", "cargo-emit", "dircpy", - "hyper", + "hyper 0.14.27", "mime_guess", "npm_rs", "reqwest", @@ -10045,7 +10133,7 @@ dependencies = [ "either", "fail", "futures", - "hyper", + "hyper 0.14.27", "hyper-rustls", "hyper-tls", "itertools 0.12.1", @@ -10129,7 +10217,7 @@ dependencies = [ "either", "futures", "http 0.2.9", - "hyper", + "hyper 0.14.27", "itertools 0.12.1", "lru 0.7.6", "madsim-tokio", @@ -12327,6 +12415,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" + [[package]] name = "sysinfo" version = "0.30.0" @@ -12819,15 +12913,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", "futures-core", "futures-util", "h2", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -12848,14 +12942,14 @@ checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", "flate2", "h2", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -12917,7 +13011,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "http-range-header", "httpdate", "mime", @@ -14392,7 +14486,7 @@ dependencies = [ "aws-sigv4", "aws-smithy-runtime", "aws-smithy-types", - "axum", + "axum 0.7.5", "base64 0.21.7", "bigdecimal 0.4.2", "bit-vec", @@ -14427,7 +14521,7 @@ dependencies = [ "hashbrown 0.13.2", "hashbrown 0.14.3", "hmac", - "hyper", + "hyper 0.14.27", "indexmap 1.9.3", "indexmap 2.0.0", "itertools 0.11.0", @@ -14586,7 +14680,7 @@ dependencies = [ "base64 0.13.1", "futures", "http 0.2.9", - "hyper", + "hyper 0.14.27", "hyper-rustls", "itertools 0.10.5", "log", diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml index 0119f6abfe06c..4d74d9ffd2c9a 100644 --- a/src/meta/Cargo.toml +++ b/src/meta/Cargo.toml @@ -86,7 +86,7 @@ url = "2" uuid = { version = "1", features = ["v4"] } [target.'cfg(not(madsim))'.dependencies] -axum = "0.6" +axum = "0.7" tower-http = { version = "0.4", features = [ "add-extension", "cors", diff --git a/src/meta/dashboard/Cargo.toml b/src/meta/dashboard/Cargo.toml index 5edfeb5195e48..fa52311d58cec 100644 --- a/src/meta/dashboard/Cargo.toml +++ b/src/meta/dashboard/Cargo.toml @@ -10,7 +10,7 @@ repository = { workspace = true } [dependencies] anyhow = "1" -axum = "0.6" +axum = "0.7" bytes = "1" hyper = "0.14" mime_guess = "2" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 1ccd14ff77a17..78acd890c70f5 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -29,7 +29,7 @@ aws-sdk-s3 = { version = "1" } aws-sigv4 = { version = "1", features = ["http0-compat", "sign-eventstream", "sigv4a"] } aws-smithy-runtime = { version = "1", default-features = false, features = ["client", "rt-tokio", "tls-rustls"] } aws-smithy-types = { version = "1", default-features = false, features = ["byte-stream-poll-next", "http-body-0-4-x", "hyper-0-14-x", "rt-tokio"] } -axum = { version = "0.6" } +axum = { version = "0.7" } base64 = { version = "0.21" } bigdecimal = { version = "0.4" } bit-vec = { version = "0.6" }