From a006e438bbaefeec5db7a69ce377ce21e3129201 Mon Sep 17 00:00:00 2001 From: Aviram Hassan Date: Fri, 11 Oct 2024 11:36:57 +0300 Subject: [PATCH] update dependencies (#2823) * update dependencies * rollback json stuff --- Cargo.lock | 303 +++++++++++--------- Cargo.toml | 2 +- changelog.d/+update-dependencies.changed.md | 1 + mirrord/agent/Cargo.toml | 14 +- mirrord/auth/Cargo.toml | 2 +- mirrord/cli/Cargo.toml | 6 +- mirrord/config/Cargo.toml | 2 +- mirrord/kube/Cargo.toml | 2 +- mirrord/layer/Cargo.toml | 4 +- mirrord/operator/Cargo.toml | 4 +- mirrord/vpn/Cargo.toml | 2 +- tests/Cargo.toml | 6 +- 12 files changed, 194 insertions(+), 154 deletions(-) create mode 100644 changelog.d/+update-dependencies.changed.md diff --git a/Cargo.lock b/Cargo.lock index 33f6f35ee71..a41b5e1d8bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -488,6 +488,18 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-socks5" version = "0.6.0" @@ -520,6 +532,12 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + [[package]] name = "async-trait" version = "0.1.83" @@ -648,9 +666,9 @@ dependencies = [ [[package]] name = "aws-sdk-sqs" -version = "1.45.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a92759d1d77fbbb99c8077d4cc6ef4e69f559ce3ed9aa41445bff391aa4de4d" +checksum = "657982a9e70b8aa1b903c84f8e76c36202358c48f119330d5f4b74d7e6cf27b7" dependencies = [ "aws-credential-types", "aws-runtime", @@ -670,9 +688,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.45.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" +checksum = "0dc2faec3205d496c7e57eff685dd944203df7ce16a4116d0281c44021788a7b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -692,9 +710,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.46.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" +checksum = "c93c241f52bc5e0476e259c953234dab7e2a35ee207ee202e86c0095ec4951dc" dependencies = [ "aws-credential-types", "aws-runtime", @@ -714,9 +732,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.45.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" +checksum = "b259429be94a3459fa1b00c5684faee118d74f9577cc50aebadc36e507c63b5f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -810,9 +828,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -931,7 +949,7 @@ dependencies = [ "sha1", "sync_wrapper 1.0.1", "tokio", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite", "tower 0.5.1", "tower-layer", "tower-service", @@ -1065,9 +1083,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.6.0", "cexpr", @@ -1153,11 +1171,24 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + [[package]] name = "bollard" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" +checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a" dependencies = [ "base64 0.22.1", "bollard-stubs", @@ -1170,7 +1201,7 @@ dependencies = [ "hyper 1.4.1", "hyper-named-pipe", "hyper-util", - "hyperlocal-next", + "hyperlocal", "log", "pin-project-lite", "serde", @@ -1188,9 +1219,9 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.44.0-rc.2" +version = "1.45.0-rc.26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709d9aa1c37abb89d40f19f5d0ad6f0d88cb1581264e571c9350fc5bb89cf1c5" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" dependencies = [ "serde", "serde_repr", @@ -1299,18 +1330,18 @@ dependencies = [ [[package]] name = "c2rust-bitfields" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43c3f07ab0ef604fa6f595aa46ec2f8a22172c975e186f6f5bf9829a3b72c41" +checksum = "367e5d1b30f28be590b6b3868da1578361d29d9bfac516d22f497d28ed7c9055" dependencies = [ "c2rust-bitfields-derive", ] [[package]] name = "c2rust-bitfields-derive" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3cbc102e2597c9744c8bd8c15915d554300601c91a079430d309816b0912545" +checksum = "a279db9c50c4024eeca1a763b6e0f033848ce74e83e47454bcf8a8a98f7b0b56" dependencies = [ "proc-macro2", "quote", @@ -1430,9 +1461,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -1440,9 +1471,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -1452,9 +1483,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.32" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a01f4f9ee6c066d42a1c8dedf0dcddad16c72a8981a309d6398de3a75b0c39" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" dependencies = [ "clap", ] @@ -1802,11 +1833,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", @@ -1856,18 +1888,18 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling", "proc-macro2", @@ -1877,9 +1909,9 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", "syn 2.0.79", @@ -2391,6 +2423,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2443,9 +2481,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +checksum = "ec6fcfb3c0c1d71612528825042261419d5dade9678c39a781e05b63677d9b32" dependencies = [ "rustix", "tokio", @@ -2512,6 +2550,16 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.31" @@ -2710,6 +2758,11 @@ name = "hashbrown" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "headers" @@ -3113,10 +3166,10 @@ dependencies = [ ] [[package]] -name = "hyperlocal-next" -version = "0.9.0" +name = "hyperlocal" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", @@ -3410,9 +3463,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3509,8 +3562,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.95.0" -source = "git+https://github.com/kube-rs/kube?rev=3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb#3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efffeb3df0bd4ef3e5d65044573499c0e4889b988070b08c50b25b1329289a1f" dependencies = [ "k8s-openapi", "kube-client", @@ -3521,8 +3575,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.95.0" -source = "git+https://github.com/kube-rs/kube?rev=3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb#3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf471ece8ff8d24735ce78dac4d091e9fcb8d74811aeb6b75de4d1c3f5de0f1" dependencies = [ "base64 0.22.1", "bytes", @@ -3553,7 +3608,7 @@ dependencies = [ "serde_yaml", "thiserror", "tokio", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite", "tokio-util", "tower 0.5.1", "tower-http", @@ -3562,8 +3617,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.95.0" -source = "git+https://github.com/kube-rs/kube?rev=3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb#3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f42346d30bb34d1d7adc5c549b691bce7aa3a1e60254e68fab7e2d7b26fe3d77" dependencies = [ "chrono", "form_urlencoded", @@ -3579,8 +3635,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.95.0" -source = "git+https://github.com/kube-rs/kube?rev=3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb#3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9364e04cc5e0482136c6ee8b7fb7551812da25802249f35b3def7aaa31e82ad" dependencies = [ "darling", "proc-macro2", @@ -3591,8 +3648,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.95.0" -source = "git+https://github.com/kube-rs/kube?rev=3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb#3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fbf1f6ffa98e65f1d2a9a69338bb60605d46be7edf00237784b89e62c9bd44" dependencies = [ "ahash", "async-broadcast", @@ -3818,9 +3876,9 @@ dependencies = [ [[package]] name = "mid" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ab4b7ce393ddb4cab95c46e5585bc6283fdcf8f4f6a81be98e6cce9ee39624" +checksum = "82da46e09851e48c020d3460f6f9bf4349153f4bc500ed357fa7e8a2193a16bb" dependencies = [ "hex", "hmac-sha256", @@ -4022,7 +4080,7 @@ dependencies = [ "tokio-stream", "tokio-util", "tonic", - "tower 0.4.13", + "tower 0.5.1", "tracing", "tracing-subscriber", "wildmatch", @@ -4175,7 +4233,7 @@ dependencies = [ "thiserror", "tokio", "tokio-retry", - "tower 0.4.13", + "tower 0.5.1", "tracing", ] @@ -4195,7 +4253,7 @@ dependencies = [ "flaky_test", "frida-gum", "futures", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "http-body 1.0.1", "hyper 1.4.1", "k8s-openapi", @@ -4223,7 +4281,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tower 0.4.13", + "tower 0.5.1", "tracing", "tracing-subscriber", ] @@ -4277,7 +4335,7 @@ dependencies = [ "serde_yaml", "thiserror", "tokio", - "tokio-tungstenite 0.23.1", + "tokio-tungstenite", "tracing", ] @@ -4349,14 +4407,13 @@ dependencies = [ [[package]] name = "mockall" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" dependencies = [ "cfg-if", "downcast", "fragile", - "lazy_static", "mockall_derive", "predicates", "predicates-tree", @@ -4364,9 +4421,9 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" dependencies = [ "cfg-if", "proc-macro2", @@ -4600,12 +4657,13 @@ dependencies = [ [[package]] name = "oci-spec" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf88ddc01cc6bccbe1044adb6a29057333f523deadcb4953c011a73158cfa5e" +checksum = "5cee185ce7cf1cce45e194e34cd87c0bad7ff0aa2e8917009a2da4f7b31fb363" dependencies = [ "derive_builder", "getset", + "regex", "serde", "serde_json", "strum", @@ -4925,6 +4983,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + [[package]] name = "pkcs1" version = "0.7.5" @@ -5197,24 +5266,23 @@ dependencies = [ [[package]] name = "procfs" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" dependencies = [ "bitflags 2.6.0", "chrono", "flate2", "hex", - "lazy_static", "procfs-core", "rustix", ] [[package]] name = "procfs-core" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ "bitflags 2.6.0", "chrono", @@ -5504,9 +5572,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -5673,9 +5741,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" dependencies = [ "futures", "futures-timer", @@ -5685,9 +5753,9 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" dependencies = [ "cfg-if", "glob", @@ -6048,9 +6116,9 @@ dependencies = [ [[package]] name = "secrecy" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba079fa568d52545cd70b334b2ce6f88f62b8fc2bda9290f48a0578388a49331" +checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a" dependencies = [ "zeroize", ] @@ -6698,7 +6766,7 @@ dependencies = [ "serde_json", "tempfile", "tokio", - "tokio-tungstenite 0.23.1", + "tokio-tungstenite", "wsl", ] @@ -6883,18 +6951,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.23.0", -] - [[package]] name = "tokio-tungstenite" version = "0.24.0" @@ -7158,19 +7214,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun2" -version = "2.0.9" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b139b40733b3e81560335ccad94948916c4d03ed1ded505a8675428879075b4" +checksum = "c131f1a66eab9362e16acf067533a41a31285d560b4339dfe236e59f504548d1" dependencies = [ "bytes", "cfg-if", + "futures", "futures-core", "ipnet", "libc", - "libloading", "log", "nix 0.29.0", - "rustversion", "thiserror", "tokio", "tokio-util", @@ -7200,24 +7255,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.24.0" @@ -7500,9 +7537,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -7511,9 +7548,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -7526,9 +7563,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -7538,9 +7575,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7548,9 +7585,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -7561,15 +7598,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -7882,11 +7919,13 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] name = "wintun-bindings" -version = "0.6.4" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af47a132f449a64ff858f9ad876a3d1812df30e9500cddfdcabb2266ab68c0d" +checksum = "1d469d02799f3dae82c8b8d1834b13171c52a1903c5039a900caf6cf7f67b6f0" dependencies = [ + "blocking", "c2rust-bitfields", + "futures", "libloading", "log", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index ec7ab67b1b4..d08f10edf2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ reqwest = { version = "0.12", default-features = false, features = [ "socks", "http2", ] } -kube = { version = "0.95.0", git = "https://github.com/kube-rs/kube", rev = "3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb", default-features = false, features = [ +kube = { version = "0.96.0", default-features = false, features = [ "runtime", "derive", "client", diff --git a/changelog.d/+update-dependencies.changed.md b/changelog.d/+update-dependencies.changed.md new file mode 100644 index 00000000000..3181f593ee0 --- /dev/null +++ b/changelog.d/+update-dependencies.changed.md @@ -0,0 +1 @@ +update dependencies \ No newline at end of file diff --git a/mirrord/agent/Cargo.toml b/mirrord/agent/Cargo.toml index e14d2568f30..12c3cadfead 100644 --- a/mirrord/agent/Cargo.toml +++ b/mirrord/agent/Cargo.toml @@ -28,7 +28,7 @@ tokio = { workspace = true, features = [ "process", "signal", ] } -procfs = "0.16.0" +procfs = "0.17.0" serde.workspace = true serde_json.workspace = true pnet = "0.35" @@ -43,7 +43,7 @@ tokio-stream.workspace = true thiserror.workspace = true hickory-resolver.workspace = true num-traits.workspace = true -bollard = "0.16" +bollard = "0.17" tokio-util.workspace = true rand.workspace = true streammap-ext.workspace = true @@ -58,11 +58,11 @@ hyper = { workspace = true, features = ["full"] } hyper-util.workspace = true httparse = "1" fancy-regex = { workspace = true } -dashmap = { version = "5" } -oci-spec = "0.6.0" +dashmap = { version = "6" } +oci-spec = "0.7.0" async-trait = "0.1" tonic = "0.12" -tower = "0.4" +tower = "0.5" http = "1" k8s-cri = "0.9" semver.workspace = true @@ -78,7 +78,7 @@ rawsocket = { git = "https://github.com/metalbear-co/rawsocket.git" } [dev-dependencies] -rstest = "0.21" -mockall = "0.12" # 0.11.3 is broken +rstest = "0.23" +mockall = "0.13" test_bin = "0.4" rcgen = "0.13" diff --git a/mirrord/auth/Cargo.toml b/mirrord/auth/Cargo.toml index a18c6d9c616..6579a13f5d6 100644 --- a/mirrord/auth/Cargo.toml +++ b/mirrord/auth/Cargo.toml @@ -35,7 +35,7 @@ chrono = "0.4" whoami = { version = "1", optional = true } home = { version = "0.5", optional = true } pem = "3" -fs4 = { version = "0.8", features = ["tokio"], optional = true } +fs4 = { version = "0.10", features = ["tokio"], optional = true, default-features = false} k8s-openapi = { workspace = true, optional = true } kube = { workspace = true, optional = true } serde = { version = "1", features = ["derive"] } diff --git a/mirrord/cli/Cargo.toml b/mirrord/cli/Cargo.toml index eae1284f2b4..47b0298b8d1 100644 --- a/mirrord/cli/Cargo.toml +++ b/mirrord/cli/Cargo.toml @@ -36,7 +36,7 @@ mirrord-vpn = { path = "../vpn" } actix-codec.workspace = true clap.workspace = true -tun2 = { version = "2", features = ["async"] } +tun2 = { version = "3", features = ["async"] } tracing.workspace = true serde_json.workspace = true serde.workspace = true @@ -68,7 +68,7 @@ tokio-rustls = "0.26" tokio-stream = { workspace = true, features = ["net"] } tokio-retry = "0.3" regex.workspace = true -mid = "2.1.0" +mid = "3.0.0" rand.workspace = true [target.'cfg(target_os = "macos")'.dependencies] @@ -79,4 +79,4 @@ mirrord-sip = { path = "../sip" } mirrord-layer = { artifact = "cdylib", path = "../layer" } [dev-dependencies] -rstest = "0.21" +rstest = "0.23" diff --git a/mirrord/config/Cargo.toml b/mirrord/config/Cargo.toml index eaea72ec2de..b95d78cb56d 100644 --- a/mirrord/config/Cargo.toml +++ b/mirrord/config/Cargo.toml @@ -35,4 +35,4 @@ k8s-openapi = { workspace = true, features = ["schemars", "earliest"] } tera = "1" [dev-dependencies] -rstest = "0.21" \ No newline at end of file +rstest = "0.23" \ No newline at end of file diff --git a/mirrord/kube/Cargo.toml b/mirrord/kube/Cargo.toml index 80ea4fd5efd..2268aefe48d 100644 --- a/mirrord/kube/Cargo.toml +++ b/mirrord/kube/Cargo.toml @@ -47,4 +47,4 @@ base64.workspace = true http-body.workspace = true hyper = "1" rstest = "*" -tower = "0.4" +tower = "0.5" diff --git a/mirrord/layer/Cargo.toml b/mirrord/layer/Cargo.toml index a779a22877b..6501b847932 100644 --- a/mirrord/layer/Cargo.toml +++ b/mirrord/layer/Cargo.toml @@ -44,7 +44,7 @@ regex.workspace = true errno = "0.3" socket2.workspace = true bytemuck = "1" -hashbrown = "0.14" +hashbrown = "0.15" exec.workspace = true syscalls = { version = "0.6", features = ["full"] } null-terminated = "0.3" @@ -63,7 +63,7 @@ hyper = { workspace = true } rstest = "*" tempfile = "3" test-cdylib = "*" -tower = "0.4" +tower = "0.5" tokio = { version = "1", features = ["rt", "net", "macros"] } tests = { path = "../../tests" } flaky_test = "0.2" diff --git a/mirrord/operator/Cargo.toml b/mirrord/operator/Cargo.toml index 2206418e93d..7a99ad829b1 100644 --- a/mirrord/operator/Cargo.toml +++ b/mirrord/operator/Cargo.toml @@ -74,8 +74,8 @@ serde_yaml = { workspace = true, optional = true } thiserror.workspace = true semver = { workspace = true, features = ["serde"] } tokio = { workspace = true, optional = true } -tokio-tungstenite = { version = "0.23", optional = true } +tokio-tungstenite = { version = "0.24", optional = true } tracing = { workspace = true, optional = true } [dev-dependencies] -rstest = "0.21" +rstest = "0.23" diff --git a/mirrord/vpn/Cargo.toml b/mirrord/vpn/Cargo.toml index a0064bbd292..e680a93f60d 100644 --- a/mirrord/vpn/Cargo.toml +++ b/mirrord/vpn/Cargo.toml @@ -30,4 +30,4 @@ serde_yaml.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["fs", "process"] } tracing.workspace = true -tun2 = { version = "2", features = ["async"] } +tun2 = { version = "3", features = ["async"] } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 13a82df2cfa..b3079f53d28 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -15,7 +15,7 @@ aws-credential-types = "1.2" aws-sdk-sqs = { version = "1.39", optional = true } aws-types = "1.3" json-patch = "2.0" -jsonptr = "0.4.7" # for compatiblity with json-patch +jsonptr = "0.4" # for compatiblity with json-patch k8s-openapi.workspace = true kube.workspace = true reqwest.workspace = true @@ -26,14 +26,14 @@ mirrord = { artifact = "bin", path = "../mirrord/cli" } mirrord-operator = { path = "../mirrord/operator", features = ["setup", "crd"] } serde = "1" futures.workspace = true -rstest = "0.21" +rstest = "0.23" rand = "0.8" futures-util = "0.3" wsl = "0.1" chrono = "0.4" tempfile = "3" bytes = "1" -tokio-tungstenite = { version = "0.23" } +tokio-tungstenite = { version = "0.24" } fancy-regex.workspace = true hyper.workspace = true hyper-util.workspace = true