diff --git a/Cargo.lock b/Cargo.lock index a73503d5999ae..5fb2da85e9706 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,7 +115,7 @@ source = "git+https://github.com/jorgecarleitao/arrow2.git#0ba4f8e21547ed08b4468 dependencies = [ "ahash", "arrow-format", - "base64", + "base64 0.13.1", "bytemuck", "chrono", "dyn-clone", @@ -701,12 +701,49 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.1" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" +dependencies = [ + "async-trait", + "axum-core 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.20.0", + "bitflags", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.6.4" +source = "git+https://github.com/tokio-rs/axum.git#19596584dae8ec6fc733d47dcdd1d874c52d484a" dependencies = [ "async-trait", - "axum-core", - "base64", + "axum-core 0.3.2 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.20.0", "bitflags", "bytes", "futures-util", @@ -737,8 +774,25 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.2" +source = "git+https://github.com/tokio-rs/axum.git#19596584dae8ec6fc733d47dcdd1d874c52d484a" dependencies = [ "async-trait", "bytes", @@ -789,6 +843,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "base64-simd" version = "0.7.0" @@ -2397,7 +2457,7 @@ version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "flate2", "nom", @@ -2410,7 +2470,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "headers-core", @@ -2744,7 +2804,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" dependencies = [ - "base64", + "base64 0.13.1", "pem", "ring", "serde", @@ -2771,7 +2831,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "http", @@ -2782,15 +2842,29 @@ dependencies = [ "url", ] +[[package]] +name = "k8s-openapi" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1985030683a2bac402cbda61222195de80d3f66b4c87ab56e5fea379bd98c3" +dependencies = [ + "base64 0.20.0", + "bytes", + "chrono", + "serde", + "serde-value", + "serde_json", +] + [[package]] name = "kube" version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ba77b857a9581e3d1cb1165f9cb1d1732d65ce52642498addae8fa2c6d5e037" dependencies = [ - "k8s-openapi", + "k8s-openapi 0.16.0", "kube-client", - "kube-core", + "kube-core 0.77.0", "kube-derive", "kube-runtime", ] @@ -2801,7 +2875,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "dirs-next", @@ -2813,8 +2887,8 @@ dependencies = [ "hyper-openssl", "hyper-timeout", "jsonpath_lib", - "k8s-openapi", - "kube-core", + "k8s-openapi 0.16.0", + "kube-core 0.77.0", "openssl", "pem", "pin-project", @@ -2842,7 +2916,25 @@ dependencies = [ "form_urlencoded", "http", "json-patch", - "k8s-openapi", + "k8s-openapi 0.16.0", + "once_cell", + "schemars", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "kube-core" +version = "0.78.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f2c6d1a2d1584859499eb05a41c5a44713818041621fa7515cfdbdf4769ea7" +dependencies = [ + "chrono", + "form_urlencoded", + "http", + "json-patch", + "k8s-openapi 0.17.0", "once_cell", "schemars", "serde", @@ -2874,7 +2966,7 @@ dependencies = [ "derivative", "futures", "json-patch", - "k8s-openapi", + "k8s-openapi 0.16.0", "kube-client", "parking_lot", "pin-project", @@ -3282,7 +3374,7 @@ version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" dependencies = [ - "base64", + "base64 0.13.1", "bigdecimal", "bindgen", "bitflags", @@ -3318,7 +3410,7 @@ name = "mz" version = "0.0.0" dependencies = [ "anyhow", - "axum", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "dirs", "indicatif", @@ -3515,7 +3607,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "k8s-openapi", + "k8s-openapi 0.16.0", "kube", "mz-repr", "schemars", @@ -3530,7 +3622,7 @@ name = "mz-clusterd" version = "0.43.0-dev" dependencies = [ "anyhow", - "axum", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "fail", "futures", @@ -3676,8 +3768,8 @@ dependencies = [ "askama", "assert_cmd", "async-trait", - "axum", - "base64", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.13.1", "bytes", "cc", "chrono", @@ -3835,7 +3927,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "derivative", "jsonwebtoken", "mz-ore", @@ -3854,7 +3946,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "headers", "include_dir", "mz-ore", @@ -4020,7 +4112,7 @@ dependencies = [ "clap", "fail", "futures", - "k8s-openapi", + "k8s-openapi 0.16.0", "kube", "maplit", "mz-cloud-resources", @@ -4160,7 +4252,7 @@ dependencies = [ "aws-credential-types", "aws-sdk-s3", "aws-types", - "base64", + "base64 0.13.1", "bytes", "deadpool-postgres", "differential-dataflow", @@ -4198,7 +4290,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "axum", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "bytes", "clap", "criterion", @@ -4359,7 +4451,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace", "bytesize", "cfg-if", @@ -5480,7 +5572,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -5663,7 +5755,7 @@ name = "postgres-protocol" version = "0.6.4" source = "git+https://github.com/MaterializeInc/rust-postgres#9c9086235344fe794361a9985d97a64b42e61929" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "fallible-iterator", @@ -5948,7 +6040,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d378290cd658b119ce87621931ef448017ef1a0044d7b681159d779e7e07b8f6" dependencies = [ - "base64", + "base64 0.13.1", "prost", "prost-types", "serde", @@ -6194,7 +6286,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -6669,7 +6761,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "hex", "indexmap", @@ -7457,8 +7549,8 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", - "base64", + "axum 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -7520,7 +7612,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "futures-core", @@ -7679,7 +7771,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -7791,7 +7883,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" dependencies = [ - "base64", + "base64 0.13.1", "chunked_transfer", "log", "native-tls", @@ -8105,8 +8197,8 @@ dependencies = [ "aws-sig-auth", "aws-sigv4", "aws-smithy-http", - "axum", - "base64", + "axum 0.6.4 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.13.1", "bstr", "byteorder", "bytes", @@ -8137,10 +8229,10 @@ dependencies = [ "hashbrown", "hyper", "indexmap", - "k8s-openapi", + "k8s-openapi 0.16.0", "kube", "kube-client", - "kube-core", + "kube-core 0.78.0", "libc", "log", "lru", @@ -8265,3 +8357,8 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "axum" +version = "0.6.1" +source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index f991554b676d0..7c382c9a864a4 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -53,7 +53,7 @@ indexmap = { version = "1.9.1", default-features = false, features = ["std"] } k8s-openapi = { version = "0.16.0", features = ["v1_24"] } kube = { version = "0.77.0", features = ["derive", "runtime", "ws"] } kube-client = { version = "0.77.0", default-features = false, features = ["jsonpatch", "openssl-tls", "ws"] } -kube-core = { version = "0.77.0", default-features = false, features = ["jsonpatch", "schema", "ws"] } +kube-core = { version = "0.78.0", default-features = false, features = ["jsonpatch", "schema", "ws"] } libc = { version = "0.2.138", features = ["extra_traits", "use_std"] } log = { version = "0.4.17", default-features = false, features = ["std"] } lru = { version = "0.8.1" } @@ -151,7 +151,7 @@ indexmap = { version = "1.9.1", default-features = false, features = ["std"] } k8s-openapi = { version = "0.16.0", features = ["v1_24"] } kube = { version = "0.77.0", features = ["derive", "runtime", "ws"] } kube-client = { version = "0.77.0", default-features = false, features = ["jsonpatch", "openssl-tls", "ws"] } -kube-core = { version = "0.77.0", default-features = false, features = ["jsonpatch", "schema", "ws"] } +kube-core = { version = "0.78.0", default-features = false, features = ["jsonpatch", "schema", "ws"] } libc = { version = "0.2.138", features = ["extra_traits", "use_std"] } log = { version = "0.4.17", default-features = false, features = ["std"] } lru = { version = "0.8.1" }