diff --git a/Cargo.lock b/Cargo.lock index 429c80e9d48c7..79c2d2c9c0817 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1465,7 +1465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "base64 0.21.7", "bitflags 1.3.2", "bytes 1.8.0", @@ -1489,11 +1489,39 @@ dependencies = [ "sync_wrapper 0.1.2", "tokio", "tokio-tungstenite 0.20.1", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core 0.4.5", + "bytes 1.8.0", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower 0.5.1", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -1511,25 +1539,50 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes 1.8.0", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-extra" -version = "0.4.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d" +checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" dependencies = [ - "axum", + "axum 0.7.9", + "axum-core 0.4.5", "bytes 1.8.0", + "fastrand 2.2.0", "futures-util", - "http 0.2.12", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "multer", "pin-project-lite", "serde", "serde_json", - "tokio", - "tower", - "tower-http 0.3.5", + "tower 0.5.1", "tower-layer", "tower-service", + "typed-json", ] [[package]] @@ -2567,7 +2620,7 @@ dependencies = [ "aws-config", "aws-sdk-kinesis", "aws-sdk-s3", - "axum", + "axum 0.6.20", "axum-extra", "base64 0.22.1", "call", @@ -2644,8 +2697,8 @@ dependencies = [ "time", "tokio", "toml 0.8.19", - "tower", - "tower-http 0.4.4", + "tower 0.4.13", + "tower-http", "tracing", "tracing-subscriber", "unindent", @@ -7297,6 +7350,23 @@ dependencies = [ "cc", ] +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes 1.8.0", + "encoding_rs", + "futures-util", + "http 1.1.0", + "httparse", + "memchr", + "mime", + "spin", + "version_check", +] + [[package]] name = "multi_buffer" version = "0.1.0" @@ -12851,19 +12921,15 @@ dependencies = [ ] [[package]] -name = "tower-http" -version = "0.3.5" +name = "tower" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ - "bitflags 1.3.2", - "bytes 1.8.0", "futures-core", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "http-range-header", "pin-project-lite", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -13285,6 +13351,16 @@ dependencies = [ "utf-8", ] +[[package]] +name = "typed-json" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6024a8d0025400b3f6b189366e9aa92012cf9c4fe1cd2620848dd61425c49eed" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "typeid" version = "1.0.2" diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index a69eb53740f5b..d097849da7b4c 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -26,7 +26,7 @@ aws-config = { version = "1.1.5" } aws-sdk-s3 = { version = "1.15.0" } aws-sdk-kinesis = "1.51.0" axum = { version = "0.6", features = ["json", "headers", "ws"] } -axum-extra = { version = "0.4", features = ["erased-json"] } +axum-extra = { version = "0.9", features = ["erased-json"] } base64.workspace = true chrono.workspace = true clickhouse.workspace = true