diff --git a/Cargo.lock b/Cargo.lock index f43b0600334d1..ae83dc0e1a9c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1140,7 +1140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "base64 0.22.1", "bytes", "futures-util", @@ -1150,7 +1150,7 @@ dependencies = [ "hyper 1.8.1", "hyper-util", "itoa", - "matchit", + "matchit 0.7.0", "memchr", "mime", "percent-encoding", @@ -1170,6 +1170,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" +dependencies = [ + "axum-core 0.5.5", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde_core", + "sync_wrapper 1.0.2", + "tower 0.5.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-core" version = "0.4.5" @@ -1191,28 +1217,45 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" +dependencies = [ + "bytes", + "futures-core", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-extra" -version = "0.9.6" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" +checksum = "dbfe9f610fe4e99cf0cfcd03ccf8c63c28c616fe714d80475ef731f3b13dd21b" dependencies = [ - "axum", - "axum-core", + "axum 0.8.7", + "axum-core 0.5.5", "bytes", - "fastrand 2.3.0", + "futures-core", "futures-util", "headers", "http 1.2.0", "http-body 1.0.1", "http-body-util", "mime", - "multer", "pin-project-lite", - "serde", - "tower 0.5.2", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -4989,6 +5032,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "md-5" version = "0.10.6" @@ -5087,23 +5136,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 1.2.0", - "httparse", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - [[package]] name = "multimap" version = "0.8.3" @@ -5187,7 +5219,7 @@ name = "mz" version = "0.3.1" dependencies = [ "assert_cmd", - "axum", + "axum 0.7.9", "clap", "csv", "dirs", @@ -5484,7 +5516,7 @@ version = "26.2.0-dev.0" dependencies = [ "anyhow", "async-trait", - "axum", + "axum 0.7.9", "bytes", "bytesize", "chrono", @@ -5787,7 +5819,7 @@ name = "mz-clusterd" version = "26.2.0-dev.0" dependencies = [ "anyhow", - "axum", + "axum 0.7.9", "clap", "fail", "futures", @@ -6091,7 +6123,7 @@ dependencies = [ "askama", "assert_cmd", "async-trait", - "axum", + "axum 0.7.9", "axum-extra", "base64 0.22.1", "bytes", @@ -6375,7 +6407,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "axum", + "axum 0.7.9", "base64 0.22.1", "clap", "derivative", @@ -6419,7 +6451,7 @@ name = "mz-frontegg-mock" version = "0.0.0" dependencies = [ "anyhow", - "axum", + "axum 0.7.9", "axum-extra", "base64 0.22.1", "chrono", @@ -6445,7 +6477,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.7.9", "axum-extra", "headers", "http 1.2.0", @@ -6796,7 +6828,7 @@ version = "26.2.0-dev.0" dependencies = [ "anyhow", "async-trait", - "axum", + "axum 0.7.9", "chrono", "clap", "futures", @@ -7265,7 +7297,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.7.9", "axum-extra", "bytesize", "cfg-if", @@ -7792,7 +7824,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "axum", + "axum 0.7.9", "bincode", "bytes", "bytesize", @@ -9053,7 +9085,7 @@ dependencies = [ "anyhow", "arrow", "async-trait", - "axum", + "axum 0.7.9", "bytes", "clap", "differential-dataflow", @@ -11294,12 +11326,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "spin" version = "0.10.0" @@ -12202,7 +12228,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64 0.22.1", "bytes", "flate2", @@ -12285,7 +12311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fd0118512cf0b3768f7fcccf0bef1ae41d68f2b45edc1e77432b36c97c56c6d" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "cookie", "futures-util", "http 1.2.0", @@ -12392,7 +12418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb6abbfcaf6436ec5a772cd9f965401da12db793e404ae6134eac066fa5a04f3" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "base64 0.22.1", "futures", "http 1.2.0", @@ -13366,8 +13392,8 @@ dependencies = [ "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", - "axum", - "axum-core", + "axum 0.7.9", + "axum-core 0.4.5", "base16ct", "bindgen", "bit-set", diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 00f892187ad0a..431448ec4b512 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1.0.100" askama = { version = "0.12.1", default-features = false, features = ["config", "serde-json"] } async-trait = "0.1.89" axum = { version = "0.7.5", features = ["ws"] } -axum-extra = { version = "0.9.3", features = ["typed-header"] } +axum-extra = { version = "0.12.2", features = ["typed-header"] } base64 = "0.22.1" bytes = "1.10.1" bytesize = "2.1.0" diff --git a/src/frontegg-mock/Cargo.toml b/src/frontegg-mock/Cargo.toml index ba7165c0c7811..b9a202d63ea87 100644 --- a/src/frontegg-mock/Cargo.toml +++ b/src/frontegg-mock/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.100" axum = "0.7.5" -axum-extra = { version = "0.9.3", features = ["typed-header"] } +axum-extra = { version = "0.12.2", features = ["typed-header"] } base64 = "0.22.1" chrono = { version = "0.4.39", default-features = false, features = ["serde"] } clap = { version = "4.5.23", features = ["derive", "env"] } diff --git a/src/http-util/Cargo.toml b/src/http-util/Cargo.toml index 8e54ee75d5529..cef7f51f776bf 100644 --- a/src/http-util/Cargo.toml +++ b/src/http-util/Cargo.toml @@ -13,7 +13,7 @@ workspace = true anyhow = "1.0.100" askama = { version = "0.12.1", default-features = false, features = ["config", "serde-json"] } axum = "0.7.5" -axum-extra = { version = "0.9.3", features = ["typed-header"] } +axum-extra = { version = "0.12.2", features = ["typed-header"] } headers = "0.4.1" http = "1.2.0" hyper = { version = "1.4.1", features = ["http1", "server"] } diff --git a/src/prof-http/Cargo.toml b/src/prof-http/Cargo.toml index 51b74613a929b..04eac22eee959 100644 --- a/src/prof-http/Cargo.toml +++ b/src/prof-http/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] askama = { version = "0.12.1", default-features = false, features = ["config", "serde-json"] } axum = "0.7.5" -axum-extra = { version = "0.9.3", features = ["typed-header"] } +axum-extra = { version = "0.12.2", features = ["typed-header"] } bytesize = "2.1.0" cfg-if = "1.0.4" headers = "0.4.1"