diff --git a/Cargo.lock b/Cargo.lock index fb2a9514..831c12f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -32,18 +32,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -77,33 +77,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -111,26 +111,60 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backoff" @@ -145,9 +179,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -160,9 +194,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bit-set" @@ -181,15 +221,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -202,20 +236,19 @@ dependencies = [ [[package]] name = "built" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" +checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" dependencies = [ - "cargo-lock", "chrono", "git2", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -225,30 +258,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cargo-lock" -version = "9.0.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" -dependencies = [ - "semver", - "serde", - "toml", - "url", -] +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -259,15 +281,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -301,7 +323,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] @@ -312,9 +334,18 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] [[package]] name = "const_format" @@ -354,31 +385,27 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -392,9 +419,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -402,27 +429,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] @@ -433,7 +460,7 @@ checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] @@ -479,21 +506,21 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -513,6 +540,27 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fancy-regex" version = "0.11.0" @@ -600,7 +648,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] @@ -646,9 +694,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -663,11 +711,11 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" -version = "0.17.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "libgit2-sys", "log", @@ -682,9 +730,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -704,9 +752,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" @@ -719,9 +767,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -730,20 +778,26 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", - "pin-project-lite", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] [[package]] name = "httparse" @@ -751,68 +805,82 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "log", "rustls", "rustls-native-certs", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", "hyper", "pin-project-lite", + "socket2", "tokio", - "tokio-io-timeout", + "tower", + "tower-service", + "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -849,9 +917,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.1" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -859,9 +927,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "instant" @@ -886,9 +954,9 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "java-properties" @@ -903,40 +971,41 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-patch" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", "thiserror", - "treediff", ] [[package]] name = "jsonpath-rust" -version = "0.3.5" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cc127b7c3d270be504572364f9569761a180b981919dd0d87693a7f5fb7829" +checksum = "19d8fe85bd70ff715f31ce8c739194b423d79811a19602115d611a3ec85d6200" dependencies = [ + "lazy_static", + "once_cell", "pest", "pest_derive", "regex", @@ -946,12 +1015,11 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" +checksum = "19501afb943ae5806548bc3ebd7f3374153ca057a38f480ef30adfde5ef09755" dependencies = [ - "base64", - "bytes", + "base64 0.22.1", "chrono", "schemars", "serde", @@ -961,9 +1029,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.87.2" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3499c8d60c763246c7a213f51caac1e9033f46026904cb89bc8951ae8601f26e" +checksum = "264461a7ebf4fb0fcf23e4c7e4f9387c5696ee61d003de207d9b5a895ff37bfa" dependencies = [ "k8s-openapi", "kube-client", @@ -974,11 +1042,11 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.87.2" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033450dfa0762130565890dadf2f8835faedf749376ca13345bcd8ecd6b5f29f" +checksum = "47164ad6c47398ee4bdf90509c7b44026229721cb1377eb4623a1ec2a00a85e9" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "chrono", "either", @@ -986,14 +1054,15 @@ dependencies = [ "home", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", "hyper-timeout", + "hyper-util", "jsonpath-rust", "k8s-openapi", "kube-core", "pem", - "pin-project", "rustls", "rustls-pemfile", "secrecy", @@ -1010,16 +1079,15 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.87.2" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae" +checksum = "2797d3044a238825432129cd9537e12c2a6dacbbb5352381af5ea55e1505ed4f" dependencies = [ "chrono", "form_urlencoded", "http", "json-patch", "k8s-openapi", - "once_cell", "schemars", "serde", "serde_json", @@ -1028,24 +1096,26 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.87.2" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e98dd5e5767c7b894c1f0e41fd628b145f808e981feb8b08ed66455d47f1a4" +checksum = "fcf837edaa0c478f85e9a3cddb17fa80d58a57c1afa722b3a9e55753ea162f41" dependencies = [ "darling", "proc-macro2", "quote", "serde_json", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "kube-runtime" -version = "0.87.2" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8893eb18fbf6bb6c80ef6ee7dd11ec32b1dc3c034c988ac1b3a84d46a230ae" +checksum = "e463e89a1fb222c65a5469b568803153d1bf13d084a8dd42b659e6cca66edc6e" dependencies = [ "ahash", + "async-broadcast", + "async-stream", "async-trait", "backoff", "derivative", @@ -1073,15 +1143,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -1091,9 +1161,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -1103,9 +1173,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1113,9 +1183,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "matchers" @@ -1128,9 +1198,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -1140,18 +1210,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -1170,9 +1240,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1210,13 +1280,12 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" dependencies = [ "futures-core", "futures-sink", - "indexmap", "js-sys", "once_cell", "pin-project-lite", @@ -1226,9 +1295,9 @@ dependencies = [ [[package]] name = "opentelemetry-jaeger" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" +checksum = "fb7f5ef13427696ae8382c6f3bb7dcdadb5994223d6b983c7c50a46df7d19277" dependencies = [ "async-trait", "futures-core", @@ -1242,18 +1311,15 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] +checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" [[package]] name = "opentelemetry_sdk" -version = "0.21.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" +checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" dependencies = [ "async-trait", "crossbeam-channel", @@ -1295,11 +1361,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1307,24 +1379,24 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64", + "base64 0.22.1", "serde", ] @@ -1336,9 +1408,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1347,9 +1419,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -1357,22 +1429,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -1381,29 +1453,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1413,9 +1485,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "ppv-lite86" @@ -1425,9 +1497,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.74" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -1450,9 +1522,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1489,23 +1561,23 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -1519,13 +1591,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -1536,84 +1608,97 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustls" -version = "0.21.10" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e" dependencies = [ "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64", + "base64 0.22.1", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -1626,26 +1711,27 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" dependencies = [ "dyn-clone", "schemars_derive", "serde", "serde_json", + "url", ] [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] @@ -1654,16 +1740,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secrecy" version = "0.8.0" @@ -1676,11 +1752,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1689,9 +1765,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1699,18 +1775,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.194" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] @@ -1727,51 +1800,42 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.194" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.110" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - [[package]] name = "serde_yaml" -version = "0.9.30" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -1802,9 +1866,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1820,9 +1884,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snafu" @@ -1844,6 +1908,15 @@ dependencies = [ "snafu-derive 0.7.5", ] +[[package]] +name = "snafu" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +dependencies = [ + "snafu-derive 0.8.2", +] + [[package]] name = "snafu-derive" version = "0.6.10" @@ -1867,14 +1940,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "snafu-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1885,8 +1970,8 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-operator" -version = "0.64.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#d988822e7af3d363d52fb35643f0c6ed933f340a" +version = "0.67.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#9ba3ab1ea4164ba9946d7febdfae5911decc0f4b" dependencies = [ "chrono", "clap", @@ -1900,21 +1985,18 @@ dependencies = [ "k8s-openapi", "kube", "lazy_static", - "opentelemetry", "opentelemetry-jaeger", "opentelemetry_sdk", "product-config", - "rand", "regex", "schemars", "semver", "serde", "serde_json", "serde_yaml", - "snafu 0.7.5", + "snafu 0.8.2", "stackable-operator-derive", "strum", - "thiserror", "tokio", "tracing", "tracing-opentelemetry", @@ -1924,13 +2006,13 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.64.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#d988822e7af3d363d52fb35643f0c6ed933f340a" +version = "0.3.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#9ba3ab1ea4164ba9946d7febdfae5911decc0f4b" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] @@ -1942,7 +2024,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "snafu 0.7.5", + "snafu 0.8.2", "stackable-operator", "strum", "tokio", @@ -1961,7 +2043,7 @@ dependencies = [ "indoc", "product-config", "serde", - "snafu 0.7.5", + "snafu 0.8.2", "stackable-operator", "stackable-superset-crd", "strum", @@ -1983,26 +2065,32 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.46", + "syn 2.0.61", ] +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "syn" version = "1.0.109" @@ -2016,9 +2104,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.46" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -2027,29 +2115,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2094,9 +2182,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2111,16 +2199,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.2.0" @@ -2129,24 +2207,25 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2155,9 +2234,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -2165,41 +2244,6 @@ dependencies = [ "pin-project-lite", "slab", "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", ] [[package]] @@ -2221,18 +2265,16 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "base64", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags", "bytes", - "futures-core", - "futures-util", "http", "http-body", - "http-range-header", + "http-body-util", "mime", "pin-project-lite", "tower-layer", @@ -2272,7 +2314,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] @@ -2298,9 +2340,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", @@ -2332,15 +2374,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -2361,9 +2394,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2373,9 +2406,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -2388,9 +2421,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -2407,6 +2440,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -2456,9 +2490,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2466,24 +2500,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2491,28 +2525,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -2546,7 +2580,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2564,7 +2598,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2584,17 +2618,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2605,9 +2640,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2617,9 +2652,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2629,9 +2664,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2641,9 +2682,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2653,9 +2694,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2665,9 +2706,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2677,43 +2718,34 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" -dependencies = [ - "memchr", -] +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.61", ] [[package]] diff --git a/Cargo.nix b/Cargo.nix index 2800018b..425510ab 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -127,9 +127,9 @@ rec { }; "ahash" = rec { crateName = "ahash"; - version = "0.8.7"; + version = "0.8.11"; edition = "2018"; - sha256 = "008xw6gigwnf0q01ic4ar2y4dqfnzn3kyys6vd4cvfa3imjakhvp"; + sha256 = "04chdfkls5xmhp1d48gnjsmglbqibizs3bpbj6rsj604m10si7g8"; authors = [ "Tom Kaitchuck " ]; @@ -176,9 +176,9 @@ rec { }; "aho-corasick" = rec { crateName = "aho-corasick"; - version = "1.1.2"; + version = "1.1.3"; edition = "2021"; - sha256 = "1w510wnixvlgimkx1zjbvlxh6xps2vjgfqgwf5a6adlbjp5rv5mj"; + sha256 = "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f"; libName = "aho_corasick"; authors = [ "Andrew Gallant " @@ -197,13 +197,13 @@ rec { "perf-literal" = [ "dep:memchr" ]; "std" = [ "memchr?/std" ]; }; - resolvedDefaultFeatures = [ "default" "perf-literal" "std" ]; + resolvedDefaultFeatures = [ "perf-literal" "std" ]; }; "allocator-api2" = rec { crateName = "allocator-api2"; - version = "0.2.16"; + version = "0.2.18"; edition = "2018"; - sha256 = "1iayppgq4wqbfbfcqmsbwgamj0s65012sskfvyx07pxavk3gyhh9"; + sha256 = "0kr6lfnxvnj164j1x38g97qjlhb7akppqzvgfs0697140ixbav2w"; authors = [ "Zakarum " ]; @@ -287,9 +287,9 @@ rec { }; "anstyle" = rec { crateName = "anstyle"; - version = "1.0.4"; + version = "1.0.7"; edition = "2021"; - sha256 = "11yxw02b6parn29s757z96rgiqbn8qy0fk9a3p3bhczm85dhfybh"; + sha256 = "06qxmrba0xbhv07jpdvrdrhw1hjlb9icj88bqvlnissz9bqgr383"; features = { "default" = [ "std" ]; }; @@ -297,9 +297,9 @@ rec { }; "anstyle-parse" = rec { crateName = "anstyle-parse"; - version = "0.2.3"; + version = "0.2.4"; edition = "2021"; - sha256 = "134jhzrz89labrdwxxnjxqjdg06qvaflj1wkfnmyapwyldfwcnn7"; + sha256 = "1m121pa4plpcb4g7xali2kv9njmgb3713q3fxf60b4jd0fli2fn0"; dependencies = [ { name = "utf8parse"; @@ -316,9 +316,9 @@ rec { }; "anstyle-query" = rec { crateName = "anstyle-query"; - version = "1.0.2"; + version = "1.0.3"; edition = "2021"; - sha256 = "0j3na4b1nma39g4x7cwvj009awxckjf3z2vkwhldgka44hqj72g2"; + sha256 = "1x9pyl231rry5g45dvkdb2sfnl2dx2f4qd9a5v3ml8kr9ryr0k56"; dependencies = [ { name = "windows-sys"; @@ -331,9 +331,9 @@ rec { }; "anstyle-wincon" = rec { crateName = "anstyle-wincon"; - version = "3.0.2"; + version = "3.0.3"; edition = "2021"; - sha256 = "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w"; + sha256 = "06gv2vbj4hvwb8fxqjmvabp5kx2w01cjgh86pd98y1mpzr4q98v1"; dependencies = [ { name = "anstyle"; @@ -350,9 +350,9 @@ rec { }; "anyhow" = rec { crateName = "anyhow"; - version = "1.0.79"; + version = "1.0.83"; edition = "2018"; - sha256 = "1ji5irqiwr8yprgqj8zvnli7zd7fz9kzaiddq44jnrl2l289h3h8"; + sha256 = "1wzm0i8jlmxpcfkmrqnmcpi00ca4g2kg6zfdm4cvbqnwpcnb7g95"; authors = [ "David Tolnay " ]; @@ -362,11 +362,91 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; + "async-broadcast" = rec { + crateName = "async-broadcast"; + version = "0.7.0"; + edition = "2018"; + sha256 = "1nybg8i495m380rr7xj7z2xigdpf1b7qcb9vg04ry6vlmahm52r5"; + authors = [ + "Stjepan Glavina " + "Yoshua Wuyts " + "Zeeshan Ali Khan " + ]; + dependencies = [ + { + name = "event-listener"; + packageId = "event-listener"; + } + { + name = "event-listener-strategy"; + packageId = "event-listener-strategy"; + } + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + + }; + "async-stream" = rec { + crateName = "async-stream"; + version = "0.3.5"; + edition = "2018"; + sha256 = "0l8sjq1rylkb1ak0pdyjn83b3k6x36j22myngl4sqqgg7whdsmnd"; + authors = [ + "Carl Lerche " + ]; + dependencies = [ + { + name = "async-stream-impl"; + packageId = "async-stream-impl"; + } + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + + }; + "async-stream-impl" = rec { + crateName = "async-stream-impl"; + version = "0.3.5"; + edition = "2018"; + sha256 = "14q179j4y8p2z1d0ic6aqgy9fhwz8p9cai1ia8kpw4bw7q12mrhn"; + procMacro = true; + authors = [ + "Carl Lerche " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.61"; + features = [ "full" "visit-mut" ]; + } + ]; + + }; "async-trait" = rec { crateName = "async-trait"; - version = "0.1.77"; + version = "0.1.80"; edition = "2021"; - sha256 = "1adf1jh2yg39rkpmqjqyr9xyd6849p0d95425i6imgbhx0syx069"; + sha256 = "1jip2xkv8l67bbg6jrz3b1sdb7api77vy38wrjl7sfkmya3j1yn6"; procMacro = true; authors = [ "David Tolnay " @@ -382,7 +462,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" "visit-mut" ]; } ]; @@ -390,9 +470,9 @@ rec { }; "autocfg" = rec { crateName = "autocfg"; - version = "1.1.0"; + version = "1.3.0"; edition = "2015"; - sha256 = "1ylp3cb47ylzabimazvbz9ms6ap784zhb6syaz6c1jqpmcmq0s6l"; + sha256 = "1c3njkfzpil03k92q0mij5y1pkhhfr4j3bf0h53bgl2vs85lsjqc"; authors = [ "Josh Stone " ]; @@ -434,9 +514,9 @@ rec { }; "backtrace" = rec { crateName = "backtrace"; - version = "0.3.69"; - edition = "2018"; - sha256 = "0dsq23dhw4pfndkx2nsa1ml2g31idm7ss7ljxp8d57avygivg290"; + version = "0.3.71"; + edition = "2021"; + sha256 = "17bgd7pbjb9gc8q47qwsg2lmy9i62x3bsjmmnjrwh5z8s805ic16"; authors = [ "The Rust Project Developers" ]; @@ -468,7 +548,7 @@ rec { packageId = "object"; usesDefaultFeatures = false; target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env" or null) && (!("uwp" == target."vendor" or null)))); - features = [ "read_core" "elf" "macho" "pe" "unaligned" "archive" ]; + features = [ "read_core" "elf" "macho" "pe" "xcoff" "unaligned" "archive" ]; } { name = "rustc-demangle"; @@ -493,11 +573,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "base64" = rec { + "base64 0.21.7" = rec { crateName = "base64"; - version = "0.21.5"; + version = "0.21.7"; edition = "2018"; - sha256 = "1y8x2xs9nszj5ix7gg4ycn5a6wy7ca74zxwqri3bdqzdjha6lqrm"; + sha256 = "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx"; authors = [ "Alice Maz " "Marshall Pierce " @@ -508,6 +588,20 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; + "base64 0.22.1" = rec { + crateName = "base64"; + version = "0.22.1"; + edition = "2018"; + sha256 = "1imqzgh7bxcikp5vx3shqvw9j09g9ly0xr0jma0q66i52r7jbcvj"; + authors = [ + "Marshall Pierce " + ]; + features = { + "default" = [ "std" ]; + "std" = [ "alloc" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + }; "bit-set" = rec { crateName = "bit-set"; version = "0.5.3"; @@ -545,26 +639,11 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "bitflags 1.3.2" = rec { + "bitflags" = rec { crateName = "bitflags"; - version = "1.3.2"; - edition = "2018"; - sha256 = "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy"; - authors = [ - "The Rust Project Developers" - ]; - features = { - "compiler_builtins" = [ "dep:compiler_builtins" ]; - "core" = [ "dep:core" ]; - "rustc-dep-of-std" = [ "core" "compiler_builtins" ]; - }; - resolvedDefaultFeatures = [ "default" ]; - }; - "bitflags 2.4.1" = rec { - crateName = "bitflags"; - version = "2.4.1"; + version = "2.5.0"; edition = "2021"; - sha256 = "01ryy3kd671b0ll4bhdvhsz67vwz1lz53fz504injrd7wpv64xrj"; + sha256 = "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"; authors = [ "The Rust Project Developers" ]; @@ -595,18 +674,13 @@ rec { }; "built" = rec { crateName = "built"; - version = "0.6.1"; + version = "0.7.2"; edition = "2021"; - sha256 = "16l8070i2g0cqijsbzkrnvy58lplplimc19i4cc688rcggf4r75r"; + sha256 = "05igfjr1hxcha6j7pz8jx1w825gdiqdbiyl0bs5pmf2n2arbvgs1"; authors = [ "Lukas Lueg " ]; dependencies = [ - { - name = "cargo-lock"; - packageId = "cargo-lock"; - usesDefaultFeatures = false; - } { name = "chrono"; packageId = "chrono"; @@ -622,7 +696,9 @@ rec { } ]; features = { + "cargo-lock" = [ "dep:cargo-lock" ]; "chrono" = [ "dep:chrono" ]; + "dependency-tree" = [ "cargo-lock/dependency-tree" ]; "git2" = [ "dep:git2" ]; "semver" = [ "dep:semver" ]; }; @@ -630,14 +706,15 @@ rec { }; "bumpalo" = rec { crateName = "bumpalo"; - version = "3.14.0"; + version = "3.16.0"; edition = "2021"; - sha256 = "1v4arnv9kwk54v5d0qqpv4vyw2sgr660nk0w3apzixi1cm3yfc3z"; + sha256 = "0b015qb4knwanbdlp1x48pkb4pm57b8gidbhhhxr900q2wb6fabr"; authors = [ "Nick Fitzgerald " ]; features = { "allocator-api2" = [ "dep:allocator-api2" ]; + "serde" = [ "dep:serde" ]; }; resolvedDefaultFeatures = [ "default" ]; }; @@ -656,9 +733,9 @@ rec { }; "bytes" = rec { crateName = "bytes"; - version = "1.5.0"; + version = "1.6.0"; edition = "2018"; - sha256 = "08w2i8ac912l8vlvkv3q51cd4gr09pwlg3sjsjffcizlrb0i5gd2"; + sha256 = "1jf2awc1fywpk15m6pxay3wqcg65ararg9xi4b08vnszwiyy2kai"; authors = [ "Carl Lerche " "Sean McArthur " @@ -669,48 +746,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "cargo-lock" = rec { - crateName = "cargo-lock"; - version = "9.0.0"; - edition = "2021"; - crateBin = []; - sha256 = "0wmczs13psr8p9mc51w4r4pm900dbpbpipp87knlkd7gg19nf771"; - authors = [ - "Tony Arcieri " - ]; - dependencies = [ - { - name = "semver"; - packageId = "semver"; - features = [ "serde" ]; - } - { - name = "serde"; - packageId = "serde"; - features = [ "serde_derive" ]; - } - { - name = "toml"; - packageId = "toml"; - } - { - name = "url"; - packageId = "url"; - } - ]; - features = { - "cli" = [ "gumdrop" "dependency-tree" ]; - "dependency-tree" = [ "petgraph" ]; - "gumdrop" = [ "dep:gumdrop" ]; - "petgraph" = [ "dep:petgraph" ]; - }; - }; "cc" = rec { crateName = "cc"; - version = "1.0.83"; + version = "1.0.97"; edition = "2018"; - crateBin = []; - sha256 = "1l643zidlb5iy1dskc5ggqs4wqa29a02f44piczqc8zcnsq4y5zi"; + sha256 = "1d6rv3nk5q6lrr3mf7lifqpjr44slylsz3pw6pmn2k2cv1bm76h9"; authors = [ "Alex Crichton " ]; @@ -719,19 +759,28 @@ rec { name = "jobserver"; packageId = "jobserver"; optional = true; + usesDefaultFeatures = false; } { name = "libc"; packageId = "libc"; + optional = true; usesDefaultFeatures = false; target = { target, features }: (target."unix" or false); } + { + name = "once_cell"; + packageId = "once_cell"; + optional = true; + } ]; features = { "jobserver" = [ "dep:jobserver" ]; - "parallel" = [ "jobserver" ]; + "libc" = [ "dep:libc" ]; + "once_cell" = [ "dep:once_cell" ]; + "parallel" = [ "libc" "jobserver" "once_cell" ]; }; - resolvedDefaultFeatures = [ "jobserver" "parallel" ]; + resolvedDefaultFeatures = [ "jobserver" "libc" "once_cell" "parallel" ]; }; "cfg-if" = rec { crateName = "cfg-if"; @@ -749,9 +798,9 @@ rec { }; "chrono" = rec { crateName = "chrono"; - version = "0.4.31"; + version = "0.4.38"; edition = "2021"; - sha256 = "0f6vg67pipm8cziad2yms6a639pssnvysk1m05dd9crymmdnhb3z"; + sha256 = "009l8vc5p8750vn02z30mblg4pv2qhkbfizhfwmzc6vpy5nr67x2"; dependencies = [ { name = "android-tzdata"; @@ -779,7 +828,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.48.5"; + packageId = "windows-targets 0.52.5"; optional = true; target = { target, features }: (target."windows" or false); } @@ -787,21 +836,26 @@ rec { features = { "android-tzdata" = [ "dep:android-tzdata" ]; "arbitrary" = [ "dep:arbitrary" ]; - "clock" = [ "std" "winapi" "iana-time-zone" "android-tzdata" ]; + "clock" = [ "winapi" "iana-time-zone" "android-tzdata" "now" ]; "default" = [ "clock" "std" "oldtime" "wasmbind" ]; "iana-time-zone" = [ "dep:iana-time-zone" ]; "js-sys" = [ "dep:js-sys" ]; + "now" = [ "std" ]; "pure-rust-locales" = [ "dep:pure-rust-locales" ]; - "rkyv" = [ "dep:rkyv" ]; - "rustc-serialize" = [ "dep:rustc-serialize" ]; + "rkyv" = [ "dep:rkyv" "rkyv/size_32" ]; + "rkyv-16" = [ "dep:rkyv" "rkyv?/size_16" ]; + "rkyv-32" = [ "dep:rkyv" "rkyv?/size_32" ]; + "rkyv-64" = [ "dep:rkyv" "rkyv?/size_64" ]; + "rkyv-validation" = [ "rkyv?/validation" ]; "serde" = [ "dep:serde" ]; - "unstable-locales" = [ "pure-rust-locales" "alloc" ]; + "std" = [ "alloc" ]; + "unstable-locales" = [ "pure-rust-locales" ]; "wasm-bindgen" = [ "dep:wasm-bindgen" ]; "wasmbind" = [ "wasm-bindgen" "js-sys" ]; "winapi" = [ "windows-targets" ]; "windows-targets" = [ "dep:windows-targets" ]; }; - resolvedDefaultFeatures = [ "alloc" "android-tzdata" "clock" "iana-time-zone" "serde" "std" "winapi" "windows-targets" ]; + resolvedDefaultFeatures = [ "alloc" "android-tzdata" "clock" "iana-time-zone" "now" "serde" "std" "winapi" "windows-targets" ]; }; "clap" = rec { crateName = "clap"; @@ -903,7 +957,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -922,11 +976,35 @@ rec { }; "colorchoice" = rec { crateName = "colorchoice"; - version = "1.0.0"; + version = "1.0.1"; edition = "2021"; - sha256 = "1ix7w85kwvyybwi2jdkl3yva2r2bvdcc3ka2grjfzfgrapqimgxc"; + sha256 = "08h4jsrd2j5k6lp1b9v5p1f1g7cmyzm4djsvb3ydywdb4hmqashb"; }; + "concurrent-queue" = rec { + crateName = "concurrent-queue"; + version = "2.5.0"; + edition = "2021"; + sha256 = "0wrr3mzq2ijdkxwndhf79k952cp4zkz35ray8hvsxl96xrx1k82c"; + authors = [ + "Stjepan Glavina " + "Taiki Endo " + "John Nunley " + ]; + dependencies = [ + { + name = "crossbeam-utils"; + packageId = "crossbeam-utils"; + usesDefaultFeatures = false; + } + ]; + features = { + "default" = [ "std" ]; + "loom" = [ "dep:loom" ]; + "portable-atomic" = [ "dep:portable-atomic" ]; + }; + resolvedDefaultFeatures = [ "std" ]; + }; "const_format" = rec { crateName = "const_format"; version = "0.2.32"; @@ -1036,9 +1114,9 @@ rec { }; "cpufeatures" = rec { crateName = "cpufeatures"; - version = "0.2.11"; + version = "0.2.12"; edition = "2018"; - sha256 = "1l0gzsyy576n017g9bf0vkv5hhg9cpz1h1libxyfdlzcgbh0yhnf"; + sha256 = "012m7rrak4girqlii3jnqwrr73gv1i980q4wra5yyyhvzwk5xzjk"; authors = [ "RustCrypto Developers" ]; @@ -1068,14 +1146,10 @@ rec { }; "crossbeam-channel" = rec { crateName = "crossbeam-channel"; - version = "0.5.10"; + version = "0.5.12"; edition = "2021"; - sha256 = "1cj82zy71rqrp99566b1l8bcjg7ay2kb77wv093rr7aj6qxbgac2"; + sha256 = "159gp30clv2ci3r473659ii04pjznspb3g9gwkhj2lavkhmb0gdb"; dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } { name = "crossbeam-utils"; packageId = "crossbeam-utils"; @@ -1090,15 +1164,9 @@ rec { }; "crossbeam-utils" = rec { crateName = "crossbeam-utils"; - version = "0.8.18"; + version = "0.8.19"; edition = "2021"; - sha256 = "176kcvw428zj024i60kd5jsqvli0y3khxac4ylk4gn7bf2kk1963"; - dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } - ]; + sha256 = "0iakrb1b8fjqrag7wphl94d10irhbh2fw1g444xslsywqyn3p3i4"; features = { "default" = [ "std" ]; "loom" = [ "dep:loom" ]; @@ -1131,9 +1199,9 @@ rec { }; "darling" = rec { crateName = "darling"; - version = "0.20.3"; + version = "0.20.8"; edition = "2018"; - sha256 = "0pjwwadwgnvvgn5qm3glpv7hjl7siaqqpw6cvh2mdar7lr6xj282"; + sha256 = "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl"; authors = [ "Ted Driggs " ]; @@ -1156,9 +1224,9 @@ rec { }; "darling_core" = rec { crateName = "darling_core"; - version = "0.20.3"; + version = "0.20.8"; edition = "2018"; - sha256 = "08g6afi3z9jgcqx7g41s1mzr6q3dj2z56vz7v1bv6941h51k8zhp"; + sha256 = "03x7s149p06xfwcq0lgkk4yxh6jf7jckny18nzp1yyk87b1g2b4w"; authors = [ "Ted Driggs " ]; @@ -1186,7 +1254,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" "extra-traits" ]; } ]; @@ -1198,9 +1266,9 @@ rec { }; "darling_macro" = rec { crateName = "darling_macro"; - version = "0.20.3"; + version = "0.20.8"; edition = "2018"; - sha256 = "1mg2k1f0v33s271lpn4m5mxcfjqnmg61bf77svb44cyngay9nsl3"; + sha256 = "0gwkz0cjfy3fgcc1zmm7azzhj5qpja34s0cklcria4l38sjyss56"; procMacro = true; authors = [ "Ted Driggs " @@ -1216,7 +1284,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; } ]; @@ -1242,7 +1310,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" "visit-mut" ]; } ]; @@ -1360,9 +1428,9 @@ rec { }; "dyn-clone" = rec { crateName = "dyn-clone"; - version = "1.0.16"; + version = "1.0.17"; edition = "2018"; - sha256 = "0pa9kas6a241pbx0q82ipwi4f7m7wwyzkkc725caky24gl4j4nsl"; + sha256 = "09cig7dgg6jnqa10p4233nd8wllbjf4ffsw7wj0m4lwa5w3z0vhd"; authors = [ "David Tolnay " ]; @@ -1370,9 +1438,9 @@ rec { }; "either" = rec { crateName = "either"; - version = "1.9.0"; + version = "1.11.0"; edition = "2018"; - sha256 = "01qy3anr7jal5lpc20791vxrw0nl6vksb5j7x56q2fycgcyy8sm2"; + sha256 = "18l0cwyw18syl8b52syv6balql8mnwfyhihjqqllx5pms93iqz54"; authors = [ "bluss" ]; @@ -1384,9 +1452,9 @@ rec { }; "encoding_rs" = rec { crateName = "encoding_rs"; - version = "0.8.33"; + version = "0.8.34"; edition = "2018"; - sha256 = "1qa5k4a0ipdrxq4xg9amms9r9pnnfn7nfh2i9m3mw0ka563b6s3j"; + sha256 = "0nagpi1rjqdpvakymwmnlxzq908ncg868lml5b70n08bm82fjpdl"; authors = [ "Henri Sivonen " ]; @@ -1397,11 +1465,11 @@ rec { } ]; features = { + "any_all_workaround" = [ "dep:any_all_workaround" ]; "default" = [ "alloc" ]; "fast-legacy-encode" = [ "fast-hangul-encode" "fast-hanja-encode" "fast-kanji-encode" "fast-gb-hanzi-encode" "fast-big5-hanzi-encode" ]; - "packed_simd" = [ "dep:packed_simd" ]; "serde" = [ "dep:serde" ]; - "simd-accel" = [ "packed_simd" "packed_simd/into_bits" ]; + "simd-accel" = [ "any_all_workaround" ]; }; resolvedDefaultFeatures = [ "alloc" "default" ]; }; @@ -1428,6 +1496,67 @@ rec { sha256 = "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"; }; + "event-listener" = rec { + crateName = "event-listener"; + version = "5.3.0"; + edition = "2021"; + sha256 = "091a6bgxzjnycqa10l2sqwzzy0j9vpw7a1w0nbglqlqkraw496bd"; + authors = [ + "Stjepan Glavina " + ]; + dependencies = [ + { + name = "concurrent-queue"; + packageId = "concurrent-queue"; + usesDefaultFeatures = false; + } + { + name = "parking"; + packageId = "parking"; + optional = true; + target = { target, features }: (!(builtins.elem "wasm" target."family")); + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + features = { + "default" = [ "std" ]; + "loom" = [ "concurrent-queue/loom" "parking?/loom" "dep:loom" ]; + "parking" = [ "dep:parking" ]; + "portable-atomic" = [ "portable-atomic-util" "portable_atomic_crate" ]; + "portable-atomic-util" = [ "dep:portable-atomic-util" ]; + "portable_atomic_crate" = [ "dep:portable_atomic_crate" ]; + "std" = [ "concurrent-queue/std" "parking" ]; + }; + resolvedDefaultFeatures = [ "default" "parking" "std" ]; + }; + "event-listener-strategy" = rec { + crateName = "event-listener-strategy"; + version = "0.5.2"; + edition = "2021"; + sha256 = "18f5ri227khkayhv3ndv7yl4rnasgwksl2jhwgafcxzr7324s88g"; + authors = [ + "John Nunley " + ]; + dependencies = [ + { + name = "event-listener"; + packageId = "event-listener"; + usesDefaultFeatures = false; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "event-listener/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; "fancy-regex" = rec { crateName = "fancy-regex"; version = "0.11.0"; @@ -1666,7 +1795,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -1815,9 +1944,9 @@ rec { }; "getrandom" = rec { crateName = "getrandom"; - version = "0.2.11"; + version = "0.2.15"; edition = "2018"; - sha256 = "03q7120cc2kn7ry013i67zmjl2g9q73h1ks5z08hq5v9syz0d47y"; + sha256 = "1mzlnrb3dgyd1fb84gvw10pyr8wdqdl4ry4sr64i1s8an66pqmn4"; authors = [ "The Rand Project Developers" ]; @@ -1868,9 +1997,9 @@ rec { }; "git2" = rec { crateName = "git2"; - version = "0.17.2"; + version = "0.18.3"; edition = "2018"; - sha256 = "0i00kg3yizh7mn6hnj3yz3hpniisidlavifgy8n3cnm9gim9v63v"; + sha256 = "0w7gcq6v9kdlh0vcv27xrk09c1bhkarqhnp52pvnnximzrxnlbi3"; authors = [ "Josh Triplett " "Alex Crichton " @@ -1878,7 +2007,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags"; } { name = "libc"; @@ -1921,9 +2050,9 @@ rec { }; "hashbrown" = rec { crateName = "hashbrown"; - version = "0.14.3"; + version = "0.14.5"; edition = "2021"; - sha256 = "012nywlg0lj9kwanh69my5x67vjlfmzfi9a0rq4qvis2j8fil3r9"; + sha256 = "1wa1vy1xs3mp11bn3z9dv0jricgr6a2j0zkf1g19yz3vw4il89z5"; authors = [ "Amanieu d'Antras " ]; @@ -1981,9 +2110,9 @@ rec { }; "hermit-abi" = rec { crateName = "hermit-abi"; - version = "0.3.3"; + version = "0.3.9"; edition = "2021"; - sha256 = "1dyc8qsjh876n74a3rcz8h43s27nj1sypdhsn2ms61bd3b47wzyp"; + sha256 = "092hxjbjnq5fmz66grd9plxd0sh6ssg5fhgwwwqbrzgzkjwdycfj"; authors = [ "Stefan Lankes" ]; @@ -2015,9 +2144,9 @@ rec { }; "http" = rec { crateName = "http"; - version = "0.2.11"; + version = "1.1.0"; edition = "2018"; - sha256 = "1fwz3mhh86h5kfnr5767jlx9agpdggclq7xsqx930fflzakb2iw9"; + sha256 = "0n426lmcxas6h75c2cp25m933pswlrfjz10v91vc62vib2sdvf91"; authors = [ "Alex Crichton " "Carl Lerche " @@ -2037,13 +2166,16 @@ rec { packageId = "itoa"; } ]; - + features = { + "default" = [ "std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; }; "http-body" = rec { crateName = "http-body"; - version = "0.4.6"; + version = "1.0.0"; edition = "2018"; - sha256 = "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw"; + sha256 = "0hyn8n3iadrbwq8y0p1rl1275s4nm49bllw5wji29g4aa3dqbb0w"; authors = [ "Carl Lerche " "Lucio Franco " @@ -2058,6 +2190,36 @@ rec { name = "http"; packageId = "http"; } + ]; + + }; + "http-body-util" = rec { + crateName = "http-body-util"; + version = "0.1.1"; + edition = "2018"; + sha256 = "07agldas2qgcfc05ckiarlmf9vzragbda823nqhrqrc6mjrghx84"; + authors = [ + "Carl Lerche " + "Lucio Franco " + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "http"; + packageId = "http"; + } + { + name = "http-body"; + packageId = "http-body"; + } { name = "pin-project-lite"; packageId = "pin-project-lite"; @@ -2065,14 +2227,6 @@ rec { ]; }; - "http-range-header" = rec { - crateName = "http-range-header"; - version = "0.3.1"; - edition = "2018"; - sha256 = "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d"; - features = { - }; - }; "httparse" = rec { crateName = "httparse"; version = "1.8.0"; @@ -2086,21 +2240,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "httpdate" = rec { - crateName = "httpdate"; - version = "1.0.3"; - edition = "2021"; - sha256 = "1aa9rd2sac0zhjqh24c9xvir96g188zldkx0hr6dnnlx5904cfyz"; - authors = [ - "Pyfisch " - ]; - - }; "hyper" = rec { crateName = "hyper"; - version = "0.14.28"; - edition = "2018"; - sha256 = "107gkvqx4h9bl17d602zkm2dgpfq86l2dr36yzfsi8l3xcsy35mz"; + version = "1.3.1"; + edition = "2021"; + sha256 = "0va9pjqshsr8zc07m9h4j2821hsmd9lw9j416yisjqh8gp8msmzy"; authors = [ "Sean McArthur " ]; @@ -2112,15 +2256,12 @@ rec { { name = "futures-channel"; packageId = "futures-channel"; - } - { - name = "futures-core"; - packageId = "futures-core"; - usesDefaultFeatures = false; + optional = true; } { name = "futures-util"; packageId = "futures-util"; + optional = true; usesDefaultFeatures = false; } { @@ -2134,75 +2275,69 @@ rec { { name = "httparse"; packageId = "httparse"; - } - { - name = "httpdate"; - packageId = "httpdate"; + optional = true; } { name = "itoa"; packageId = "itoa"; + optional = true; } { name = "pin-project-lite"; packageId = "pin-project-lite"; + optional = true; } { - name = "socket2"; - packageId = "socket2"; + name = "smallvec"; + packageId = "smallvec"; optional = true; - features = [ "all" ]; + features = [ "const_generics" "const_new" ]; } { name = "tokio"; packageId = "tokio"; features = [ "sync" ]; } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - usesDefaultFeatures = false; - features = [ "std" ]; - } { name = "want"; packageId = "want"; + optional = true; } ]; devDependencies = [ + { + name = "futures-channel"; + packageId = "futures-channel"; + features = [ "sink" ]; + } { name = "futures-util"; packageId = "futures-util"; usesDefaultFeatures = false; - features = [ "alloc" ]; + features = [ "alloc" "sink" ]; } { name = "tokio"; packageId = "tokio"; - features = [ "fs" "macros" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ]; + features = [ "fs" "macros" "net" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ]; } ]; features = { - "ffi" = [ "libc" ]; - "full" = [ "client" "http1" "http2" "server" "stream" "runtime" ]; - "h2" = [ "dep:h2" ]; - "http2" = [ "h2" ]; - "libc" = [ "dep:libc" ]; - "runtime" = [ "tcp" "tokio/rt" "tokio/time" ]; - "socket2" = [ "dep:socket2" ]; - "tcp" = [ "socket2" "tokio/net" "tokio/rt" "tokio/time" ]; + "client" = [ "dep:want" "dep:pin-project-lite" "dep:smallvec" ]; + "ffi" = [ "dep:libc" "dep:http-body-util" "futures-util?/alloc" ]; + "full" = [ "client" "http1" "http2" "server" ]; + "http1" = [ "dep:futures-channel" "dep:futures-util" "dep:httparse" "dep:itoa" ]; + "http2" = [ "dep:futures-channel" "dep:futures-util" "dep:h2" ]; + "server" = [ "dep:httpdate" "dep:pin-project-lite" "dep:smallvec" ]; + "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "client" "default" "http1" "runtime" "server" "socket2" "stream" "tcp" ]; + resolvedDefaultFeatures = [ "client" "default" "http1" ]; }; "hyper-rustls" = rec { crateName = "hyper-rustls"; - version = "0.24.2"; + version = "0.27.1"; edition = "2021"; - sha256 = "1475j4a2nczz4aajzzsq3hpwg1zacmzbqg393a14j80ff8izsgpc"; + sha256 = "0arh47qg9ln3l8q4x9wcpwmsq4j1cc08mimw3sh3g86pjs3b72wh"; dependencies = [ { name = "futures-util"; @@ -2217,7 +2352,12 @@ rec { name = "hyper"; packageId = "hyper"; usesDefaultFeatures = false; - features = [ "client" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + usesDefaultFeatures = false; + features = [ "client-legacy" "tokio" ]; } { name = "log"; @@ -2234,6 +2374,11 @@ rec { packageId = "rustls-native-certs"; optional = true; } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } { name = "tokio"; packageId = "tokio"; @@ -2243,12 +2388,17 @@ rec { packageId = "tokio-rustls"; usesDefaultFeatures = false; } + { + name = "tower-service"; + packageId = "tower-service"; + } ]; devDependencies = [ { - name = "hyper"; - packageId = "hyper"; - features = [ "full" ]; + name = "hyper-util"; + packageId = "hyper-util"; + usesDefaultFeatures = false; + features = [ "server-auto" ]; } { name = "rustls"; @@ -2263,26 +2413,28 @@ rec { } ]; features = { - "acceptor" = [ "hyper/server" "tokio-runtime" ]; - "default" = [ "native-tokio" "http1" "tls12" "logging" "acceptor" ]; - "http1" = [ "hyper/http1" ]; - "http2" = [ "hyper/http2" ]; + "aws-lc-rs" = [ "rustls/aws_lc_rs" ]; + "default" = [ "native-tokio" "http1" "tls12" "logging" "aws-lc-rs" ]; + "fips" = [ "aws-lc-rs" "rustls/fips" ]; + "http1" = [ "hyper-util/http1" ]; + "http2" = [ "hyper-util/http2" ]; "log" = [ "dep:log" ]; "logging" = [ "log" "tokio-rustls/logging" "rustls/logging" ]; - "native-tokio" = [ "tokio-runtime" "rustls-native-certs" ]; + "native-tokio" = [ "rustls-native-certs" ]; + "ring" = [ "rustls/ring" ]; "rustls-native-certs" = [ "dep:rustls-native-certs" ]; + "rustls-platform-verifier" = [ "dep:rustls-platform-verifier" ]; "tls12" = [ "tokio-rustls/tls12" "rustls/tls12" ]; - "tokio-runtime" = [ "hyper/runtime" ]; "webpki-roots" = [ "dep:webpki-roots" ]; - "webpki-tokio" = [ "tokio-runtime" "webpki-roots" ]; + "webpki-tokio" = [ "webpki-roots" ]; }; - resolvedDefaultFeatures = [ "acceptor" "default" "http1" "log" "logging" "native-tokio" "rustls-native-certs" "tls12" "tokio-runtime" ]; + resolvedDefaultFeatures = [ "http1" "log" "logging" "native-tokio" "ring" "rustls-native-certs" "tls12" ]; }; "hyper-timeout" = rec { crateName = "hyper-timeout"; - version = "0.4.1"; + version = "0.5.1"; edition = "2018"; - sha256 = "1c8k3g8k2yh1gxvsx9p7amkimgxhl9kafwpj7jyf8ywc5r45ifdv"; + sha256 = "14rpyv9zz0ncadn9qgmnjz0hiqk3nav7hglkk1a6yfy8wmhsj0rj"; authors = [ "Herman J. Radtke III " ]; @@ -2290,7 +2442,11 @@ rec { { name = "hyper"; packageId = "hyper"; - features = [ "client" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "client-legacy" "http1" ]; } { name = "pin-project-lite"; @@ -2301,29 +2457,128 @@ rec { packageId = "tokio"; } { - name = "tokio-io-timeout"; - packageId = "tokio-io-timeout"; + name = "tower-service"; + packageId = "tower-service"; + } + ]; + devDependencies = [ + { + name = "hyper"; + packageId = "hyper"; + features = [ "http1" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "io-std" "io-util" "macros" ]; + } + ]; + + }; + "hyper-util" = rec { + crateName = "hyper-util"; + version = "0.1.3"; + edition = "2021"; + sha256 = "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a"; + authors = [ + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-channel"; + packageId = "futures-channel"; + optional = true; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + } + { + name = "http"; + packageId = "http"; + } + { + name = "http-body"; + packageId = "http-body"; + } + { + name = "hyper"; + packageId = "hyper"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "socket2"; + packageId = "socket2"; + optional = true; + features = [ "all" ]; + } + { + name = "tokio"; + packageId = "tokio"; + optional = true; + features = [ "net" "rt" "time" ]; + } + { + name = "tower"; + packageId = "tower"; + optional = true; + features = [ "make" "util" ]; + } + { + name = "tower-service"; + packageId = "tower-service"; + optional = true; + } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; } ]; devDependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } { name = "hyper"; packageId = "hyper"; - features = [ "client" "http1" "tcp" ]; + features = [ "full" ]; } { name = "tokio"; packageId = "tokio"; - features = [ "io-std" "io-util" "macros" ]; + features = [ "macros" "test-util" ]; } ]; - + features = { + "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower" "dep:tower-service" ]; + "client-legacy" = [ "client" ]; + "full" = [ "client" "client-legacy" "server" "server-auto" "service" "http1" "http2" "tokio" ]; + "http1" = [ "hyper/http1" ]; + "http2" = [ "hyper/http2" ]; + "server" = [ "hyper/server" ]; + "server-auto" = [ "server" "http1" "http2" ]; + "service" = [ "dep:tower" "dep:tower-service" ]; + "tokio" = [ "dep:tokio" "dep:socket2" ]; + }; + resolvedDefaultFeatures = [ "client" "client-legacy" "default" "http1" "tokio" ]; }; "iana-time-zone" = rec { crateName = "iana-time-zone"; - version = "0.1.59"; + version = "0.1.60"; edition = "2018"; - sha256 = "0fbmmmrx837w9hy25lcgjm4qkzclmvmmfpp1ij946i5aw9ip79mn"; + sha256 = "0hdid5xz3jznm04lysjm3vi93h3c523w0hcc3xba47jl3ddbpzz7"; authors = [ "Andrew Straw " "René Kijewski " @@ -2420,9 +2675,9 @@ rec { }; "indexmap" = rec { crateName = "indexmap"; - version = "2.0.1"; + version = "2.2.6"; edition = "2021"; - sha256 = "0kmi1dhkmnv937mbkzlqq9kmkdr8k5030vfk19bi8jcxy4x7q8md"; + sha256 = "09hgwi2ig0wyj5rjziia76zmhgfj95k0jb4ic3iiawm4vlavg3qn"; dependencies = [ { name = "equivalent"; @@ -2438,6 +2693,7 @@ rec { ]; features = { "arbitrary" = [ "dep:arbitrary" ]; + "borsh" = [ "dep:borsh" ]; "default" = [ "std" ]; "quickcheck" = [ "dep:quickcheck" ]; "rayon" = [ "dep:rayon" ]; @@ -2448,9 +2704,9 @@ rec { }; "indoc" = rec { crateName = "indoc"; - version = "2.0.4"; + version = "2.0.5"; edition = "2021"; - sha256 = "1n2z66b0y59rr6v4znpcijc2yd3yg6s40hpzv89yb140mvxnq60y"; + sha256 = "1dgjk49rkmx4kjy07k4b90qb5vl89smgb5rcw02n0q0x9ligaj5j"; procMacro = true; authors = [ "David Tolnay " @@ -2506,9 +2762,9 @@ rec { }; "itoa" = rec { crateName = "itoa"; - version = "1.0.10"; + version = "1.0.11"; edition = "2018"; - sha256 = "0k7xjfki7mnv6yzjrbnbnjllg86acmbnk4izz2jmm1hx2wd6v95i"; + sha256 = "0nv9cqjwzr3q58qz84dcz63ggc54yhf1yqar1m858m1kfd4g3wa9"; authors = [ "David Tolnay " ]; @@ -2542,9 +2798,9 @@ rec { }; "jobserver" = rec { crateName = "jobserver"; - version = "0.1.27"; - edition = "2018"; - sha256 = "0z9w6vfqwbr6hfk9yaw7kydlh6f7k39xdlszxlh39in4acwzcdwc"; + version = "0.1.31"; + edition = "2021"; + sha256 = "0vnyfxr5gm03j3lpnd1zswnyvqa40kbssy08pz2m35salfm9kc6j"; authors = [ "Alex Crichton " ]; @@ -2559,9 +2815,9 @@ rec { }; "js-sys" = rec { crateName = "js-sys"; - version = "0.3.66"; + version = "0.3.69"; edition = "2018"; - sha256 = "1ji9la5ydg0vy17q54i7dnwc0wwb9zkx662w1583pblylm6wdsff"; + sha256 = "0v99rz97asnzapb0jsc3jjhvxpfxr7h7qd97yqyrf9i7viimbh99"; authors = [ "The wasm-bindgen Developers" ]; @@ -2575,9 +2831,9 @@ rec { }; "json-patch" = rec { crateName = "json-patch"; - version = "1.2.0"; + version = "1.4.0"; edition = "2021"; - sha256 = "1ml90ygj65zd3g9mq0fpkkgr10mk138wm34z29j3z7krhqa1xzsm"; + sha256 = "02xk7bd4bg2j73zdpqn4573nn2bvzs6942iqiz5g6225cw6xd6pc"; authors = [ "Ivan Dubrov " ]; @@ -2595,12 +2851,6 @@ rec { name = "thiserror"; packageId = "thiserror"; } - { - name = "treediff"; - packageId = "treediff"; - optional = true; - features = [ "with-serde-json" ]; - } ]; devDependencies = [ { @@ -2611,21 +2861,27 @@ rec { ]; features = { "default" = [ "diff" ]; - "diff" = [ "treediff" ]; - "treediff" = [ "dep:treediff" ]; "utoipa" = [ "dep:utoipa" ]; }; - resolvedDefaultFeatures = [ "default" "diff" "treediff" ]; + resolvedDefaultFeatures = [ "default" "diff" ]; }; "jsonpath-rust" = rec { crateName = "jsonpath-rust"; - version = "0.3.5"; + version = "0.5.1"; edition = "2018"; - sha256 = "0abqzgssg4vnv389v4c1p60a2qcpavwn88sp0kjhn9rxgixi5k06"; + sha256 = "0032bp43w6k1bl8h55m126cdf8xljj8p736f65gp3zvhpn2zxn0r"; authors = [ "BorisZhguchev " ]; dependencies = [ + { + name = "lazy_static"; + packageId = "lazy_static"; + } + { + name = "once_cell"; + packageId = "once_cell"; + } { name = "pest"; packageId = "pest"; @@ -2651,25 +2907,21 @@ rec { }; "k8s-openapi" = rec { crateName = "k8s-openapi"; - version = "0.20.0"; + version = "0.22.0"; edition = "2021"; - links = "k8s-openapi-0.20.0"; - sha256 = "19i30l9v9xss0b8bq7gssv3700jdd0jvp11gvf4pkjkas5pn1hzd"; + links = "k8s-openapi-0.22.0"; + sha256 = "0mcpy1gdxpqayc74i3x3ayh3q5bl6dzvsgmw91jq1r9sjkxill0r"; + libName = "k8s_openapi"; authors = [ "Arnav Singh " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; usesDefaultFeatures = false; features = [ "alloc" ]; } - { - name = "bytes"; - packageId = "bytes"; - usesDefaultFeatures = false; - } { name = "chrono"; packageId = "chrono"; @@ -2700,17 +2952,17 @@ rec { } ]; features = { - "earliest" = [ "v1_22" ]; - "latest" = [ "v1_28" ]; + "earliest" = [ "v1_24" ]; + "latest" = [ "v1_30" ]; "schemars" = [ "dep:schemars" ]; }; - resolvedDefaultFeatures = [ "schemars" "v1_28" ]; + resolvedDefaultFeatures = [ "schemars" "v1_30" ]; }; "kube" = rec { crateName = "kube"; - version = "0.87.2"; + version = "0.91.0"; edition = "2021"; - sha256 = "0vpj063awlc9pj4wn1390933y0z9q6m1rx8klb3lcckn1kbci69l"; + sha256 = "1ykvydgqjnlvglhdw0yhc7p9cmkw73wy9iz44g7hzyzlxfkn2i16"; authors = [ "clux " "Natalie Klestrup Röijezon " @@ -2762,12 +3014,14 @@ rec { "kube-client" = [ "dep:kube-client" ]; "kube-derive" = [ "dep:kube-derive" ]; "kube-runtime" = [ "dep:kube-runtime" ]; + "kubelet-debug" = [ "kube-client/kubelet-debug" "kube-core/kubelet-debug" ]; "oauth" = [ "kube-client/oauth" ]; "oidc" = [ "kube-client/oidc" ]; "openssl-tls" = [ "kube-client/openssl-tls" ]; "runtime" = [ "kube-runtime" ]; "rustls-tls" = [ "kube-client/rustls-tls" ]; "socks5" = [ "kube-client/socks5" ]; + "unstable-client" = [ "kube-client/unstable-client" ]; "unstable-runtime" = [ "kube-runtime/unstable-runtime" ]; "ws" = [ "kube-client/ws" "kube-core/ws" ]; }; @@ -2775,9 +3029,9 @@ rec { }; "kube-client" = rec { crateName = "kube-client"; - version = "0.87.2"; + version = "0.91.0"; edition = "2021"; - sha256 = "17zjnpbfrn5w8lrs2v1p97vyvyimi0pxznlhb1b308bnl3gm0d03"; + sha256 = "1sc51ahc47iscas7wdxi3ir2jqh28ixrql4hvx5yx63kqkb4l5j7"; authors = [ "clux " "Natalie Klestrup Röijezon " @@ -2786,7 +3040,7 @@ rec { dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; optional = true; } { @@ -2809,6 +3063,8 @@ rec { name = "futures"; packageId = "futures 0.3.30"; optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; } { name = "home"; @@ -2824,22 +3080,35 @@ rec { packageId = "http-body"; optional = true; } + { + name = "http-body-util"; + packageId = "http-body-util"; + optional = true; + } { name = "hyper"; packageId = "hyper"; optional = true; - features = [ "client" "http1" "stream" "tcp" ]; + features = [ "client" "http1" ]; } { name = "hyper-rustls"; packageId = "hyper-rustls"; optional = true; + usesDefaultFeatures = false; + features = [ "http1" "logging" "native-tokio" "ring" "tls12" ]; } { name = "hyper-timeout"; packageId = "hyper-timeout"; optional = true; } + { + name = "hyper-util"; + packageId = "hyper-util"; + optional = true; + features = [ "client" "client-legacy" "http1" "tokio" ]; + } { name = "jsonpath-rust"; packageId = "jsonpath-rust"; @@ -2859,16 +3128,11 @@ rec { packageId = "pem"; optional = true; } - { - name = "pin-project"; - packageId = "pin-project"; - optional = true; - } { name = "rustls"; packageId = "rustls"; optional = true; - features = [ "dangerous_configuration" ]; + usesDefaultFeatures = false; } { name = "rustls-pemfile"; @@ -2930,6 +3194,12 @@ rec { } ]; devDependencies = [ + { + name = "futures"; + packageId = "futures 0.3.30"; + usesDefaultFeatures = false; + features = [ "async-await" ]; + } { name = "k8s-openapi"; packageId = "k8s-openapi"; @@ -2948,7 +3218,7 @@ rec { "base64" = [ "dep:base64" ]; "bytes" = [ "dep:bytes" ]; "chrono" = [ "dep:chrono" ]; - "client" = [ "config" "__non_core" "hyper" "http-body" "tower" "tower-http" "hyper-timeout" "pin-project" "chrono" "jsonpath-rust" "bytes" "futures" "tokio" "tokio-util" "either" ]; + "client" = [ "config" "__non_core" "hyper" "hyper-util" "http-body" "http-body-util" "tower" "tower-http" "hyper-timeout" "chrono" "jsonpath-rust" "bytes" "futures" "tokio" "tokio-util" "either" ]; "config" = [ "__non_core" "pem" "home" ]; "default" = [ "client" ]; "either" = [ "dep:either" ]; @@ -2957,19 +3227,21 @@ rec { "gzip" = [ "client" "tower-http/decompression-gzip" ]; "home" = [ "dep:home" ]; "http-body" = [ "dep:http-body" ]; + "http-body-util" = [ "dep:http-body-util" ]; "hyper" = [ "dep:hyper" ]; "hyper-openssl" = [ "dep:hyper-openssl" ]; "hyper-rustls" = [ "dep:hyper-rustls" ]; "hyper-socks2" = [ "dep:hyper-socks2" ]; "hyper-timeout" = [ "dep:hyper-timeout" ]; + "hyper-util" = [ "dep:hyper-util" ]; "jsonpatch" = [ "kube-core/jsonpatch" ]; "jsonpath-rust" = [ "dep:jsonpath-rust" ]; + "kubelet-debug" = [ "ws" "kube-core/kubelet-debug" ]; "oauth" = [ "client" "tame-oauth" ]; "oidc" = [ "client" "form_urlencoded" ]; "openssl" = [ "dep:openssl" ]; "openssl-tls" = [ "openssl" "hyper-openssl" ]; "pem" = [ "dep:pem" ]; - "pin-project" = [ "dep:pin-project" ]; "rand" = [ "dep:rand" ]; "rustls" = [ "dep:rustls" ]; "rustls-pemfile" = [ "dep:rustls-pemfile" ]; @@ -2985,15 +3257,16 @@ rec { "tracing" = [ "dep:tracing" ]; "ws" = [ "client" "tokio-tungstenite" "rand" "kube-core/ws" "tokio/macros" ]; }; - resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "hyper" "hyper-rustls" "hyper-timeout" "jsonpatch" "jsonpath-rust" "pem" "pin-project" "rustls" "rustls-pemfile" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ]; + resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "http-body-util" "hyper" "hyper-rustls" "hyper-timeout" "hyper-util" "jsonpatch" "jsonpath-rust" "pem" "rustls" "rustls-pemfile" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ]; }; "kube-core" = rec { crateName = "kube-core"; - version = "0.87.2"; + version = "0.91.0"; edition = "2021"; - sha256 = "1bk3zf2qsir8m9pq58c8ikagg3in5x9cw0sdk6kyp1j70lyskfxm"; + sha256 = "0kzd0lamx9aymy0j6ddmpfn6saicw4vrbk99451jb213982d75r7"; authors = [ "clux " + "Natalie Klestrup Röijezon " "kazk " ]; dependencies = [ @@ -3001,7 +3274,7 @@ rec { name = "chrono"; packageId = "chrono"; usesDefaultFeatures = false; - features = [ "clock" ]; + features = [ "now" ]; } { name = "form_urlencoded"; @@ -3021,10 +3294,6 @@ rec { packageId = "k8s-openapi"; usesDefaultFeatures = false; } - { - name = "once_cell"; - packageId = "once_cell"; - } { name = "schemars"; packageId = "schemars"; @@ -3056,6 +3325,7 @@ rec { "admission" = [ "json-patch" ]; "json-patch" = [ "dep:json-patch" ]; "jsonpatch" = [ "json-patch" ]; + "kubelet-debug" = [ "ws" ]; "schema" = [ "schemars" ]; "schemars" = [ "dep:schemars" ]; }; @@ -3063,12 +3333,13 @@ rec { }; "kube-derive" = rec { crateName = "kube-derive"; - version = "0.87.2"; + version = "0.91.0"; edition = "2021"; - sha256 = "197i8xflarpd125yn7wqis05y54bcbyl23hz9j4pnz3nwpaqvsci"; + sha256 = "0h9g2vm56mz5m6rj59xgq5bqmmc0z8bxpkd3x62qyiqcmbnkgy7w"; procMacro = true; authors = [ "clux " + "Natalie Klestrup Röijezon " "kazk " ]; dependencies = [ @@ -3090,7 +3361,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "extra-traits" ]; } ]; @@ -3098,18 +3369,27 @@ rec { }; "kube-runtime" = rec { crateName = "kube-runtime"; - version = "0.87.2"; + version = "0.91.0"; edition = "2021"; - sha256 = "1bihl934va5kq659hk037kfb2cpc27fyfvpgh1nbpxpv33mr721d"; + sha256 = "0vnwdskcrrjrnr1dva44s09vzlak6606idb9aidcc8mj3ydfhqz4"; authors = [ - "Natalie Klestrup Röijezon " "clux " + "Natalie Klestrup Röijezon " + "kazk " ]; dependencies = [ { name = "ahash"; packageId = "ahash"; } + { + name = "async-broadcast"; + packageId = "async-broadcast"; + } + { + name = "async-stream"; + packageId = "async-stream"; + } { name = "async-trait"; packageId = "async-trait"; @@ -3125,6 +3405,7 @@ rec { { name = "futures"; packageId = "futures 0.3.30"; + usesDefaultFeatures = false; } { name = "hashbrown"; @@ -3220,9 +3501,9 @@ rec { }; "libc" = rec { crateName = "libc"; - version = "0.2.151"; + version = "0.2.154"; edition = "2015"; - sha256 = "1x28f0zgp4zcwr891p8n9ag9w371sbib30vp4y6hi2052frplb9h"; + sha256 = "0inkwrnwzrr1kw75x944ihdajrhhldkgg4irx1n19y9gp4w36x5f"; authors = [ "The Rust Project Developers" ]; @@ -3236,10 +3517,10 @@ rec { }; "libgit2-sys" = rec { crateName = "libgit2-sys"; - version = "0.15.2+1.6.4"; + version = "0.16.2+1.7.2"; edition = "2018"; links = "git2"; - sha256 = "1yllyq9wiryy257cfx8s7wadls24yzkxnhmbl95iz9ml3zhz43d8"; + sha256 = "1s149nkximw3n42925rp0jax1sf1zmf8gpcim2g9sp7fnkc2chgf"; libName = "libgit2_sys"; libPath = "lib.rs"; authors = [ @@ -3280,10 +3561,10 @@ rec { }; "libz-sys" = rec { crateName = "libz-sys"; - version = "1.1.12"; + version = "1.1.16"; edition = "2018"; links = "z"; - sha256 = "0yqahz2m5g44mpgfdy0k53hpfkfs5rfiv3a1y7p766ijbsr3fwfr"; + sha256 = "1yd7mnw0h469rbsxfbb0r6czc4q8fabn9jkbiz99a9kbcrg3n52y"; authors = [ "Alex Crichton " "Josh Triplett " @@ -3320,9 +3601,9 @@ rec { }; "lock_api" = rec { crateName = "lock_api"; - version = "0.4.11"; - edition = "2018"; - sha256 = "0iggx0h4jx63xm35861106af3jkxq06fpqhpkhgw0axi2n38y5iw"; + version = "0.4.12"; + edition = "2021"; + sha256 = "05qvxa6g27yyva25a5ghsg85apdxkvr77yhkyhapj6r8vnf8pbq7"; authors = [ "Amanieu d'Antras " ]; @@ -3348,17 +3629,20 @@ rec { }; "log" = rec { crateName = "log"; - version = "0.4.20"; - edition = "2015"; - sha256 = "13rf7wphnwd61vazpxr7fiycin6cb1g8fmvgqg18i464p0y1drmm"; + version = "0.4.21"; + edition = "2021"; + sha256 = "074hldq1q8rlzq2s2qa8f25hj4s3gpw71w64vdwzjd01a4g8rvch"; authors = [ "The Rust Project Developers" ]; features = { - "kv_unstable" = [ "value-bag" ]; - "kv_unstable_serde" = [ "kv_unstable_std" "value-bag/serde" "serde" ]; - "kv_unstable_std" = [ "std" "kv_unstable" "value-bag/error" ]; - "kv_unstable_sval" = [ "kv_unstable" "value-bag/sval" "sval" "sval_ref" ]; + "kv_serde" = [ "kv_std" "value-bag/serde" "serde" ]; + "kv_std" = [ "std" "kv" "value-bag/error" ]; + "kv_sval" = [ "kv" "value-bag/sval" "sval" "sval_ref" ]; + "kv_unstable" = [ "kv" "value-bag" ]; + "kv_unstable_serde" = [ "kv_serde" "kv_unstable_std" ]; + "kv_unstable_std" = [ "kv_std" "kv_unstable" ]; + "kv_unstable_sval" = [ "kv_sval" "kv_unstable" ]; "serde" = [ "dep:serde" ]; "sval" = [ "dep:sval" ]; "sval_ref" = [ "dep:sval_ref" ]; @@ -3384,9 +3668,9 @@ rec { }; "memchr" = rec { crateName = "memchr"; - version = "2.7.1"; + version = "2.7.2"; edition = "2021"; - sha256 = "0jf1kicqa4vs9lyzj4v4y1p90q0dh87hvhsdd5xvhnp527sw8gaj"; + sha256 = "07bcqxb0vx4ji0648ny5xsicjnpma95x1n07v7mi7jrhsz2l11kc"; authors = [ "Andrew Gallant " "bluss" @@ -3414,9 +3698,9 @@ rec { }; "miniz_oxide" = rec { crateName = "miniz_oxide"; - version = "0.7.1"; + version = "0.7.2"; edition = "2018"; - sha256 = "1ivl3rbbdm53bzscrd01g60l46lz5krl270487d8lhjvwl5hx0g7"; + sha256 = "19qlxb21s6kabgqq61mk7kd1qk2invyygj076jz6i1gj2lz1z0cx"; authors = [ "Frommi " "oyvindln " @@ -3440,9 +3724,9 @@ rec { }; "mio" = rec { crateName = "mio"; - version = "0.8.10"; + version = "0.8.11"; edition = "2018"; - sha256 = "02gyaxvaia9zzi4drrw59k9s0j6pa5d1y2kv7iplwjipdqlhngcg"; + sha256 = "034byyl0ardml5yliy1hmvx8arkmn9rv479pid794sm07ia519m4"; authors = [ "Carl Lerche " "Thomas de Zeeuw " @@ -3508,9 +3792,9 @@ rec { }; "num-traits" = rec { crateName = "num-traits"; - version = "0.2.17"; - edition = "2018"; - sha256 = "0z16bi5zwgfysz6765v3rd6whfbjpihx3mhsn4dg8dzj2c221qrr"; + version = "0.2.19"; + edition = "2021"; + sha256 = "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787"; authors = [ "The Rust Project Developers" ]; @@ -3578,7 +3862,7 @@ rec { "write_core" = [ "dep:crc32fast" "dep:indexmap" "dep:hashbrown" ]; "write_std" = [ "write_core" "std" "indexmap?/std" "crc32fast?/std" ]; }; - resolvedDefaultFeatures = [ "archive" "coff" "elf" "macho" "pe" "read_core" "unaligned" ]; + resolvedDefaultFeatures = [ "archive" "coff" "elf" "macho" "pe" "read_core" "unaligned" "xcoff" ]; }; "once_cell" = rec { crateName = "once_cell"; @@ -3611,9 +3895,9 @@ rec { }; "opentelemetry" = rec { crateName = "opentelemetry"; - version = "0.21.0"; + version = "0.22.0"; edition = "2021"; - sha256 = "12jfmyx8k9q2sjlx4wp76ddzaf94i7lnkliv1c9mj164bnd36chy"; + sha256 = "1gv70rx8172g9n82v9f97ircax7v4ydzyprq1nvsxwp3gfc5f3ch"; dependencies = [ { name = "futures-core"; @@ -3623,10 +3907,6 @@ rec { name = "futures-sink"; packageId = "futures-sink"; } - { - name = "indexmap"; - packageId = "indexmap"; - } { name = "js-sys"; packageId = "js-sys"; @@ -3644,6 +3924,7 @@ rec { { name = "thiserror"; packageId = "thiserror"; + usesDefaultFeatures = false; } { name = "urlencoding"; @@ -3661,9 +3942,9 @@ rec { }; "opentelemetry-jaeger" = rec { crateName = "opentelemetry-jaeger"; - version = "0.20.0"; + version = "0.21.0"; edition = "2021"; - sha256 = "18gq28byn3x1lfqmji2x29dhk4vkr3yk4sfnpc6hxr48smpwc5z6"; + sha256 = "0xwjs7vnv92hghy9hsrx4aa5knysvjvknvrc73l6ls976kqmwzzv"; dependencies = [ { name = "async-trait"; @@ -3703,6 +3984,7 @@ rec { name = "tokio"; packageId = "tokio"; optional = true; + usesDefaultFeatures = false; features = [ "net" "sync" ]; } ]; @@ -3710,6 +3992,7 @@ rec { { name = "tokio"; packageId = "tokio"; + usesDefaultFeatures = false; features = [ "net" "sync" ]; } ]; @@ -3717,7 +4000,7 @@ rec { "async-std" = [ "dep:async-std" ]; "base64" = [ "dep:base64" ]; "collector_client" = [ "http" "opentelemetry-http" ]; - "full" = [ "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "isahc_collector_client" "reqwest_collector_client" "reqwest_blocking_collector_client" "reqwest_rustls_collector_client" "surf_collector_client" "wasm_collector_client" "rt-tokio" "rt-tokio-current-thread" "rt-async-std" "integration_test" ]; + "full" = [ "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "isahc_collector_client" "reqwest_collector_client" "reqwest_blocking_collector_client" "reqwest_rustls_collector_client" "wasm_collector_client" "rt-tokio" "rt-tokio-current-thread" "rt-async-std" "integration_test" ]; "futures-executor" = [ "dep:futures-executor" ]; "headers" = [ "dep:headers" ]; "http" = [ "dep:http" ]; @@ -3725,7 +4008,7 @@ rec { "hyper-tls" = [ "dep:hyper-tls" ]; "hyper_collector_client" = [ "collector_client" "headers" "http" "hyper" "opentelemetry-http/tokio" "opentelemetry-http/hyper" ]; "hyper_tls_collector_client" = [ "hyper_collector_client" "hyper-tls" ]; - "integration_test" = [ "tonic" "prost" "prost-types" "rt-tokio" "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "reqwest_collector_client" "surf_collector_client" "isahc_collector_client" ]; + "integration_test" = [ "tonic" "prost" "prost-types" "rt-tokio" "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "reqwest_collector_client" "isahc_collector_client" ]; "isahc" = [ "dep:isahc" ]; "isahc_collector_client" = [ "isahc" "opentelemetry-http/isahc" ]; "js-sys" = [ "dep:js-sys" ]; @@ -3740,8 +4023,6 @@ rec { "rt-async-std" = [ "async-std" "opentelemetry_sdk/rt-async-std" ]; "rt-tokio" = [ "tokio" "opentelemetry_sdk/rt-tokio" ]; "rt-tokio-current-thread" = [ "tokio" "opentelemetry_sdk/rt-tokio-current-thread" ]; - "surf" = [ "dep:surf" ]; - "surf_collector_client" = [ "surf" "collector_client" "opentelemetry-http/surf" ]; "tokio" = [ "dep:tokio" ]; "tonic" = [ "dep:tonic" ]; "wasm-bindgen" = [ "dep:wasm-bindgen" ]; @@ -3753,23 +4034,16 @@ rec { }; "opentelemetry-semantic-conventions" = rec { crateName = "opentelemetry-semantic-conventions"; - version = "0.13.0"; + version = "0.14.0"; edition = "2021"; - sha256 = "115wbgk840dklyhpg3lwp4x1m643qd7f0vkz8hmfz0pry4g4yxzm"; - dependencies = [ - { - name = "opentelemetry"; - packageId = "opentelemetry"; - usesDefaultFeatures = false; - } - ]; + sha256 = "04197racbkpj75fh9jnwkdznjzv6l2ljpbr8ryfk9f9gqkb5pazr"; }; "opentelemetry_sdk" = rec { crateName = "opentelemetry_sdk"; - version = "0.21.2"; + version = "0.22.1"; edition = "2021"; - sha256 = "1r7gw2j2n800rd0vdnga32yhlfmc3c4y0sadcr97licam74aw5ig"; + sha256 = "0zkbkl29qik7cfmwbhr2ncink8fp9vi5x2qgk8gf6jg67c8wg44y"; dependencies = [ { name = "async-trait"; @@ -3822,11 +4096,12 @@ rec { packageId = "rand"; optional = true; usesDefaultFeatures = false; - features = [ "std" "std_rng" ]; + features = [ "std" "std_rng" "small_rng" ]; } { name = "thiserror"; packageId = "thiserror"; + usesDefaultFeatures = false; } { name = "tokio"; @@ -3943,11 +4218,24 @@ rec { ]; }; + "parking" = rec { + crateName = "parking"; + version = "2.2.0"; + edition = "2018"; + sha256 = "1blwbkq6im1hfxp5wlbr475mw98rsyc0bbr2d5n16m38z253p0dv"; + authors = [ + "Stjepan Glavina " + "The Rust Project Developers" + ]; + features = { + "loom" = [ "dep:loom" ]; + }; + }; "parking_lot" = rec { crateName = "parking_lot"; - version = "0.12.1"; - edition = "2018"; - sha256 = "13r2xk7mnxfc5g0g6dkdxqdqad99j7s7z8zhzz4npw5r0g0v4hip"; + version = "0.12.2"; + edition = "2021"; + sha256 = "1ys2dzz6cysjmwyivwxczl1ljpcf5cj4qmhdj07d5bkc9z5g0jky"; authors = [ "Amanieu d'Antras " ]; @@ -3972,9 +4260,9 @@ rec { }; "parking_lot_core" = rec { crateName = "parking_lot_core"; - version = "0.9.9"; - edition = "2018"; - sha256 = "13h0imw1aq86wj28gxkblhkzx6z1gk8q18n0v76qmmj6cliajhjc"; + version = "0.9.10"; + edition = "2021"; + sha256 = "1y3cf9ld9ijf7i4igwzffcn0xl16dxyn4c5bwgjck1dkgabiyh0y"; authors = [ "Amanieu d'Antras " ]; @@ -3999,7 +4287,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.48.5"; + packageId = "windows-targets 0.52.5"; target = { target, features }: (target."windows" or false); } ]; @@ -4012,16 +4300,16 @@ rec { }; "pem" = rec { crateName = "pem"; - version = "3.0.3"; + version = "3.0.4"; edition = "2021"; - sha256 = "0463ya67xrxaqn4qs9iz7rsx4parcasd78pd9fv7yd1m81wwr3qv"; + sha256 = "1blgcn17wc41yxdzrxlsir5m6ds8r13ijmpsqda6lwwhwmjr6icf"; authors = [ "Jonathan Creekmore " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; usesDefaultFeatures = false; features = [ "alloc" ]; } @@ -4055,9 +4343,9 @@ rec { }; "pest" = rec { crateName = "pest"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "1xgzh2sl4amycl4c20r68br20ypr583lhs6wi65vwi55almfx75f"; + sha256 = "1s4fvis7h6l872g6nk17r130kcllj4c0hjvwkzd3hi196g3320an"; authors = [ "Dragoș Tiselice " ]; @@ -4088,9 +4376,9 @@ rec { }; "pest_derive" = rec { crateName = "pest_derive"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "1hnzw8bcv4baf8z4dcfradi07fyakyyay75xnfiz4pjzd0j8bmw1"; + sha256 = "0n8lsk9s21dp7958p9yarbk2gsc8wg0rvdzr7cd7pjpvjf8kqa96"; procMacro = true; authors = [ "Dragoș Tiselice " @@ -4117,9 +4405,9 @@ rec { }; "pest_generator" = rec { crateName = "pest_generator"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "09y2w0l8m92ys75im8znksq2h7mir1hxqpdfdlsva60iww315gb8"; + sha256 = "11s6q0vf25lckbzak0qndzpv87ksaxy6pa9cvn2hlizvsgvjmhiy"; authors = [ "Dragoș Tiselice " ]; @@ -4143,7 +4431,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; } ]; features = { @@ -4156,9 +4444,9 @@ rec { }; "pest_meta" = rec { crateName = "pest_meta"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "1rlx167d2j2mgq5kjj4nxzkzz6m3h8g8yyf8p554m7mdsj8p2x3w"; + sha256 = "1kdxl164yyjsmn01lvllsll4sz3xbgy4dmkq33n63hrp5w1418np"; authors = [ "Dragoș Tiselice " ]; @@ -4186,9 +4474,9 @@ rec { }; "pin-project" = rec { crateName = "pin-project"; - version = "1.1.3"; + version = "1.1.5"; edition = "2021"; - sha256 = "08k4cpy8q3j93qqgnrbzkcgpn7g0a88l4a9nm33kyghpdhffv97x"; + sha256 = "1cxl146x0q7lawp0m1826wsgj8mmmfs6ja8q7m6f7ff5j6vl7gxn"; dependencies = [ { name = "pin-project-internal"; @@ -4199,9 +4487,9 @@ rec { }; "pin-project-internal" = rec { crateName = "pin-project-internal"; - version = "1.1.3"; + version = "1.1.5"; edition = "2021"; - sha256 = "01a4l3vb84brv9v7wl71chzxra2kynm6yvcjca66xv3ij6fgsna3"; + sha256 = "0r9r4ivwiyqf45sv6b30l1dx282lxaax2f6gl84jwa3q590s8f1g"; procMacro = true; dependencies = [ { @@ -4214,7 +4502,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" "visit-mut" ]; } ]; @@ -4222,9 +4510,9 @@ rec { }; "pin-project-lite" = rec { crateName = "pin-project-lite"; - version = "0.2.13"; + version = "0.2.14"; edition = "2018"; - sha256 = "0n0bwr5qxlf0mhn2xkl36sy55118s9qmvx2yl5f3ixkb007lbywa"; + sha256 = "00nx3f04agwjlsmd3mc5rx5haibj2v8q9b52b0kwn63wcv4nz9mx"; }; "pin-utils" = rec { @@ -4239,9 +4527,9 @@ rec { }; "pkg-config" = rec { crateName = "pkg-config"; - version = "0.3.28"; + version = "0.3.30"; edition = "2015"; - sha256 = "16kgffwncx5hsppsdf54z6jnjkhwywqy601cxk3rqncyi9zmilv9"; + sha256 = "1v07557dj1sa0aly9c90wsygc0i8xv5vnmyv0g94lpkvj8qb4cfj"; authors = [ "Alex Crichton " ]; @@ -4262,9 +4550,10 @@ rec { }; "proc-macro2" = rec { crateName = "proc-macro2"; - version = "1.0.74"; + version = "1.0.82"; edition = "2021"; - sha256 = "1nynw3s8in1pz5l0mfk4bgbvszlxyk85nc5vs2lcxkqjy818bs9d"; + sha256 = "06qk88hbf6wg4v1i961zibhjz512873jwkz3myx1z82ip6dd9lwa"; + libName = "proc_macro2"; authors = [ "David Tolnay " "Alex Crichton " @@ -4336,9 +4625,9 @@ rec { }; "quote" = rec { crateName = "quote"; - version = "1.0.35"; + version = "1.0.36"; edition = "2018"; - sha256 = "1vv8r2ncaz4pqdr78x7f138ka595sp2ncr1sa2plm4zxbsmwj7i9"; + sha256 = "19xcmh445bg6simirnnd4fvkmp6v2qiwxh5f6rw4a70h76pnm9qg"; authors = [ "David Tolnay " ]; @@ -4397,7 +4686,7 @@ rec { "std" = [ "rand_core/std" "rand_chacha/std" "alloc" "getrandom" "libc" ]; "std_rng" = [ "rand_chacha" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "std" "std_rng" ]; + resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "small_rng" "std" "std_rng" ]; }; "rand_chacha" = rec { crateName = "rand_chacha"; @@ -4455,9 +4744,9 @@ rec { }; "redox_syscall" = rec { crateName = "redox_syscall"; - version = "0.4.1"; + version = "0.5.1"; edition = "2018"; - sha256 = "1aiifyz5dnybfvkk4cdab9p2kmphag1yad6iknc7aszlxxldf8j7"; + sha256 = "0zja6y3av9z50gg1hh0vsc053941wng21r43whhk8mfb9n4m5426"; libName = "syscall"; authors = [ "Jeremy Soller " @@ -4465,7 +4754,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags"; } ]; features = { @@ -4475,9 +4764,9 @@ rec { }; "regex" = rec { crateName = "regex"; - version = "1.10.2"; + version = "1.10.4"; edition = "2021"; - sha256 = "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq"; + sha256 = "0k5sb0h2mkwf51ab0gvv3x38jp1q7wgxf63abfbhi0wwvvgxn5y1"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -4487,21 +4776,23 @@ rec { name = "aho-corasick"; packageId = "aho-corasick"; optional = true; + usesDefaultFeatures = false; } { name = "memchr"; packageId = "memchr"; optional = true; + usesDefaultFeatures = false; } { name = "regex-automata"; - packageId = "regex-automata 0.4.3"; + packageId = "regex-automata 0.4.6"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa-pikevm" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.2"; + packageId = "regex-syntax 0.8.3"; usesDefaultFeatures = false; } ]; @@ -4553,11 +4844,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ]; }; - "regex-automata 0.4.3" = rec { + "regex-automata 0.4.6" = rec { crateName = "regex-automata"; - version = "0.4.3"; + version = "0.4.6"; edition = "2021"; - sha256 = "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z"; + sha256 = "1spaq7y4im7s56d1gxa2hi4hzf6dwswb1bv8xyavzya7k25kpf46"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -4577,7 +4868,7 @@ rec { } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.2"; + packageId = "regex-syntax 0.8.3"; optional = true; usesDefaultFeatures = false; } @@ -4627,11 +4918,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; }; - "regex-syntax 0.8.2" = rec { + "regex-syntax 0.8.3" = rec { crateName = "regex-syntax"; - version = "0.8.2"; + version = "0.8.3"; edition = "2021"; - sha256 = "17rd2s8xbiyf6lb4aj2nfi44zqlj98g2ays8zzj2vfs743k79360"; + sha256 = "0mhzkm1pkqg6y53xv056qciazlg47pq0czqs94cn302ckvi49bdd"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -4645,14 +4936,19 @@ rec { }; "ring" = rec { crateName = "ring"; - version = "0.17.7"; + version = "0.17.8"; edition = "2021"; - links = "ring_core_0_17_7"; - sha256 = "0x5vvsp2424vll571xx085qf4hzljmwpz4x8n9l0j1c3akb67338"; + links = "ring_core_0_17_8"; + sha256 = "03fwlb1ssrmfxdckvqv033pfmk01rhx9ynwi7r186dcfcp5s8zy1"; authors = [ "Brian Smith " ]; dependencies = [ + { + name = "cfg-if"; + packageId = "cfg-if"; + usesDefaultFeatures = false; + } { name = "getrandom"; packageId = "getrandom"; @@ -4676,7 +4972,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (("aarch64" == target."arch" or null) && ("windows" == target."os" or null)); features = [ "Win32_Foundation" "Win32_System_Threading" ]; } @@ -4705,9 +5001,10 @@ rec { }; "rustc-demangle" = rec { crateName = "rustc-demangle"; - version = "0.1.23"; + version = "0.1.24"; edition = "2015"; - sha256 = "0xnbk2bmyzshacjm2g1kd4zzv2y2az14bw3sjccq5qkpmsfvn9nn"; + sha256 = "07zysaafgrkzy2rjgwqdj2a8qdpsm6zv6f5pgpk9x0lm40z9b6vi"; + libName = "rustc_demangle"; authors = [ "Alex Crichton " ]; @@ -4719,28 +5016,47 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.21.10"; + version = "0.23.5"; edition = "2021"; - sha256 = "1fmpzk3axnhkd99saqkvraifdfms4pkyi56lkihf8n877j0sdmgr"; + sha256 = "0zm97n6n7v46s4dv7bcrp0a20wj40lnbzbg530zaml8vaphcxaxg"; dependencies = [ { name = "log"; packageId = "log"; optional = true; } + { + name = "once_cell"; + packageId = "once_cell"; + usesDefaultFeatures = false; + features = [ "alloc" "race" ]; + } { name = "ring"; packageId = "ring"; + optional = true; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + features = [ "alloc" ]; } { name = "rustls-webpki"; packageId = "rustls-webpki"; rename = "webpki"; - features = [ "alloc" "std" ]; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "subtle"; + packageId = "subtle"; + usesDefaultFeatures = false; } { - name = "sct"; - packageId = "sct"; + name = "zeroize"; + packageId = "zeroize"; } ]; devDependencies = [ @@ -4750,19 +5066,25 @@ rec { } ]; features = { - "default" = [ "logging" "tls12" ]; + "aws-lc-rs" = [ "aws_lc_rs" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws_lc_rs" ]; + "default" = [ "aws_lc_rs" "logging" "std" "tls12" ]; + "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" ]; + "hashbrown" = [ "dep:hashbrown" ]; "log" = [ "dep:log" ]; "logging" = [ "log" ]; - "read_buf" = [ "rustversion" ]; + "read_buf" = [ "rustversion" "std" ]; + "ring" = [ "dep:ring" "webpki/ring" ]; "rustversion" = [ "dep:rustversion" ]; + "std" = [ "webpki/std" "pki-types/std" "once_cell/std" ]; }; - resolvedDefaultFeatures = [ "dangerous_configuration" "default" "log" "logging" "tls12" ]; + resolvedDefaultFeatures = [ "log" "logging" "ring" "std" "tls12" ]; }; "rustls-native-certs" = rec { crateName = "rustls-native-certs"; - version = "0.6.3"; + version = "0.7.0"; edition = "2021"; - sha256 = "007zind70rd5rfsrkdcfm8vn09j8sg02phg9334kark6rdscxam9"; + sha256 = "14ip15dcr6fmjzi12lla9cpln7mmkdid4a7wsp344v4kz9gbh7wg"; dependencies = [ { name = "openssl-probe"; @@ -4773,6 +5095,11 @@ rec { name = "rustls-pemfile"; packageId = "rustls-pemfile"; } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } { name = "schannel"; packageId = "schannel"; @@ -4788,27 +5115,59 @@ rec { }; "rustls-pemfile" = rec { crateName = "rustls-pemfile"; - version = "1.0.4"; + version = "2.1.2"; edition = "2018"; - sha256 = "1324n5bcns0rnw6vywr5agff3rwfvzphi7rmbyzwnv6glkhclx0w"; + sha256 = "0ggpmk5n7p096nim2hn57facx6rwf76l55qqsj4fny37d0jkm699"; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; } ]; - + features = { + "default" = [ "std" ]; + "std" = [ "base64/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "rustls-pki-types" = rec { + crateName = "rustls-pki-types"; + version = "1.7.0"; + edition = "2021"; + sha256 = "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp"; + libName = "rustls_pki_types"; + features = { + "default" = [ "alloc" ]; + "std" = [ "alloc" ]; + "web" = [ "web-time" ]; + "web-time" = [ "dep:web-time" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.101.7"; + version = "0.102.3"; edition = "2021"; - sha256 = "0rapfhpkqp75552i8r0y7f4vq7csb4k7gjjans0df73sxv8paqlb"; + sha256 = "1gzahmw0lqhszsczmk63bamsf5ps6wa5lsff6gjvqhfxq20ybg7k"; libName = "webpki"; dependencies = [ { name = "ring"; packageId = "ring"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; usesDefaultFeatures = false; } { @@ -4817,17 +5176,19 @@ rec { } ]; features = { - "alloc" = [ "ring/alloc" ]; - "default" = [ "std" ]; - "std" = [ "alloc" ]; + "alloc" = [ "ring?/alloc" "pki-types/alloc" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" ]; + "default" = [ "std" "ring" ]; + "ring" = [ "dep:ring" ]; + "std" = [ "alloc" "pki-types/std" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + resolvedDefaultFeatures = [ "alloc" "ring" "std" ]; }; "rustversion" = rec { crateName = "rustversion"; - version = "1.0.14"; + version = "1.0.16"; edition = "2018"; - sha256 = "1x1pz1yynk5xzzrazk2svmidj69jhz89dz5vrc28sixl20x1iz3z"; + sha256 = "1c6zy65i4jmhn2raxpb3p6wfbyh5hjcmi8z6d67jga0yl38p8909"; procMacro = true; build = "build/build.rs"; authors = [ @@ -4837,9 +5198,9 @@ rec { }; "ryu" = rec { crateName = "ryu"; - version = "1.0.16"; + version = "1.0.18"; edition = "2018"; - sha256 = "0k7b90xr48ag5bzmfjp82rljasw2fx28xr3bg1lrpx7b5sljm3gr"; + sha256 = "17xx2s8j1lln7iackzd9p0sv546vjq71i779gphjq923vjh5pjzk"; authors = [ "David Tolnay " ]; @@ -4874,9 +5235,9 @@ rec { }; "schemars" = rec { crateName = "schemars"; - version = "0.8.16"; + version = "0.8.19"; edition = "2021"; - sha256 = "0aadpjkaq7yl11b02pg4mwanylck328zg0q7w56dv6j89568z8j5"; + sha256 = "1vr1dwpx900b3d824f309lmzc6cj61a1dzq1zc3nbd4wj7b7wvpw"; authors = [ "Graham Esau " ]; @@ -4899,6 +5260,12 @@ rec { name = "serde_json"; packageId = "serde_json"; } + { + name = "url"; + packageId = "url"; + optional = true; + usesDefaultFeatures = false; + } ]; features = { "arrayvec" = [ "arrayvec05" ]; @@ -4930,13 +5297,13 @@ rec { "uuid08" = [ "dep:uuid08" ]; "uuid1" = [ "dep:uuid1" ]; }; - resolvedDefaultFeatures = [ "default" "derive" "schemars_derive" ]; + resolvedDefaultFeatures = [ "default" "derive" "schemars_derive" "url" ]; }; "schemars_derive" = rec { crateName = "schemars_derive"; - version = "0.8.16"; + version = "0.8.19"; edition = "2021"; - sha256 = "0rq9sdcf5hyvsyj9v9nfy2jgjbjzaldjq4i6y2fcz72xlrpzsry7"; + sha256 = "0j9znm9110a8agfbf16d5fynn9chd3hxv41p8n742bg0lxx2npqq"; procMacro = true; authors = [ "Graham Esau " @@ -4956,7 +5323,7 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.61"; features = [ "extra-traits" ]; } ]; @@ -4974,26 +5341,6 @@ rec { "default" = [ "use_std" ]; }; }; - "sct" = rec { - crateName = "sct"; - version = "0.7.1"; - edition = "2021"; - sha256 = "056lmi2xkzdg1dbai6ha3n57s18cbip4pnmpdhyljli3m99n216s"; - authors = [ - "Joseph Birr-Pixton " - ]; - dependencies = [ - { - name = "ring"; - packageId = "ring"; - } - { - name = "untrusted"; - packageId = "untrusted"; - } - ]; - - }; "secrecy" = rec { crateName = "secrecy"; version = "0.8.0"; @@ -5024,9 +5371,9 @@ rec { }; "security-framework" = rec { crateName = "security-framework"; - version = "2.9.2"; + version = "2.11.0"; edition = "2021"; - sha256 = "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"; + sha256 = "1h0ipvv8wi9wvhad0a9w7jpmb189jng4jhfgnp6vl1lps0zp49y6"; authors = [ "Steven Fackler " "Kornel " @@ -5034,7 +5381,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags"; } { name = "core-foundation"; @@ -5062,17 +5409,17 @@ rec { "OSX_10_14" = [ "OSX_10_13" "security-framework-sys/OSX_10_14" ]; "OSX_10_15" = [ "OSX_10_14" "security-framework-sys/OSX_10_15" ]; "OSX_10_9" = [ "security-framework-sys/OSX_10_9" ]; - "default" = [ "OSX_10_9" ]; + "default" = [ "OSX_10_11" ]; "log" = [ "dep:log" ]; "serial-number-bigint" = [ "dep:num-bigint" ]; }; - resolvedDefaultFeatures = [ "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_9" "default" ]; }; "security-framework-sys" = rec { crateName = "security-framework-sys"; - version = "2.9.1"; + version = "2.11.0"; edition = "2021"; - sha256 = "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"; + sha256 = "1mq7ykz3fi0ba55aj4afz24v9qvwdpkbjiirb197f8h5pnxkcy9i"; authors = [ "Steven Fackler " "Kornel " @@ -5094,37 +5441,29 @@ rec { "OSX_10_13" = [ "OSX_10_12" ]; "OSX_10_14" = [ "OSX_10_13" ]; "OSX_10_15" = [ "OSX_10_14" ]; - "default" = [ "OSX_10_9" ]; + "default" = [ "OSX_10_11" ]; }; - resolvedDefaultFeatures = [ "OSX_10_9" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_9" ]; }; "semver" = rec { crateName = "semver"; - version = "1.0.20"; + version = "1.0.23"; edition = "2018"; - sha256 = "140hmbfa743hbmah1zjf07s8apavhvn04204qjigjiz5w6iscvw3"; + sha256 = "12wqpxfflclbq4dv8sa6gchdh92ahhwn4ci1ls22wlby3h57wsb1"; authors = [ "David Tolnay " ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - usesDefaultFeatures = false; - } - ]; features = { "default" = [ "std" ]; "serde" = [ "dep:serde" ]; }; - resolvedDefaultFeatures = [ "default" "serde" "std" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; "serde" = rec { crateName = "serde"; - version = "1.0.194"; + version = "1.0.201"; edition = "2018"; - sha256 = "0wxplk1ayrsb81bdwh8zmkldw1b0xigs3qc90r5ck6374nc4848b"; + sha256 = "0g1nrz2s6l36na6gdbph8k07xf9h5p3s6f0s79sy8a8nxpmiq3vq"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -5176,9 +5515,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.194"; + version = "1.0.201"; edition = "2015"; - sha256 = "1q6l0ycrykdg960c350fgnac6d653q1v608g84qrk3rf692mwf53"; + sha256 = "0r98v8h47s7zhml7gz0sl6wv82vyzh1hv27f1g0g35lp1f9hbr65"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -5188,14 +5527,20 @@ rec { { name = "proc-macro2"; packageId = "proc-macro2"; + usesDefaultFeatures = false; + features = [ "proc-macro" ]; } { name = "quote"; packageId = "quote"; + usesDefaultFeatures = false; + features = [ "proc-macro" ]; } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; + usesDefaultFeatures = false; + features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } ]; features = { @@ -5204,9 +5549,9 @@ rec { }; "serde_derive_internals" = rec { crateName = "serde_derive_internals"; - version = "0.26.0"; + version = "0.29.0"; edition = "2015"; - sha256 = "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5"; + sha256 = "1qsl3pkk9yg57wivsxg8lsw77d94l34z70hclrczx9d3cp7023rk"; libPath = "lib.rs"; authors = [ "Erick Tryzelaar " @@ -5223,18 +5568,18 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.61"; usesDefaultFeatures = false; - features = [ "derive" "parsing" "printing" "clone-impls" ]; + features = [ "clone-impls" "derive" "parsing" "printing" ]; } ]; }; "serde_json" = rec { crateName = "serde_json"; - version = "1.0.110"; + version = "1.0.117"; edition = "2021"; - sha256 = "0mrjhgqrzl0gc4lnqp4d2lcs5vrfbhv0r3k1pg49knms6199ggbg"; + sha256 = "1hxziifjlc0kn1cci9d4crmjc7qwnfi20lxwyj9lzca2c7m84la5"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -5270,34 +5615,11 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; - "serde_spanned" = rec { - crateName = "serde_spanned"; - version = "0.6.5"; - edition = "2021"; - sha256 = "1hgh6s3jjwyzhfk3xwb6pnnr1misq9nflwq0f026jafi37s24dpb"; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - } - ]; - devDependencies = [ - { - name = "serde"; - packageId = "serde"; - } - ]; - features = { - "serde" = [ "dep:serde" ]; - }; - resolvedDefaultFeatures = [ "serde" ]; - }; "serde_yaml" = rec { crateName = "serde_yaml"; - version = "0.9.30"; + version = "0.9.34+deprecated"; edition = "2021"; - sha256 = "0f4xkmbjgq452ynh3nkz84c0dryjfp410gfqy7hhxxwrkb3jigxi"; + sha256 = "0isba1fjyg3l6rxk156k600ilzr8fp7crv82rhal0rxz5qd1m2va"; authors = [ "David Tolnay " ]; @@ -5384,9 +5706,9 @@ rec { }; "signal-hook-registry" = rec { crateName = "signal-hook-registry"; - version = "1.4.1"; + version = "1.4.2"; edition = "2015"; - sha256 = "18crkkw5k82bvcx088xlf5g4n3772m24qhzgfan80nda7d3rn8nq"; + sha256 = "1cb5akgq8ajnd5spyn587srvs4n26ryq0p78nswffwhv46sf1sd9"; authors = [ "Michal 'vorner' Vaner " "Masaki Hara " @@ -5421,9 +5743,9 @@ rec { }; "smallvec" = rec { crateName = "smallvec"; - version = "1.11.2"; + version = "1.13.2"; edition = "2018"; - sha256 = "0w79x38f7c0np7hqfmzrif9zmn0avjvvm31b166zdk9d1aad1k2d"; + sha256 = "0rsw5samawl3wsw6glrsb127rx6sh89a8wyikicw6dkdcjd1lpiw"; authors = [ "The Servo Project Developers" ]; @@ -5433,6 +5755,7 @@ rec { "drain_keep_rest" = [ "drain_filter" ]; "serde" = [ "dep:serde" ]; }; + resolvedDefaultFeatures = [ "const_generics" "const_new" ]; }; "snafu 0.6.10" = rec { crateName = "snafu"; @@ -5504,7 +5827,36 @@ rec { "unstable-backtraces-impl-std" = [ "backtraces-impl-std" "snafu-derive/unstable-backtraces-impl-std" ]; "unstable-provider-api" = [ "snafu-derive/unstable-provider-api" ]; }; - resolvedDefaultFeatures = [ "default" "rust_1_39" "rust_1_46" "std" ]; + resolvedDefaultFeatures = [ "default" "rust_1_39" "rust_1_46" "std" ]; + }; + "snafu 0.8.2" = rec { + crateName = "snafu"; + version = "0.8.2"; + edition = "2018"; + sha256 = "0bji6fqyphs041gp4zmgms6w2bbw9r1bw0i16gjzci5b913nz5vm"; + authors = [ + "Jake Goulding " + ]; + dependencies = [ + { + name = "snafu-derive"; + packageId = "snafu-derive 0.8.2"; + } + ]; + features = { + "backtrace" = [ "dep:backtrace" ]; + "backtraces-impl-backtrace-crate" = [ "backtrace" ]; + "default" = [ "std" "rust_1_65" ]; + "futures" = [ "futures-core-crate" "pin-project" ]; + "futures-core-crate" = [ "dep:futures-core-crate" ]; + "futures-crate" = [ "dep:futures-crate" ]; + "internal-dev-dependencies" = [ "futures-crate" ]; + "pin-project" = [ "dep:pin-project" ]; + "rust_1_61" = [ "snafu-derive/rust_1_61" ]; + "rust_1_65" = [ "rust_1_61" ]; + "unstable-provider-api" = [ "snafu-derive/unstable-provider-api" ]; + }; + resolvedDefaultFeatures = [ "default" "rust_1_61" "rust_1_65" "std" ]; }; "snafu-derive 0.6.10" = rec { crateName = "snafu-derive"; @@ -5565,11 +5917,43 @@ rec { }; resolvedDefaultFeatures = [ "rust_1_39" "rust_1_46" ]; }; + "snafu-derive 0.8.2" = rec { + crateName = "snafu-derive"; + version = "0.8.2"; + edition = "2018"; + sha256 = "0pyr3rdipfsr74hlk14q7bssls0qssr6rg0727xw5f5zvq8rkcdl"; + procMacro = true; + authors = [ + "Jake Goulding " + ]; + dependencies = [ + { + name = "heck"; + packageId = "heck 0.4.1"; + } + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.61"; + features = [ "full" ]; + } + ]; + features = { + }; + resolvedDefaultFeatures = [ "rust_1_61" ]; + }; "socket2" = rec { crateName = "socket2"; - version = "0.5.5"; + version = "0.5.7"; edition = "2021"; - sha256 = "1sgq315f1njky114ip7wcy83qlphv9qclprfjwvxcpfblmcsqpvv"; + sha256 = "070r941wbq76xpy039an4pyiy3rfj7mp7pvibf1rcri9njq5wc6f"; authors = [ "Alex Crichton " "Thomas de Zeeuw " @@ -5582,7 +5966,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_System_IO" "Win32_System_Threading" "Win32_System_WindowsProgramming" ]; } @@ -5618,13 +6002,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.64.0"; + version = "0.67.1"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "d988822e7af3d363d52fb35643f0c6ed933f340a"; - sha256 = "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp"; + rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; + sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; }; authors = [ "Stackable GmbH " @@ -5672,7 +6056,7 @@ rec { name = "k8s-openapi"; packageId = "k8s-openapi"; usesDefaultFeatures = false; - features = [ "schemars" "v1_28" ]; + features = [ "schemars" "v1_30" ]; } { name = "kube"; @@ -5684,10 +6068,6 @@ rec { name = "lazy_static"; packageId = "lazy_static"; } - { - name = "opentelemetry"; - packageId = "opentelemetry"; - } { name = "opentelemetry-jaeger"; packageId = "opentelemetry-jaeger"; @@ -5702,10 +6082,6 @@ rec { name = "product-config"; packageId = "product-config"; } - { - name = "rand"; - packageId = "rand"; - } { name = "regex"; packageId = "regex"; @@ -5713,6 +6089,7 @@ rec { { name = "schemars"; packageId = "schemars"; + features = [ "url" ]; } { name = "semver"; @@ -5733,7 +6110,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-operator-derive"; @@ -5744,14 +6121,10 @@ rec { packageId = "strum"; features = [ "derive" ]; } - { - name = "thiserror"; - packageId = "thiserror"; - } { name = "tokio"; packageId = "tokio"; - features = [ "macros" "rt-multi-thread" ]; + features = [ "macros" "rt-multi-thread" "fs" ]; } { name = "tracing"; @@ -5769,6 +6142,7 @@ rec { { name = "url"; packageId = "url"; + features = [ "serde" ]; } ]; features = { @@ -5777,13 +6151,13 @@ rec { }; "stackable-operator-derive" = rec { crateName = "stackable-operator-derive"; - version = "0.64.0"; + version = "0.3.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "d988822e7af3d363d52fb35643f0c6ed933f340a"; - sha256 = "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp"; + rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; + sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; }; procMacro = true; authors = [ @@ -5804,7 +6178,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; } ]; @@ -5837,7 +6211,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-operator"; @@ -5922,7 +6296,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-operator"; @@ -5979,9 +6353,9 @@ rec { }; "strum" = rec { crateName = "strum"; - version = "0.25.0"; + version = "0.26.2"; edition = "2018"; - sha256 = "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"; + sha256 = "0aayk2m3cw9zz12qn82kqaayq43xdgdpcy9b5d1lq6d504syr32x"; authors = [ "Peter Glotfelty " ]; @@ -6008,9 +6382,9 @@ rec { }; "strum_macros" = rec { crateName = "strum_macros"; - version = "0.25.3"; + version = "0.26.2"; edition = "2018"; - sha256 = "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13"; + sha256 = "0in9jvbb3g16x8fj7lf91vwzj98319hj3z8lpaaa9h42ybd5kky6"; procMacro = true; authors = [ "Peter Glotfelty " @@ -6034,12 +6408,25 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "parsing" "extra-traits" ]; } ]; }; + "subtle" = rec { + crateName = "subtle"; + version = "2.5.0"; + edition = "2018"; + sha256 = "1g2yjs7gffgmdvkkq0wrrh0pxds3q0dv6dhkw9cdpbib656xdkc1"; + authors = [ + "Isis Lovecruft " + "Henry de Valence " + ]; + features = { + "default" = [ "std" "i128" ]; + }; + }; "syn 1.0.109" = rec { crateName = "syn"; version = "1.0.109"; @@ -6074,11 +6461,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; }; - "syn 2.0.46" = rec { + "syn 2.0.61" = rec { crateName = "syn"; - version = "2.0.46"; + version = "2.0.61"; edition = "2021"; - sha256 = "03mzxgijkz77z8ysjn1kr6099i8mwvdsw713rz7dsbzp1xlnnic9"; + sha256 = "1j8zhf5mmd2l5niwhiniw5wcp9v6fbd4a61v6rbfhsm5rf6fv4y9"; authors = [ "David Tolnay " ]; @@ -6101,18 +6488,17 @@ rec { ]; features = { "default" = [ "derive" "parsing" "printing" "clone-impls" "proc-macro" ]; - "printing" = [ "quote" ]; - "proc-macro" = [ "proc-macro2/proc-macro" "quote/proc-macro" ]; - "quote" = [ "dep:quote" ]; + "printing" = [ "dep:quote" ]; + "proc-macro" = [ "proc-macro2/proc-macro" "quote?/proc-macro" ]; "test" = [ "syn-test-suite/all-features" ]; }; - resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" "visit-mut" ]; + resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "visit" "visit-mut" ]; }; "thiserror" = rec { crateName = "thiserror"; - version = "1.0.56"; + version = "1.0.60"; edition = "2021"; - sha256 = "1b9hnzngjan4d89zjs16i01bcpcnvdwklyh73lj16xk28p37hhym"; + sha256 = "067wi7pb1zn9jhhk82w0ppmvjwa00nwkp4m9j77rvpaqra1r17jp"; authors = [ "David Tolnay " ]; @@ -6126,10 +6512,11 @@ rec { }; "thiserror-impl" = rec { crateName = "thiserror-impl"; - version = "1.0.56"; + version = "1.0.60"; edition = "2021"; - sha256 = "0w9ldp8fa574ilz4dn7y7scpcq66vdjy59qal8qdpwsh7faal3zs"; + sha256 = "0945q2hk1rqdzjz2zqakxbddwm4h26k5c0wdncdarhvfq10h0iz2"; procMacro = true; + libName = "thiserror_impl"; authors = [ "David Tolnay " ]; @@ -6144,16 +6531,16 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; } ]; }; "thread_local" = rec { crateName = "thread_local"; - version = "1.1.7"; + version = "1.1.8"; edition = "2021"; - sha256 = "0lp19jdgvp5m4l60cgxdnl00yw1hlqy8gcywg9bddwng9h36zp9z"; + sha256 = "173i5lyjh011gsimk21np9jn8al18rxsrkjli20a7b8ks2xgk7lb"; authors = [ "Amanieu d'Antras " ]; @@ -6267,9 +6654,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.35.1"; + version = "1.37.0"; edition = "2021"; - sha256 = "01613rkziqp812a288ga65aqygs254wgajdi57v8brivjkx4x6y8"; + sha256 = "11v7qhvpwsf976frqgrjl1jy308bdkxq195gb38cypx7xkzypnqs"; authors = [ "Tokio Contributors " ]; @@ -6375,34 +6762,6 @@ rec { }; resolvedDefaultFeatures = [ "bytes" "default" "fs" "full" "io-std" "io-util" "libc" "macros" "mio" "net" "num_cpus" "parking_lot" "process" "rt" "rt-multi-thread" "signal" "signal-hook-registry" "socket2" "sync" "time" "tokio-macros" "windows-sys" ]; }; - "tokio-io-timeout" = rec { - crateName = "tokio-io-timeout"; - version = "1.2.0"; - edition = "2018"; - sha256 = "1gx84f92q1491vj4pkn81j8pz1s3pgwnbrsdhfsa2556mli41drh"; - authors = [ - "Steven Fackler " - ]; - dependencies = [ - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "time" ]; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "full" ]; - } - ]; - - }; "tokio-macros" = rec { crateName = "tokio-macros"; version = "2.2.0"; @@ -6423,7 +6782,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -6431,14 +6790,20 @@ rec { }; "tokio-rustls" = rec { crateName = "tokio-rustls"; - version = "0.24.1"; - edition = "2018"; - sha256 = "10bhibg57mqir7xjhb2xmf24xgfpx6fzpyw720a4ih8a737jg0y2"; + version = "0.26.0"; + edition = "2021"; + sha256 = "1m00czrmk8x7pdjnz10a3da3i1d0sdf9j9vfp5dnk5ss1q6w8yqc"; dependencies = [ { name = "rustls"; packageId = "rustls"; usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; } { name = "tokio"; @@ -6453,19 +6818,21 @@ rec { } ]; features = { - "dangerous_configuration" = [ "rustls/dangerous_configuration" ]; - "default" = [ "logging" "tls12" ]; + "aws-lc-rs" = [ "aws_lc_rs" ]; + "aws_lc_rs" = [ "rustls/aws_lc_rs" ]; + "default" = [ "logging" "tls12" "aws_lc_rs" ]; + "fips" = [ "rustls/fips" ]; "logging" = [ "rustls/logging" ]; - "secret_extraction" = [ "rustls/secret_extraction" ]; + "ring" = [ "rustls/ring" ]; "tls12" = [ "rustls/tls12" ]; }; resolvedDefaultFeatures = [ "logging" "tls12" ]; }; "tokio-stream" = rec { crateName = "tokio-stream"; - version = "0.1.14"; + version = "0.1.15"; edition = "2021"; - sha256 = "0hi8hcwavh5sdi1ivc9qc4yvyr32f153c212dpd7sb366y6rhz1r"; + sha256 = "1brpbsqyg8yfmfc4y0j9zxvc8xsxjc31d48kb0g6jvpc1fgchyi6"; authors = [ "Tokio Contributors " ]; @@ -6506,9 +6873,9 @@ rec { }; "tokio-util" = rec { crateName = "tokio-util"; - version = "0.7.10"; + version = "0.7.11"; edition = "2021"; - sha256 = "058y6x4mf0fsqji9rfyb77qbfyc50y4pk2spqgj6xsyr693z66al"; + sha256 = "1qcz30db6m8lxkl61b3nic4bim1symi636nhbb3rmi3i6xxv9xlw"; authors = [ "Tokio Contributors " ]; @@ -6539,13 +6906,6 @@ rec { packageId = "tokio"; features = [ "sync" ]; } - { - name = "tracing"; - packageId = "tracing"; - optional = true; - usesDefaultFeatures = false; - features = [ "std" ]; - } ]; devDependencies = [ { @@ -6556,7 +6916,6 @@ rec { ]; features = { "__docs_rs" = [ "futures-util" ]; - "codec" = [ "tracing" ]; "compat" = [ "futures-io" ]; "full" = [ "codec" "compat" "io-util" "time" "net" "rt" ]; "futures-io" = [ "dep:futures-io" ]; @@ -6569,114 +6928,7 @@ rec { "time" = [ "tokio/time" "slab" ]; "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "codec" "default" "io" "slab" "time" "tracing" ]; - }; - "toml" = rec { - crateName = "toml"; - version = "0.7.8"; - edition = "2021"; - sha256 = "0mr2dpmzw4ndvzpnnli2dprcx61pdk62fq4mzw0b6zb27ffycyfx"; - authors = [ - "Alex Crichton " - ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - } - { - name = "serde_spanned"; - packageId = "serde_spanned"; - features = [ "serde" ]; - } - { - name = "toml_datetime"; - packageId = "toml_datetime"; - features = [ "serde" ]; - } - { - name = "toml_edit"; - packageId = "toml_edit"; - optional = true; - features = [ "serde" ]; - } - ]; - devDependencies = [ - { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; - } - ]; - features = { - "default" = [ "parse" "display" ]; - "display" = [ "dep:toml_edit" ]; - "indexmap" = [ "dep:indexmap" ]; - "parse" = [ "dep:toml_edit" ]; - "preserve_order" = [ "indexmap" ]; - }; - resolvedDefaultFeatures = [ "default" "display" "parse" ]; - }; - "toml_datetime" = rec { - crateName = "toml_datetime"; - version = "0.6.5"; - edition = "2021"; - sha256 = "1wds4pm2cn6agd38f0ivm65xnc7c7bmk9m0fllcaq82nd3lz8l1m"; - authors = [ - "Alex Crichton " - ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - } - ]; - features = { - "serde" = [ "dep:serde" ]; - }; - resolvedDefaultFeatures = [ "serde" ]; - }; - "toml_edit" = rec { - crateName = "toml_edit"; - version = "0.19.15"; - edition = "2021"; - sha256 = "08bl7rp5g6jwmfpad9s8jpw8wjrciadpnbaswgywpr9hv9qbfnqv"; - authors = [ - "Andronik Ordian " - "Ed Page " - ]; - dependencies = [ - { - name = "indexmap"; - packageId = "indexmap"; - features = [ "std" ]; - } - { - name = "serde"; - packageId = "serde"; - optional = true; - } - { - name = "serde_spanned"; - packageId = "serde_spanned"; - optional = true; - features = [ "serde" ]; - } - { - name = "toml_datetime"; - packageId = "toml_datetime"; - } - { - name = "winnow"; - packageId = "winnow"; - } - ]; - features = { - "perf" = [ "dep:kstring" ]; - "serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ]; - }; - resolvedDefaultFeatures = [ "default" "serde" ]; + resolvedDefaultFeatures = [ "codec" "default" "io" "slab" "time" ]; }; "tower" = rec { crateName = "tower"; @@ -6781,39 +7033,30 @@ rec { "tracing" = [ "dep:tracing" ]; "util" = [ "__common" "futures-util" "pin-project" ]; }; - resolvedDefaultFeatures = [ "__common" "buffer" "default" "filter" "futures-core" "futures-util" "log" "pin-project" "pin-project-lite" "tokio" "tokio-util" "tracing" "util" ]; + resolvedDefaultFeatures = [ "__common" "buffer" "default" "filter" "futures-core" "futures-util" "log" "make" "pin-project" "pin-project-lite" "tokio" "tokio-util" "tracing" "util" ]; }; "tower-http" = rec { crateName = "tower-http"; - version = "0.4.4"; + version = "0.5.2"; edition = "2018"; - sha256 = "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1"; + sha256 = "1xakj3x0anp55gjqibiwvzma5iz0w9pcjsr7qk97sx4qm4sd970y"; authors = [ "Tower Maintainers " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; optional = true; } { name = "bitflags"; - packageId = "bitflags 2.4.1"; + packageId = "bitflags"; } { name = "bytes"; packageId = "bytes"; } - { - name = "futures-core"; - packageId = "futures-core"; - } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } { name = "http"; packageId = "http"; @@ -6823,8 +7066,8 @@ rec { packageId = "http-body"; } { - name = "http-range-header"; - packageId = "http-range-header"; + name = "http-body-util"; + packageId = "http-body-util"; } { name = "mime"; @@ -6862,19 +7105,21 @@ rec { "auth" = [ "base64" "validate-request" ]; "base64" = [ "dep:base64" ]; "catch-panic" = [ "tracing" "futures-util/std" ]; - "compression-br" = [ "async-compression/brotli" "tokio-util" "tokio" ]; - "compression-deflate" = [ "async-compression/zlib" "tokio-util" "tokio" ]; + "compression-br" = [ "async-compression/brotli" "futures-core" "tokio-util" "tokio" ]; + "compression-deflate" = [ "async-compression/zlib" "futures-core" "tokio-util" "tokio" ]; "compression-full" = [ "compression-br" "compression-deflate" "compression-gzip" "compression-zstd" ]; - "compression-gzip" = [ "async-compression/gzip" "tokio-util" "tokio" ]; - "compression-zstd" = [ "async-compression/zstd" "tokio-util" "tokio" ]; - "decompression-br" = [ "async-compression/brotli" "tokio-util" "tokio" ]; - "decompression-deflate" = [ "async-compression/zlib" "tokio-util" "tokio" ]; + "compression-gzip" = [ "async-compression/gzip" "futures-core" "tokio-util" "tokio" ]; + "compression-zstd" = [ "async-compression/zstd" "futures-core" "tokio-util" "tokio" ]; + "decompression-br" = [ "async-compression/brotli" "futures-core" "tokio-util" "tokio" ]; + "decompression-deflate" = [ "async-compression/zlib" "futures-core" "tokio-util" "tokio" ]; "decompression-full" = [ "decompression-br" "decompression-deflate" "decompression-gzip" "decompression-zstd" ]; - "decompression-gzip" = [ "async-compression/gzip" "tokio-util" "tokio" ]; - "decompression-zstd" = [ "async-compression/zstd" "tokio-util" "tokio" ]; - "follow-redirect" = [ "iri-string" "tower/util" ]; - "fs" = [ "tokio/fs" "tokio-util/io" "tokio/io-util" "mime_guess" "mime" "percent-encoding" "httpdate" "set-status" "futures-util/alloc" "tracing" ]; + "decompression-gzip" = [ "async-compression/gzip" "futures-core" "tokio-util" "tokio" ]; + "decompression-zstd" = [ "async-compression/zstd" "futures-core" "tokio-util" "tokio" ]; + "follow-redirect" = [ "futures-util" "iri-string" "tower/util" ]; + "fs" = [ "futures-util" "tokio/fs" "tokio-util/io" "tokio/io-util" "dep:http-range-header" "mime_guess" "mime" "percent-encoding" "httpdate" "set-status" "futures-util/alloc" "tracing" ]; "full" = [ "add-extension" "auth" "catch-panic" "compression-full" "cors" "decompression-full" "follow-redirect" "fs" "limit" "map-request-body" "map-response-body" "metrics" "normalize-path" "propagate-header" "redirect" "request-id" "sensitive-headers" "set-header" "set-status" "timeout" "trace" "util" "validate-request" ]; + "futures-core" = [ "dep:futures-core" ]; + "futures-util" = [ "dep:futures-util" ]; "httpdate" = [ "dep:httpdate" ]; "iri-string" = [ "dep:iri-string" ]; "metrics" = [ "tokio/time" ]; @@ -6983,7 +7228,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -7054,9 +7299,9 @@ rec { }; "tracing-opentelemetry" = rec { crateName = "tracing-opentelemetry"; - version = "0.22.0"; + version = "0.23.0"; edition = "2018"; - sha256 = "15jmwmbp6wz15bx20bfsmabx53wmlnd7wvzwz9hvkrq7aifc4yn6"; + sha256 = "1112kmckw0qwyckhbwarb230n4ldmfgzixr9jagbfjmy3fx19gm9"; authors = [ "Julian Tescher " "Tokio Contributors " @@ -7144,6 +7389,7 @@ rec { features = { "async-trait" = [ "dep:async-trait" ]; "default" = [ "tracing-log" "metrics" ]; + "futures-util" = [ "dep:futures-util" ]; "metrics" = [ "opentelemetry/metrics" "opentelemetry_sdk/metrics" "smallvec" ]; "smallvec" = [ "dep:smallvec" ]; "thiserror" = [ "dep:thiserror" ]; @@ -7264,33 +7510,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" ]; }; - "treediff" = rec { - crateName = "treediff"; - version = "4.0.2"; - edition = "2018"; - sha256 = "00s3mh5n6m3x5m6dd5kn5yqbvzkp0gn31pxmf887aanzgcklv62j"; - authors = [ - "Sebastian Thiel " - ]; - dependencies = [ - { - name = "serde_json"; - packageId = "serde_json"; - optional = true; - } - ]; - features = { - "rustc-serialize" = [ "dep:rustc-serialize" ]; - "serde_json" = [ "dep:serde_json" ]; - "serde_yaml" = [ "dep:serde_yaml" ]; - "with-rustc-serialize" = [ "rustc-serialize" ]; - "with-serde-json" = [ "serde_json" ]; - "with-serde-yaml" = [ "serde_yaml" ]; - "with-yaml-rust" = [ "yaml-rust" ]; - "yaml-rust" = [ "dep:yaml-rust" ]; - }; - resolvedDefaultFeatures = [ "serde_json" "with-serde-json" ]; - }; "try-lock" = rec { crateName = "try-lock"; version = "0.2.5"; @@ -7331,9 +7550,9 @@ rec { }; "unicode-bidi" = rec { crateName = "unicode-bidi"; - version = "0.3.14"; + version = "0.3.15"; edition = "2018"; - sha256 = "05i4ps31vskq1wdp8yf315fxivyh1frijly9d4gb5clygbr2h9bg"; + sha256 = "0xcdxm7h0ydyprwpcbh436rbs6s6lph7f3gr527lzgv6lw053y88"; libName = "unicode_bidi"; authors = [ "The Servo Project Developers" @@ -7360,9 +7579,9 @@ rec { }; "unicode-normalization" = rec { crateName = "unicode-normalization"; - version = "0.1.22"; + version = "0.1.23"; edition = "2018"; - sha256 = "08d95g7b1irc578b2iyhzv4xhsa4pfvwsqxcl9lbcpabzkq16msw"; + sha256 = "1x81a50h2zxigj74b9bqjsirxxbyhmis54kg600xj213vf31cvd5"; authors = [ "kwantam " "Manish Goregaokar " @@ -7395,10 +7614,10 @@ rec { }; "unsafe-libyaml" = rec { crateName = "unsafe-libyaml"; - version = "0.2.10"; + version = "0.2.11"; edition = "2021"; crateBin = []; - sha256 = "0jsyc1kqc536wpgx1js61lwj86crniqw16lyvh02va4m1f9r0k5b"; + sha256 = "0qdq69ffl3v5pzx9kzxbghzn0fzn266i1xn70y88maybz9csqfk7"; authors = [ "David Tolnay " ]; @@ -7435,11 +7654,24 @@ rec { name = "percent-encoding"; packageId = "percent-encoding"; } + { + name = "serde"; + packageId = "serde"; + optional = true; + features = [ "derive" ]; + } + ]; + devDependencies = [ + { + name = "serde"; + packageId = "serde"; + features = [ "derive" ]; + } ]; features = { "serde" = [ "dep:serde" ]; }; - resolvedDefaultFeatures = [ "default" ]; + resolvedDefaultFeatures = [ "default" "serde" ]; }; "urlencoding" = rec { crateName = "urlencoding"; @@ -7533,9 +7765,9 @@ rec { }; "wasm-bindgen" = rec { crateName = "wasm-bindgen"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "0kh6akdldy13z9xqj0skz6b4npq1d98bjkgzb8ccq59hibvd9l0f"; + sha256 = "1a4mcw13nsk3fr8fxjzf9kk1wj88xkfsmnm0pjraw01ryqfm7qjb"; authors = [ "The wasm-bindgen Developers" ]; @@ -7564,9 +7796,9 @@ rec { }; "wasm-bindgen-backend" = rec { crateName = "wasm-bindgen-backend"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "09l8lyylsdssz993h4fzja69zpvpykaw84fivs210fjgwqjzcmhv"; + sha256 = "1nj7wxbi49f0rw9d44rjzms26xlw6r76b2mrggx8jfbdjrxphkb1"; authors = [ "The wasm-bindgen Developers" ]; @@ -7593,7 +7825,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "full" ]; } { @@ -7608,9 +7840,9 @@ rec { }; "wasm-bindgen-macro" = rec { crateName = "wasm-bindgen-macro"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "1cl2w7k5jn2jbd5kx613c8k8vjvda22hfgcgx7y2mk93fbrxnqh1"; + sha256 = "09npa1srjjabd6nfph5yc03jb26sycjlxhy0c2a1pdrpx4yq5y51"; procMacro = true; authors = [ "The wasm-bindgen Developers" @@ -7633,9 +7865,9 @@ rec { }; "wasm-bindgen-macro-support" = rec { crateName = "wasm-bindgen-macro-support"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "10sj1gr2naxv5q116yjb929hhpvz45dxbkvyk8hyc2lknzy85szh"; + sha256 = "1dqv2xs8zcyw4kjgzj84bknp2h76phmsb3n7j6hn396h4ssifkz9"; authors = [ "The wasm-bindgen Developers" ]; @@ -7650,7 +7882,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; features = [ "visit" "full" ]; } { @@ -7670,10 +7902,10 @@ rec { }; "wasm-bindgen-shared" = rec { crateName = "wasm-bindgen-shared"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; links = "wasm_bindgen"; - sha256 = "17s5rppad113c6ggkaq8c3cg7a3zz15i78wxcg6mcl1n15iv7fbs"; + sha256 = "15kyavsrna2cvy30kg03va257fraf9x00ny554vxngvpyaa0q6dg"; authors = [ "The wasm-bindgen Developers" ]; @@ -7681,23 +7913,25 @@ rec { }; "web-time" = rec { crateName = "web-time"; - version = "0.2.4"; + version = "1.1.0"; edition = "2021"; - sha256 = "1q6gk0nkwbfz30g1pz8g52mq00zjx7m5im36k3474aw73jdh8c5a"; + sha256 = "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras"; dependencies = [ { name = "js-sys"; packageId = "js-sys"; - target = { target, features }: ((builtins.elem "wasm" target."family") && (!(("emscripten" == target."os" or null) || ("wasi" == target."os" or null)))); + target = { target, features }: ((builtins.elem "wasm" target."family") && ("unknown" == target."os" or null)); } { name = "wasm-bindgen"; packageId = "wasm-bindgen"; usesDefaultFeatures = false; - target = { target, features }: ((builtins.elem "wasm" target."family") && (!(("emscripten" == target."os" or null) || ("wasi" == target."os" or null)))); + target = { target, features }: ((builtins.elem "wasm" target."family") && ("unknown" == target."os" or null)); } ]; - + features = { + "serde" = [ "dep:serde" ]; + }; }; "winapi" = rec { crateName = "winapi"; @@ -7755,7 +7989,7 @@ rec { dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.52.0"; + packageId = "windows-targets 0.52.5"; } ]; features = { @@ -8066,7 +8300,7 @@ rec { dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.52.0"; + packageId = "windows-targets 0.52.5"; } ]; features = { @@ -8300,7 +8534,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_Memory" "Win32_UI" "Win32_UI_Shell" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Threading" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ]; }; "windows-targets 0.48.5" = rec { crateName = "windows-targets"; @@ -8349,49 +8583,54 @@ rec { ]; }; - "windows-targets 0.52.0" = rec { + "windows-targets 0.52.5" = rec { crateName = "windows-targets"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1kg7a27ynzw8zz3krdgy6w5gbqcji27j1sz4p7xk2j5j8082064a"; + sha256 = "1sz7jrnkygmmlj1ia8fk85wbyil450kq5qkh5qh9sh2rcnj161vg"; authors = [ "Microsoft" ]; dependencies = [ { name = "windows_aarch64_gnullvm"; - packageId = "windows_aarch64_gnullvm 0.52.0"; + packageId = "windows_aarch64_gnullvm 0.52.5"; target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); } { name = "windows_aarch64_msvc"; - packageId = "windows_aarch64_msvc 0.52.0"; + packageId = "windows_aarch64_msvc 0.52.5"; target = { target, features }: (("aarch64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } { name = "windows_i686_gnu"; - packageId = "windows_i686_gnu 0.52.0"; - target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!(target."windows_raw_dylib" or false))); + packageId = "windows_i686_gnu 0.52.5"; + target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); + } + { + name = "windows_i686_gnullvm"; + packageId = "windows_i686_gnullvm"; + target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "i686-pc-windows-gnullvm"); } { name = "windows_i686_msvc"; - packageId = "windows_i686_msvc 0.52.0"; + packageId = "windows_i686_msvc 0.52.5"; target = { target, features }: (("x86" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } { name = "windows_x86_64_gnu"; - packageId = "windows_x86_64_gnu 0.52.0"; + packageId = "windows_x86_64_gnu 0.52.5"; target = { target, features }: (("x86_64" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); } { name = "windows_x86_64_gnullvm"; - packageId = "windows_x86_64_gnullvm 0.52.0"; + packageId = "windows_x86_64_gnullvm 0.52.5"; target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm"); } { name = "windows_x86_64_msvc"; - packageId = "windows_x86_64_msvc 0.52.0"; - target = { target, features }: (("x86_64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); + packageId = "windows_x86_64_msvc 0.52.5"; + target = { target, features }: ((("x86_64" == target."arch" or null) || ("arm64ec" == target."arch" or null)) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } ]; @@ -8406,11 +8645,11 @@ rec { ]; }; - "windows_aarch64_gnullvm 0.52.0" = rec { + "windows_aarch64_gnullvm 0.52.5" = rec { crateName = "windows_aarch64_gnullvm"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1shmn1kbdc0bpphcxz0vlph96bxz0h1jlmh93s9agf2dbpin8xyb"; + sha256 = "0qrjimbj67nnyn7zqy15mzzmqg0mn5gsr2yciqjxm3cb3vbyx23h"; authors = [ "Microsoft" ]; @@ -8426,11 +8665,11 @@ rec { ]; }; - "windows_aarch64_msvc 0.52.0" = rec { + "windows_aarch64_msvc 0.52.5" = rec { crateName = "windows_aarch64_msvc"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1vvmy1ypvzdvxn9yf0b8ygfl85gl2gpcyvsvqppsmlpisil07amv"; + sha256 = "1dmga8kqlmln2ibckk6mxc9n59vdg8ziqa2zr8awcl720hazv1cr"; authors = [ "Microsoft" ]; @@ -8446,11 +8685,21 @@ rec { ]; }; - "windows_i686_gnu 0.52.0" = rec { + "windows_i686_gnu 0.52.5" = rec { crateName = "windows_i686_gnu"; - version = "0.52.0"; + version = "0.52.5"; + edition = "2021"; + sha256 = "0w4np3l6qwlra9s2xpflqrs60qk1pz6ahhn91rr74lvdy4y0gfl8"; + authors = [ + "Microsoft" + ]; + + }; + "windows_i686_gnullvm" = rec { + crateName = "windows_i686_gnullvm"; + version = "0.52.5"; edition = "2021"; - sha256 = "04zkglz4p3pjsns5gbz85v4s5aw102raz4spj4b0lmm33z5kg1m2"; + sha256 = "1s9f4gff0cixd86mw3n63rpmsm4pmr4ffndl6s7qa2h35492dx47"; authors = [ "Microsoft" ]; @@ -8466,11 +8715,11 @@ rec { ]; }; - "windows_i686_msvc 0.52.0" = rec { + "windows_i686_msvc 0.52.5" = rec { crateName = "windows_i686_msvc"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "16kvmbvx0vr0zbgnaz6nsks9ycvfh5xp05bjrhq65kj623iyirgz"; + sha256 = "1gw7fklxywgpnwbwg43alb4hm0qjmx72hqrlwy5nanrxs7rjng6v"; authors = [ "Microsoft" ]; @@ -8486,11 +8735,11 @@ rec { ]; }; - "windows_x86_64_gnu 0.52.0" = rec { + "windows_x86_64_gnu 0.52.5" = rec { crateName = "windows_x86_64_gnu"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1zdy4qn178sil5sdm63lm7f0kkcjg6gvdwmcprd2yjmwn8ns6vrx"; + sha256 = "1n8p2mcf3lw6300k77a0knksssmgwb9hynl793mhkzyydgvlchjf"; authors = [ "Microsoft" ]; @@ -8506,11 +8755,11 @@ rec { ]; }; - "windows_x86_64_gnullvm 0.52.0" = rec { + "windows_x86_64_gnullvm 0.52.5" = rec { crateName = "windows_x86_64_gnullvm"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "17lllq4l2k1lqgcnw1cccphxp9vs7inq99kjlm2lfl9zklg7wr8s"; + sha256 = "15n56jrh4s5bz66zimavr1rmcaw6wa306myrvmbc6rydhbj9h8l5"; authors = [ "Microsoft" ]; @@ -8526,44 +8775,22 @@ rec { ]; }; - "windows_x86_64_msvc 0.52.0" = rec { + "windows_x86_64_msvc 0.52.5" = rec { crateName = "windows_x86_64_msvc"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "012wfq37f18c09ij5m6rniw7xxn5fcvrxbqd0wd8vgnl3hfn9yfz"; + sha256 = "1w1bn24ap8dp9i85s8mlg8cim2bl2368bd6qyvm0xzqvzmdpxi5y"; authors = [ "Microsoft" ]; }; - "winnow" = rec { - crateName = "winnow"; - version = "0.5.31"; - edition = "2021"; - sha256 = "0734xa05a1x1wg2kcphdhfb39pdcy5qpaf1sjll6qk8kdcp8i94p"; - dependencies = [ - { - name = "memchr"; - packageId = "memchr"; - optional = true; - usesDefaultFeatures = false; - } - ]; - features = { - "debug" = [ "dep:anstream" "dep:anstyle" "dep:is-terminal" "dep:terminal_size" ]; - "default" = [ "std" ]; - "simd" = [ "dep:memchr" ]; - "std" = [ "alloc" "memchr?/std" ]; - "unstable-doc" = [ "alloc" "std" "simd" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; - }; "xml-rs" = rec { crateName = "xml-rs"; - version = "0.8.19"; + version = "0.8.20"; edition = "2021"; crateBin = []; - sha256 = "0nnpvk3fv32hgh7vs9gbg2swmzxx5yz73f4b7rak7q39q2x9rjqg"; + sha256 = "14s1czpj83zhgr4pizxa4j07layw9wmlqhkq0k3wz5q5ixwph6br"; libName = "xml"; authors = [ "Vladimir Matveev " @@ -8572,9 +8799,9 @@ rec { }; "zerocopy" = rec { crateName = "zerocopy"; - version = "0.7.32"; + version = "0.7.34"; edition = "2018"; - sha256 = "1ghnfxw69kx5d1aqfd5fsfrra9dgpz17yqx84nd4ryjk3sbd7m3l"; + sha256 = "11xhrwixm78m6ca1jdxf584wdwvpgg7q00vg21fhwl0psvyf71xf"; authors = [ "Joshua Liebow-Feeser " ]; @@ -8608,9 +8835,9 @@ rec { }; "zerocopy-derive" = rec { crateName = "zerocopy-derive"; - version = "0.7.32"; + version = "0.7.34"; edition = "2018"; - sha256 = "19nj11md42aijyqnfx8pa647fjzhz537xyc624rajwwfrn6b3qcw"; + sha256 = "0fqvglw01w3hp7xj9gdk1800x9j7v58s9w8ijiyiz2a7krb39s8m"; procMacro = true; authors = [ "Joshua Liebow-Feeser " @@ -8626,7 +8853,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.46"; + packageId = "syn 2.0.61"; } ]; @@ -8646,7 +8873,7 @@ rec { "std" = [ "alloc" ]; "zeroize_derive" = [ "dep:zeroize_derive" ]; }; - resolvedDefaultFeatures = [ "alloc" ]; + resolvedDefaultFeatures = [ "alloc" "default" ]; }; }; diff --git a/Cargo.toml b/Cargo.toml index a1255b0c..659964d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,8 @@ repository = "https://github.com/stackabletech/superset-operator" [workspace.dependencies] anyhow = "1.0" -built = { version = "0.6", features = ["chrono", "git2"] } -clap = "4.3" +built = { version = "0.7", features = ["chrono", "git2"] } +clap = "4.5" fnv = "1.0" futures = { version = "0.3", features = ["compat"] } indoc = "2.0" @@ -20,10 +20,10 @@ product-config = { git = "https://github.com/stackabletech/product-config.git", serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" -snafu = "0.7" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.64.0" } -strum = { version = "0.25", features = ["derive"] } -tokio = { version = "1.29", features = ["full"] } +snafu = "0.8" +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.1" } +strum = { version = "0.26", features = ["derive"] } +tokio = { version = "1.37", features = ["full"] } tracing = "0.1" # [patch."https://github.com/stackabletech/operator-rs.git"] diff --git a/crate-hashes.json b/crate-hashes.json index 3d1f373a..5623023b 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,5 +1,5 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#stackable-operator-derive@0.64.0": "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp", - "git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#stackable-operator@0.64.0": "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator-derive@0.3.0": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator@0.67.1": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", "git+https://github.com/stackabletech/product-config.git?tag=0.6.0#product-config@0.6.0": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41" -} +} \ No newline at end of file diff --git a/deploy/helm/superset-operator/crds/crds.yaml b/deploy/helm/superset-operator/crds/crds.yaml index 3a19be6d..113da420 100644 --- a/deploy/helm/superset-operator/crds/crds.yaml +++ b/deploy/helm/superset-operator/crds/crds.yaml @@ -307,6 +307,8 @@ spec: type: object type: object nodeSelector: + additionalProperties: + type: string nullable: true type: object podAffinity: @@ -322,7 +324,7 @@ spec: description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -351,6 +353,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -407,7 +419,7 @@ spec: description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -436,6 +448,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -492,7 +514,7 @@ spec: description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -521,6 +543,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -577,7 +609,7 @@ spec: description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -606,6 +638,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -990,6 +1032,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -1045,6 +1095,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -1101,6 +1159,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -1156,6 +1222,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -1297,18 +1371,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object preStop: @@ -1336,18 +1414,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object type: object @@ -1387,8 +1469,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -1406,8 +1487,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -1471,8 +1551,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -1490,8 +1569,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -1533,6 +1611,13 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object capabilities: properties: add: @@ -1624,8 +1709,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -1643,8 +1727,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -1683,6 +1766,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -1826,18 +1911,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object preStop: @@ -1865,18 +1954,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object type: object @@ -1916,8 +2009,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -1935,8 +2027,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -2000,8 +2091,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -2019,8 +2109,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -2062,6 +2151,13 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object capabilities: properties: add: @@ -2153,8 +2249,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -2172,8 +2267,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -2214,6 +2308,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -2361,18 +2457,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object preStop: @@ -2400,18 +2500,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object type: object @@ -2451,8 +2555,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -2470,8 +2573,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -2535,8 +2637,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -2554,8 +2655,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -2597,6 +2697,13 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object capabilities: properties: add: @@ -2688,8 +2795,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -2707,8 +2813,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -2747,6 +2852,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -2815,6 +2922,13 @@ spec: type: array securityContext: properties: + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object fsGroup: format: int64 type: integer @@ -3204,13 +3318,6 @@ spec: type: object resources: properties: - claims: - items: - properties: - name: - type: string - type: object - type: array limits: additionalProperties: type: string @@ -3242,6 +3349,8 @@ spec: type: object storageClassName: type: string + volumeAttributesClassName: + type: string volumeMode: type: string volumeName: @@ -3402,6 +3511,37 @@ spec: sources: items: properties: + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + type: object configMap: properties: items: @@ -3770,6 +3910,8 @@ spec: type: object type: object nodeSelector: + additionalProperties: + type: string nullable: true type: object podAffinity: @@ -3785,7 +3927,7 @@ spec: description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -3814,6 +3956,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -3870,7 +4022,7 @@ spec: description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -3899,6 +4051,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -3955,7 +4117,7 @@ spec: description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -3984,6 +4146,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -4040,7 +4212,7 @@ spec: description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running properties: labelSelector: - description: A label query over a set of resources, in this case pods. + description: A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -4069,6 +4241,16 @@ spec: description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + items: + type: string + type: array namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. properties: @@ -4453,6 +4635,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -4508,6 +4698,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -4564,6 +4762,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -4619,6 +4825,14 @@ spec: type: string type: object type: object + matchLabelKeys: + items: + type: string + type: array + mismatchLabelKeys: + items: + type: string + type: array namespaceSelector: properties: matchExpressions: @@ -4760,18 +4974,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object preStop: @@ -4799,18 +5017,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object type: object @@ -4850,8 +5072,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -4869,8 +5090,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -4934,8 +5154,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -4953,8 +5172,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -4996,6 +5214,13 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object capabilities: properties: add: @@ -5087,8 +5312,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -5106,8 +5330,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -5146,6 +5369,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -5289,18 +5514,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object preStop: @@ -5328,18 +5557,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object type: object @@ -5379,8 +5612,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -5398,8 +5630,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -5463,8 +5694,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -5482,8 +5712,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -5525,6 +5754,13 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object capabilities: properties: add: @@ -5616,8 +5852,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -5635,8 +5870,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -5677,6 +5911,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -5824,18 +6060,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object preStop: @@ -5863,18 +6103,22 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object + sleep: + properties: + seconds: + format: int64 + type: integer + type: object tcpSocket: properties: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object type: object type: object @@ -5914,8 +6158,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -5933,8 +6176,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -5998,8 +6240,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -6017,8 +6258,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -6060,6 +6300,13 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object capabilities: properties: add: @@ -6151,8 +6398,7 @@ spec: path: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true scheme: type: string type: object @@ -6170,8 +6416,7 @@ spec: host: type: string port: - format: int-or-string - type: string + x-kubernetes-int-or-string: true type: object terminationGracePeriodSeconds: format: int64 @@ -6210,6 +6455,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -6278,6 +6525,13 @@ spec: type: array securityContext: properties: + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + type: object fsGroup: format: int64 type: integer @@ -6667,13 +6921,6 @@ spec: type: object resources: properties: - claims: - items: - properties: - name: - type: string - type: object - type: array limits: additionalProperties: type: string @@ -6705,6 +6952,8 @@ spec: type: object storageClassName: type: string + volumeAttributesClassName: + type: string volumeMode: type: string volumeName: @@ -6865,6 +7114,37 @@ spec: sources: items: properties: + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + type: object configMap: properties: items: diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index 872185ce..e84f9a8e 100644 --- a/rust/crd/src/affinity.rs +++ b/rust/crd/src/affinity.rs @@ -81,9 +81,8 @@ mod tests { ) ])) }), - namespace_selector: None, - namespaces: None, topology_key: "kubernetes.io/hostname".to_string(), + ..PodAffinityTerm::default() }, weight: 70 } diff --git a/rust/crd/src/authentication.rs b/rust/crd/src/authentication.rs index db71aec4..ee1a802f 100644 --- a/rust/crd/src/authentication.rs +++ b/rust/crd/src/authentication.rs @@ -9,7 +9,6 @@ use stackable_operator::{ oidc::{self, IdentityProviderHint}, AuthenticationClass, AuthenticationClassProvider, ClientAuthenticationDetails, }, - error::OperatorResult, schemars::{self, JsonSchema}, }; use tracing::info; @@ -29,7 +28,7 @@ pub enum Error { #[snafu(display("failed to retrieve AuthenticationClass"))] AuthenticationClassRetrievalFailed { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("only one authentication type at a time is supported by Superset, see https://github.com/dpgaspar/Flask-AppBuilder/issues/1924"))] @@ -63,7 +62,7 @@ pub enum Error { #[snafu(display("invalid OIDC configuration"))] OidcConfigurationInvalid { - source: stackable_operator::error::Error, + source: stackable_operator::commons::authentication::Error, }, #[snafu(display("the OIDC provider {oidc_provider:?} is not yet supported (AuthenticationClass {auth_class_name:?})"))] @@ -162,7 +161,7 @@ impl SupersetClientAuthenticationDetailsResolved { resolve_auth_class: impl Fn(ClientAuthenticationDetails) -> R, ) -> Result where - R: Future>, + R: Future>, { let mut resolved_auth_classes = Vec::new(); let mut user_registration = None; @@ -770,7 +769,7 @@ mod tests { invalid OIDC configuration Caused by this error: - 1: OIDC authentication details not specified. The AuthenticationClass "oidc" uses an OIDC provider, you need to specify OIDC authentication details (such as client credentials) as well"# + 1: authentication details for OIDC were not specified. The AuthenticationClass "oidc" uses an OIDC provider, you need to specify OIDC authentication details (such as client credentials) as well"# }, error_message ); @@ -931,7 +930,9 @@ mod tests { auth_classes: Vec, ) -> impl Fn( ClientAuthenticationDetails, - ) -> Pin>>> { + ) -> Pin< + Box>>, + > { move |auth_details: ClientAuthenticationDetails| { let auth_classes = auth_classes.clone(); Box::pin(async move { @@ -942,7 +943,7 @@ mod tests { == Some(auth_details.authentication_class_name()) }) .cloned() - .ok_or_else(|| stackable_operator::error::Error::KubeError { + .ok_or_else(|| stackable_operator::client::Error::ListResources { source: kube::Error::Api(kube::error::ErrorResponse { code: 404, message: "AuthenticationClass not found".into(), diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 914650e0..94edcb13 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -18,7 +18,7 @@ use stackable_operator::{ k8s_openapi::apimachinery::pkg::api::resource::Quantity, kube::{runtime::reflector::ObjectRef, CustomResource, ResourceExt}, memory::{BinaryMultiple, MemoryQuantity}, - product_config_utils::{ConfigError, Configuration}, + product_config_utils::{self, Configuration}, product_logging::{self, spec::Logging}, role_utils::{GenericRoleConfig, Role, RoleGroupRef}, schemars::{self, JsonSchema}, @@ -381,7 +381,7 @@ impl Configuration for SupersetConfigFragment { &self, cluster: &Self::Configurable, _role_name: &str, - ) -> Result>, ConfigError> { + ) -> Result>, product_config_utils::Error> { let mut result = BTreeMap::new(); result.insert( SupersetConfig::CREDENTIALS_SECRET_PROPERTY.to_string(), @@ -401,7 +401,7 @@ impl Configuration for SupersetConfigFragment { &self, _cluster: &Self::Configurable, _role_name: &str, - ) -> Result>, ConfigError> { + ) -> Result>, product_config_utils::Error> { Ok(BTreeMap::new()) } @@ -410,7 +410,7 @@ impl Configuration for SupersetConfigFragment { _cluster: &Self::Configurable, _role_name: &str, file: &str, - ) -> Result>, ConfigError> { + ) -> Result>, product_config_utils::Error> { let mut result = BTreeMap::new(); if file == SUPERSET_CONFIG_FILENAME { diff --git a/rust/operator-binary/build.rs b/rust/operator-binary/build.rs index ed36fcf0..fa809bfd 100644 --- a/rust/operator-binary/build.rs +++ b/rust/operator-binary/build.rs @@ -1,13 +1,3 @@ -use std::path::PathBuf; - fn main() { - let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required")); - built::write_built_file_with_opts( - // built's env module depends on a whole bunch of variables that crate2nix doesn't provide - // so we grab the specific env variables that we care about out ourselves instead. - built::Options::default().set_env(false), - "Cargo.toml".as_ref(), - &out_dir.join("built.rs"), - ) - .unwrap(); + built::write_built_file().unwrap(); } diff --git a/rust/operator-binary/src/controller_commons.rs b/rust/operator-binary/src/controller_commons.rs index f077019c..d9cc77a1 100644 --- a/rust/operator-binary/src/controller_commons.rs +++ b/rust/operator-binary/src/controller_commons.rs @@ -1,5 +1,5 @@ use stackable_operator::{ - builder::VolumeBuilder, + builder::pod::volume::VolumeBuilder, k8s_openapi::api::core::v1::{ConfigMapVolumeSource, EmptyDirVolumeSource, Volume}, product_logging::{ self, diff --git a/rust/operator-binary/src/druid_connection_controller.rs b/rust/operator-binary/src/druid_connection_controller.rs index 30e3ec5e..4286935b 100644 --- a/rust/operator-binary/src/druid_connection_controller.rs +++ b/rust/operator-binary/src/druid_connection_controller.rs @@ -3,7 +3,10 @@ use crate::util::{get_job_state, JobState}; use crate::{rbac, superset_controller::DOCKER_IMAGE_BASE_NAME, APP_NAME}; use snafu::{OptionExt, ResultExt, Snafu}; use stackable_operator::{ - builder::{ContainerBuilder, ObjectMetaBuilder, PodSecurityContextBuilder}, + builder::{ + meta::ObjectMetaBuilder, + pod::{container::ContainerBuilder, security::PodSecurityContextBuilder}, + }, client::Client, commons::product_image_selection::ResolvedProductImage, k8s_openapi::api::{ @@ -29,7 +32,7 @@ use strum::{EnumDiscriminants, IntoStaticStr}; pub const DRUID_CONNECTION_CONTROLLER_NAME: &str = "druid-connection"; pub struct Ctx { - pub client: stackable_operator::client::Client, + pub client: Client, } #[derive(Snafu, Debug, EnumDiscriminants)] @@ -38,31 +41,31 @@ pub struct Ctx { pub enum Error { #[snafu(display("failed to apply Job for Druid Connection"))] ApplyJob { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("failed to update status"))] ApplyStatus { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("object is missing metadata to build owner reference"))] ObjectMissingMetadataForOwnerRef { - source: stackable_operator::error::Error, + source: stackable_operator::builder::meta::Error, }, #[snafu(display("failed to get Druid connection string from config map {config_map}"))] GetDruidConnStringConfigMap { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, config_map: ObjectRef, }, #[snafu(display("failed to get Druid connection string from config map"))] MissingDruidConnString, #[snafu(display("druid connection state is 'importing' but failed to find job {import_job}"))] GetImportJob { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, import_job: ObjectRef, }, #[snafu(display("failed to check if druid discovery map exists"))] DruidDiscoveryCheck { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("namespace missing on DruidConnection {druid_connection}"))] DruidConnectionNoNamespace { @@ -71,15 +74,15 @@ pub enum Error { }, #[snafu(display("failed to patch service account"))] ApplyServiceAccount { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("failed to patch role binding"))] ApplyRoleBinding { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("failed to retrieve superset cluster"))] SupersetClusterRetrieval { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, } @@ -189,7 +192,7 @@ pub async fn reconcile_druid_connection( let resolved_product_image: ResolvedProductImage = superset_cluster .spec .image - .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::CARGO_PKG_VERSION); + .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION); let job = build_import_job( &superset_cluster, &druid_connection, diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 0a663908..83d35060 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -34,8 +34,6 @@ mod util; mod built_info { include!(concat!(env!("OUT_DIR"), "/built.rs")); - pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET"); - pub const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); } pub const APP_PORT: u16 = 8088; @@ -53,8 +51,8 @@ async fn main() -> anyhow::Result<()> { let opts = Opts::parse(); match opts.cmd { Command::Crd => { - SupersetCluster::print_yaml_schema(built_info::CARGO_PKG_VERSION)?; - DruidConnection::print_yaml_schema(built_info::CARGO_PKG_VERSION)?; + SupersetCluster::print_yaml_schema(built_info::PKG_VERSION)?; + DruidConnection::print_yaml_schema(built_info::PKG_VERSION)?; } Command::Run(ProductOperatorRun { product_config, @@ -70,7 +68,7 @@ async fn main() -> anyhow::Result<()> { crate_description!(), crate_version!(), built_info::GIT_VERSION, - built_info::TARGET_PLATFORM.unwrap_or("unknown target"), + built_info::TARGET, built_info::BUILT_TIME_UTC, built_info::RUSTC_VERSION, ); diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs index 5fc61fa8..b4630dd9 100644 --- a/rust/operator-binary/src/operations/graceful_shutdown.rs +++ b/rust/operator-binary/src/operations/graceful_shutdown.rs @@ -1,5 +1,5 @@ use snafu::{ResultExt, Snafu}; -use stackable_operator::builder::PodBuilder; +use stackable_operator::builder::pod::PodBuilder; use stackable_superset_crd::SupersetConfig; #[derive(Debug, Snafu)] diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs index 65c5c900..3908bd2d 100644 --- a/rust/operator-binary/src/operations/pdb.rs +++ b/rust/operator-binary/src/operations/pdb.rs @@ -11,12 +11,12 @@ use crate::{superset_controller::SUPERSET_CONTROLLER_NAME, OPERATOR_NAME}; pub enum Error { #[snafu(display("Cannot create PodDisruptionBudget for role [{role}]"))] CreatePdb { - source: stackable_operator::error::Error, + source: stackable_operator::builder::pdb::Error, role: String, }, #[snafu(display("Cannot apply PodDisruptionBudget [{name}]"))] ApplyPdb { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, name: String, }, } diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs index 1d110ebf..fb9a5076 100644 --- a/rust/operator-binary/src/product_logging.rs +++ b/rust/operator-binary/src/product_logging.rs @@ -2,7 +2,7 @@ use std::fmt::{Display, Write}; use snafu::{OptionExt, ResultExt, Snafu}; use stackable_operator::{ - builder::ConfigMapBuilder, + builder::configmap::ConfigMapBuilder, client::Client, k8s_openapi::api::core::v1::ConfigMap, kube::Resource, @@ -22,7 +22,7 @@ pub enum Error { ObjectHasNoNamespace, #[snafu(display("failed to retrieve the ConfigMap [{cm_name}]"))] ConfigMapNotFound { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, cm_name: String, }, #[snafu(display("failed to retrieve the entry [{entry}] for ConfigMap [{cm_name}]"))] diff --git a/rust/operator-binary/src/rbac.rs b/rust/operator-binary/src/rbac.rs index 3ada0c90..8fb8928e 100644 --- a/rust/operator-binary/src/rbac.rs +++ b/rust/operator-binary/src/rbac.rs @@ -1,7 +1,11 @@ -use stackable_operator::builder::ObjectMetaBuilder; -use stackable_operator::k8s_openapi::api::core::v1::ServiceAccount; -use stackable_operator::k8s_openapi::api::rbac::v1::{RoleBinding, RoleRef, Subject}; -use stackable_operator::kube::{Resource, ResourceExt}; +use stackable_operator::{ + builder::meta::ObjectMetaBuilder, + k8s_openapi::api::{ + core::v1::ServiceAccount, + rbac::v1::{RoleBinding, RoleRef, Subject}, + }, + kube::{Resource, ResourceExt}, +}; /// Obsolete: only used in the DB controller for historical reasons. Scheduled for deletion /// once the entire DB controller is deleted as discused here: diff --git a/rust/operator-binary/src/superset_controller.rs b/rust/operator-binary/src/superset_controller.rs index 7e2e6644..a559c7e3 100644 --- a/rust/operator-binary/src/superset_controller.rs +++ b/rust/operator-binary/src/superset_controller.rs @@ -14,8 +14,12 @@ use product_config::{ use snafu::{OptionExt, ResultExt, Snafu}; use stackable_operator::{ builder::{ - resources::ResourceRequirementsBuilder, ConfigMapBuilder, ContainerBuilder, - ObjectMetaBuilder, PodBuilder, PodSecurityContextBuilder, + configmap::ConfigMapBuilder, + meta::ObjectMetaBuilder, + pod::{ + container::ContainerBuilder, resources::ResourceRequirementsBuilder, + security::PodSecurityContextBuilder, PodBuilder, + }, }, cluster_resources::{ClusterResourceApplyStrategy, ClusterResources}, commons::{ @@ -96,27 +100,27 @@ pub enum Error { #[snafu(display("invalid container name"))] InvalidContainerName { - source: stackable_operator::error::Error, + source: stackable_operator::builder::pod::container::Error, }, #[snafu(display("failed to create cluster resources"))] CreateClusterResources { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, }, #[snafu(display("failed to delete orphaned resources"))] DeleteOrphanedResources { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, }, #[snafu(display("failed to apply global Service"))] ApplyRoleService { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, }, #[snafu(display("failed to apply Service for {rolegroup}"))] ApplyRoleGroupService { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, rolegroup: RoleGroupRef, }, @@ -128,35 +132,35 @@ pub enum Error { #[snafu(display("failed to build ConfigMap for {rolegroup}"))] BuildRoleGroupConfig { - source: stackable_operator::error::Error, + source: stackable_operator::builder::configmap::Error, rolegroup: RoleGroupRef, }, #[snafu(display("failed to apply ConfigMap for {rolegroup}"))] ApplyRoleGroupConfig { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, rolegroup: RoleGroupRef, }, #[snafu(display("failed to apply StatefulSet for {rolegroup}"))] ApplyRoleGroupStatefulSet { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, rolegroup: RoleGroupRef, }, #[snafu(display("failed to generate product config"))] GenerateProductConfig { - source: stackable_operator::product_config_utils::ConfigError, + source: stackable_operator::product_config_utils::Error, }, #[snafu(display("invalid product config"))] InvalidProductConfig { - source: stackable_operator::error::Error, + source: stackable_operator::product_config_utils::Error, }, #[snafu(display("object is missing metadata to build owner reference"))] ObjectMissingMetadataForOwnerRef { - source: stackable_operator::error::Error, + source: stackable_operator::builder::meta::Error, }, #[snafu(display("failed to apply authentication configuration"))] @@ -190,22 +194,22 @@ pub enum Error { #[snafu(display("failed to update status"))] ApplyStatus { - source: stackable_operator::error::Error, + source: stackable_operator::client::Error, }, #[snafu(display("failed to patch service account"))] ApplyServiceAccount { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, }, #[snafu(display("failed to patch role binding"))] ApplyRoleBinding { - source: stackable_operator::error::Error, + source: stackable_operator::cluster_resources::Error, }, #[snafu(display("failed to build RBAC objects"))] BuildRBACObjects { - source: stackable_operator::error::Error, + source: stackable_operator::commons::rbac::Error, }, #[snafu(display("failed to create PodDisruptionBudget"))] @@ -225,7 +229,7 @@ pub enum Error { #[snafu(display("failed to build Metadata"))] MetadataBuild { - source: stackable_operator::builder::ObjectMetaBuilderError, + source: stackable_operator::builder::meta::Error, }, #[snafu(display("failed to get required Labels"))] @@ -263,7 +267,7 @@ pub async fn reconcile_superset(superset: Arc, ctx: Arc) - let resolved_product_image: ResolvedProductImage = superset .spec .image - .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::CARGO_PKG_VERSION); + .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION); let superset_role = SupersetRole::Node; let cluster_operation_cond_builder =