From 32f018e4f6843f44c5fabe371228b719e982dcb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Tue, 10 Dec 2024 11:41:06 +0100 Subject: [PATCH] Upgrade backend dependencies and base images (#1647) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- .github/workflows/ci.yml | 4 +- Cargo.lock | 432 ++++++++++++++-------------- Cargo.toml | 60 ++-- clomonitor-apiserver/Dockerfile | 6 +- clomonitor-apiserver/src/filters.rs | 5 +- clomonitor-archiver/Dockerfile | 4 +- clomonitor-linter/Dockerfile | 6 +- clomonitor-linter/src/table.rs | 68 ++--- clomonitor-notifier/Dockerfile | 4 +- clomonitor-registrar/Dockerfile | 4 +- clomonitor-tracker/Dockerfile | 6 +- database/migrations/Dockerfile | 4 +- 12 files changed, 308 insertions(+), 295 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf870c52..60eca1ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.81.0 + toolchain: 1.83.0 components: clippy, rustfmt - name: Run clippy run: cargo clippy --all-targets --all-features -- --deny warnings @@ -56,7 +56,7 @@ jobs: - name: Setup Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.81.0 + toolchain: 1.83.0 - name: Run backend tests run: cargo test diff --git a/Cargo.lock b/Cargo.lock index 34d30a35..f356c28c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arrayref" @@ -138,9 +138,9 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "askalono" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b5d702bda44c54cef36c81456389719711127ad83e46b9d06fda469bd2e6d7" +checksum = "46676ccec8213bcc35a7e8562a8459138b8ae82c380bbc9ae7ffcfa247352972" dependencies = [ "anyhow", "flate2", @@ -176,7 +176,7 @@ checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163" dependencies = [ "askama", "axum-core", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -192,7 +192,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -219,18 +219,18 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -268,19 +268,19 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.5" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", "axum-macros", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "itoa", "matchit", @@ -295,7 +295,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -303,20 +303,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -324,14 +324,13 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ - "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -404,7 +403,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", + "syn 2.0.90", "which 4.4.2", ] @@ -465,9 +464,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cached" -version = "0.53.1" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d73155ae6b28cf5de4cfc29aeb02b8a1c6dab883cb015d15cd514e42766846" +checksum = "9718806c4a2fe9e8a56fd736f97b340dd10ed1be8ed733ed50449f351dc33cae" dependencies = [ "ahash 0.8.11", "async-trait", @@ -490,7 +489,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -550,9 +549,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -560,9 +559,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -572,21 +571,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clomonitor-apiserver" @@ -602,7 +601,7 @@ dependencies = [ "config", "deadpool-postgres", "futures", - "hyper 1.4.1", + "hyper 1.5.1", "lazy_static", "metrics", "metrics-exporter-prometheus", @@ -663,19 +662,19 @@ dependencies = [ "git2", "glob", "graphql_client", - "http 1.1.0", + "http 1.2.0", "lazy_static", "mockall", "postgres-types", "regex", - "reqwest 0.12.7", + "reqwest 0.12.9", "serde", "serde_json", "serde_yaml", "time", "tokio", "tracing", - "which 6.0.3", + "which 7.0.0", "wiremock", ] @@ -730,12 +729,12 @@ dependencies = [ "deadpool-postgres", "futures", "hex", - "http 1.1.0", + "http 1.2.0", "mockall", "mockito", "openssl", "postgres-openssl", - "reqwest 0.12.7", + "reqwest 0.12.9", "serde", "serde_json", "serde_yaml", @@ -772,7 +771,7 @@ dependencies = [ "tracing", "tracing-subscriber", "uuid", - "which 6.0.3", + "which 7.0.0", ] [[package]] @@ -822,9 +821,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9" dependencies = [ "crossterm", "strum", @@ -929,14 +928,14 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.4.2", "crossterm_winapi", - "libc", "parking_lot", + "rustix", "winapi", ] @@ -980,7 +979,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -991,7 +990,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -1122,12 +1121,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1138,9 +1137,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" @@ -1167,6 +1166,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "fontconfig-parser" version = "0.5.0" @@ -1226,9 +1231,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1241,9 +1246,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1251,15 +1256,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1268,38 +1273,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1486,7 +1491,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 1.1.0", + "http 1.2.0", "indexmap", "slab", "tokio", @@ -1513,6 +1518,15 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", +] + [[package]] name = "heck" version = "0.4.1" @@ -1568,9 +1582,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -1595,7 +1609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -1606,7 +1620,7 @@ checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "pin-project-lite", ] @@ -1664,15 +1678,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", "h2 0.4.2", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "httparse", "httpdate", @@ -1704,10 +1718,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.4.1", + "http 1.2.0", + "hyper 1.5.1", "hyper-util", - "log", "rustls 0.23.10", "rustls-native-certs", "rustls-pki-types", @@ -1737,7 +1750,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -1754,9 +1767,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", - "hyper 1.4.1", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", @@ -1829,12 +1842,12 @@ checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951" [[package]] name = "indexmap" -version = "2.2.5" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", ] [[package]] @@ -1941,9 +1954,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libgit2-sys" @@ -2009,9 +2022,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -2082,9 +2095,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" +checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3" dependencies = [ "ahash 0.8.11", "portable-atomic", @@ -2092,13 +2105,13 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" +checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-rustls 0.27.2", "hyper-util", "indexmap", @@ -2113,15 +2126,14 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" +checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "metrics", - "num_cpus", "quanta", "sketches-ddsketch", ] @@ -2186,9 +2198,9 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" [[package]] name = "mockall" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" dependencies = [ "cfg-if", "downcast", @@ -2200,30 +2212,30 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "mockito" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d" +checksum = "652cd6d169a36eaf9d1e6bce1a221130439a966d7f27858af66a33a66e9c4ee2" dependencies = [ "assert-json-diff", "bytes", "colored", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "log", "rand", @@ -2371,9 +2383,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.4.2", "cfg-if", @@ -2392,7 +2404,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -2412,9 +2424,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2549,7 +2561,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -2604,7 +2616,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -2645,14 +2657,14 @@ checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" [[package]] name = "postgres-derive" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83145eba741b050ef981a9a1838c843fa7665e154383325aa8b440ae703180a2" +checksum = "69700ea4603c5ef32d447708e6a19cd3e8ac197a000842e97f527daea5e4175f" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -2688,9 +2700,9 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" +checksum = "f66ea23a2d0e5734297357705193335e0a957696f34bed2f2faefacb2fec336f" dependencies = [ "bytes", "fallible-iterator", @@ -2751,14 +2763,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2867,14 +2879,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -2888,13 +2900,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.5", ] [[package]] @@ -2905,9 +2917,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -2956,9 +2968,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -2966,10 +2978,10 @@ dependencies = [ "futures-core", "futures-util", "h2 0.4.2", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-rustls 0.27.2", "hyper-tls 0.6.0", "hyper-util", @@ -3131,9 +3143,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -3142,9 +3154,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.14.4" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce7d70c926fe472aed493b902010bccc17fa9f7284145cb8772fd22fdb052d8" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -3204,15 +3216,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3234,7 +3246,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "aws-lc-rs", - "log", "once_cell", "rustls-pki-types", "rustls-webpki 0.102.4", @@ -3417,22 +3428,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -3448,9 +3459,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -3574,9 +3585,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "sketches-ddsketch" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" +checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" [[package]] name = "slab" @@ -3662,7 +3673,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -3703,9 +3714,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -3780,9 +3791,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -3830,7 +3841,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -3845,9 +3856,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3866,9 +3877,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -3916,9 +3927,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -3940,7 +3951,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -3967,9 +3978,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" +checksum = "3b5d3742945bc7d7f210693b0c58ae542c6fd47b17adbbda0885f3dcb34a6bdb" dependencies = [ "async-trait", "byteorder", @@ -4061,21 +4072,23 @@ dependencies = [ "futures-util", "pin-project-lite", "sync_wrapper 0.1.2", + "tokio", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.4.2", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.0", "http-body-util", "http-range-header", @@ -4105,9 +4118,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -4117,20 +4130,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -4174,9 +4187,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -4184,9 +4197,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -4339,9 +4352,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unreachable" @@ -4417,9 +4430,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "serde", ] @@ -4500,7 +4513,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -4534,7 +4547,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4591,9 +4604,9 @@ dependencies = [ [[package]] name = "which" -version = "6.0.3" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b" dependencies = [ "either", "home", @@ -4857,9 +4870,9 @@ dependencies = [ "base64 0.22.1", "deadpool 0.10.0", "futures", - "http 1.1.0", + "http 1.2.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "log", "once_cell", @@ -4908,7 +4921,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] @@ -4928,34 +4941,33 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.90", ] [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 35715625..2850b42a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,80 +14,80 @@ members = [ version = "1.0.0" license = "Apache-2.0" edition = "2021" -rust-version = "1.81" +rust-version = "1.83" [workspace.dependencies] -anyhow = "1.0.88" -askalono = "0.4.6" +anyhow = "1.0.94" +askalono = "0.5.0" askama = "0.12.1" askama_axum = "0.4.0" -async-trait = "0.1.82" -axum = { version = "0.7.5", features = ["macros"] } +async-trait = "0.1.83" +axum = { version = "0.7.9", features = ["macros"] } bincode = "1.3.3" -cached = { version = "0.53.1", features = ["async"] } -clap = { version = "4.5.17", features = ["derive"] } +cached = { version = "0.54.0", features = ["async"] } +clap = { version = "4.5.23", features = ["derive"] } clomonitor-core = { path = "../clomonitor-core" } -comfy-table = "7.1.1" +comfy-table = "7.1.3" config = "0.13.4" deadpool = "0.12.1" deadpool-postgres = { version = "0.14.0", features = ["serde"] } -futures = "0.3.30" +futures = "0.3.31" git2 = "0.19.0" glob = "0.3.1" graphql_client = { version = "0.14.0", features = ["reqwest"] } hex = "0.4.3" -http = "1.1.0" -hyper = "1.4.1" +http = "1.2.0" +hyper = "1.5.1" lazy_static = "1.5.0" -metrics = "0.23.0" -metrics-exporter-prometheus = "0.15.3" +metrics = "0.24.1" +metrics-exporter-prometheus = "0.16.0" mime = "0.3.17" -mockall = "0.13.0" -mockito = "1.5.0" +mockall = "0.13.1" +mockito = "1.6.1" octorust = "0.3.2" -openssl = { version = "0.10.66", features = ["vendored"] } +openssl = { version = "0.10.68", features = ["vendored"] } postgres-openssl = "0.5.0" -postgres-types = { version = "0.2.7", features = ["derive"] } +postgres-types = { version = "0.2.8", features = ["derive"] } predicates = "3.1.2" -regex = "1.10.6" -reqwest = { version = "0.12.7", features = ["json"] } +regex = "1.11.1" +reqwest = { version = "0.12.9", features = ["json"] } resvg = "0.27.0" -serde = { version = "1.0.210", features = ["derive"] } -serde_json = "1.0.128" +serde = { version = "1.0.215", features = ["derive"] } +serde_json = "1.0.133" serde_yaml = "0.9.34" serde_qs = "0.13.0" sha2 = "0.10.8" -tempfile = "3.12.0" +tempfile = "3.14.0" tera = { version = "1.20.0", default-features = false } -time = { version = "0.3.36", features = [ +time = { version = "0.3.37", features = [ "formatting", "macros", "parsing", "serde", ] } tiny-skia = "0.8.4" -tokio = { version = "1.40.0", features = [ +tokio = { version = "1.42.0", features = [ "macros", "process", "rt-multi-thread", "signal", "time", ] } -tokio-postgres = { version = "0.7.11", features = [ +tokio-postgres = { version = "0.7.12", features = [ "with-time-0_3", "with-serde_json-1", "with-uuid-1", ] } tower = { version = "0.5.1", features = ["util"] } -tower-http = { version = "0.5.2", features = [ +tower-http = { version = "0.6.2", features = [ "auth", "fs", "set-header", "trace", ] } -tracing = "0.1.40" -tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] } +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] } usvg = "0.27.0" -uuid = { version = "1.10.0", features = ["serde"] } -which = "6.0.3" +uuid = { version = "1.11.0", features = ["serde"] } +which = "7.0.0" wiremock = "0.6.2" diff --git a/clomonitor-apiserver/Dockerfile b/clomonitor-apiserver/Dockerfile index 1638bc49..c0160082 100644 --- a/clomonitor-apiserver/Dockerfile +++ b/clomonitor-apiserver/Dockerfile @@ -1,5 +1,5 @@ # Build apiserver -FROM rust:1-alpine3.20 as builder +FROM rust:1-alpine3.21 as builder RUN apk --no-cache add musl-dev perl make WORKDIR /clomonitor COPY Cargo.* ./ @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-apiserver RUN cargo build --release # Build frontend -FROM node:18-alpine3.20 AS frontend-builder +FROM node:18-alpine3.21 AS frontend-builder RUN apk --no-cache add git WORKDIR /web COPY web . @@ -32,7 +32,7 @@ WORKDIR /docs/www RUN hugo # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk --no-cache add ca-certificates ttf-opensans && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor diff --git a/clomonitor-apiserver/src/filters.rs b/clomonitor-apiserver/src/filters.rs index 80b33406..8238a4e0 100644 --- a/clomonitor-apiserver/src/filters.rs +++ b/clomonitor-apiserver/src/filters.rs @@ -7,7 +7,7 @@ pub(crate) fn rating(score: &f64) -> askama::Result { /// Template filter that returns the rating letter corresponding to the score /// value provided. -#[allow(clippy::unnecessary_wraps)] +#[allow(clippy::unnecessary_wraps, clippy::ref_option)] pub(crate) fn rating_opt(score: &Option) -> askama::Result { Ok(match score { Some(v) => clomonitor_core::score::rating(*v).to_string(), @@ -28,7 +28,7 @@ pub(crate) fn round(v: &f64) -> askama::Result { } /// Template filter that returns the width of the section score bar. -#[allow(clippy::unnecessary_wraps)] +#[allow(clippy::unnecessary_wraps, clippy::ref_option)] pub(crate) fn rs_section_score_width(score: &Option) -> askama::Result { Ok(match score { Some(v) => { @@ -53,6 +53,7 @@ pub(crate) fn stroke(v: &f64) -> askama::Result { /// provided as a string. "n/a" is returned when the value is none. #[allow( clippy::unnecessary_wraps, + clippy::ref_option, clippy::cast_sign_loss, clippy::cast_possible_truncation )] diff --git a/clomonitor-archiver/Dockerfile b/clomonitor-archiver/Dockerfile index 95003e20..812f9b58 100644 --- a/clomonitor-archiver/Dockerfile +++ b/clomonitor-archiver/Dockerfile @@ -1,5 +1,5 @@ # Build archiver -FROM rust:1-alpine3.20 as builder +FROM rust:1-alpine3.21 as builder RUN apk --no-cache add musl-dev perl make WORKDIR /clomonitor COPY Cargo.* ./ @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-archiver RUN cargo build --release # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor diff --git a/clomonitor-linter/Dockerfile b/clomonitor-linter/Dockerfile index 9b4f9dde..54c94131 100644 --- a/clomonitor-linter/Dockerfile +++ b/clomonitor-linter/Dockerfile @@ -1,5 +1,5 @@ # Build linter -FROM rust:1-alpine3.20 as builder +FROM rust:1-alpine3.21 as builder RUN apk --no-cache add musl-dev perl make WORKDIR /clomonitor COPY Cargo.* ./ @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-linter RUN cargo build --release # Build OpenSSF scorecard -FROM golang:1.23.3-alpine3.20 AS scorecard +FROM golang:1.23.4-alpine3.21 AS scorecard WORKDIR /tmp RUN apk --no-cache add git make bash gcc musl-dev binutils-gold RUN git clone https://github.com/ossf/scorecard @@ -24,7 +24,7 @@ RUN make install RUN make build # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor diff --git a/clomonitor-linter/src/table.rs b/clomonitor-linter/src/table.rs index 092f771a..254645ce 100644 --- a/clomonitor-linter/src/table.rs +++ b/clomonitor-linter/src/table.rs @@ -71,43 +71,43 @@ pub(crate) fn display( .set_header(vec![cell_header("Check"), cell_header("Passed")]) .add_row(vec![ cell_entry("Documentation / Adopters"), - cell_check(&report.documentation.adopters), + cell_check(report.documentation.adopters.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Changelog"), - cell_check(&report.documentation.changelog), + cell_check(report.documentation.changelog.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Code of conduct"), - cell_check(&report.documentation.code_of_conduct), + cell_check(report.documentation.code_of_conduct.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Contributing"), - cell_check(&report.documentation.contributing), + cell_check(report.documentation.contributing.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Governance"), - cell_check(&report.documentation.governance), + cell_check(report.documentation.governance.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Maintainers"), - cell_check(&report.documentation.maintainers), + cell_check(report.documentation.maintainers.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Readme"), - cell_check(&report.documentation.readme), + cell_check(report.documentation.readme.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Roadmap"), - cell_check(&report.documentation.roadmap), + cell_check(report.documentation.roadmap.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Summary table"), - cell_check(&report.documentation.summary_table), + cell_check(report.documentation.summary_table.as_ref()), ]) .add_row(vec![ cell_entry("Documentation / Website"), - cell_check(&report.documentation.website), + cell_check(report.documentation.website.as_ref()), ]) .add_row(vec![ cell_entry("License"), @@ -123,95 +123,95 @@ pub(crate) fn display( ]) .add_row(vec![ cell_entry("License / Approved"), - cell_check(&report.license.license_approved), + cell_check(report.license.license_approved.as_ref()), ]) .add_row(vec![ cell_entry("License / Scanning"), - cell_check(&report.license.license_scanning), + cell_check(report.license.license_scanning.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / Artifact Hub badge"), - cell_check(&report.best_practices.artifacthub_badge), + cell_check(report.best_practices.artifacthub_badge.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / CLA"), - cell_check(&report.best_practices.cla), + cell_check(report.best_practices.cla.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / Community meeting"), - cell_check(&report.best_practices.community_meeting), + cell_check(report.best_practices.community_meeting.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / DCO"), - cell_check(&report.best_practices.dco), + cell_check(report.best_practices.dco.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / GitHub discussions"), - cell_check(&report.best_practices.github_discussions), + cell_check(report.best_practices.github_discussions.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / OpenSSF best practices badge"), - cell_check(&report.best_practices.openssf_badge), + cell_check(report.best_practices.openssf_badge.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / OpenSSF Scorecard badge"), - cell_check(&report.best_practices.openssf_scorecard_badge), + cell_check(report.best_practices.openssf_scorecard_badge.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / Recent release"), - cell_check(&report.best_practices.recent_release), + cell_check(report.best_practices.recent_release.as_ref()), ]) .add_row(vec![ cell_entry("Best practices / Slack presence"), - cell_check(&report.best_practices.slack_presence), + cell_check(report.best_practices.slack_presence.as_ref()), ]) .add_row(vec![ cell_entry("Security / Binary artifacts"), - cell_check(&report.security.binary_artifacts), + cell_check(report.security.binary_artifacts.as_ref()), ]) .add_row(vec![ cell_entry("Security / Code review"), - cell_check(&report.security.code_review), + cell_check(report.security.code_review.as_ref()), ]) .add_row(vec![ cell_entry("Security / Dangerous workflow"), - cell_check(&report.security.dangerous_workflow), + cell_check(report.security.dangerous_workflow.as_ref()), ]) .add_row(vec![ cell_entry("Security / Dependencies policy"), - cell_check(&report.security.dependencies_policy), + cell_check(report.security.dependencies_policy.as_ref()), ]) .add_row(vec![ cell_entry("Security / Dependency update tool"), - cell_check(&report.security.dependency_update_tool), + cell_check(report.security.dependency_update_tool.as_ref()), ]) .add_row(vec![ cell_entry("Security / Maintained"), - cell_check(&report.security.maintained), + cell_check(report.security.maintained.as_ref()), ]) .add_row(vec![ cell_entry("Security / SBOM"), - cell_check(&report.security.sbom), + cell_check(report.security.sbom.as_ref()), ]) .add_row(vec![ cell_entry("Security / Security insights"), - cell_check(&report.security.security_insights), + cell_check(report.security.security_insights.as_ref()), ]) .add_row(vec![ cell_entry("Security / Security policy"), - cell_check(&report.security.security_policy), + cell_check(report.security.security_policy.as_ref()), ]) .add_row(vec![ cell_entry("Security / Signed release"), - cell_check(&report.security.signed_releases), + cell_check(report.security.signed_releases.as_ref()), ]) .add_row(vec![ cell_entry("Security / Token permissions"), - cell_check(&report.security.token_permissions), + cell_check(report.security.token_permissions.as_ref()), ]) .add_row(vec![ cell_entry("Legal / Trademark disclaimer"), - cell_check(&report.legal.trademark_disclaimer), + cell_check(report.legal.trademark_disclaimer.as_ref()), ]); writeln!(w, "{checks_summary}\n")?; @@ -278,7 +278,7 @@ fn cell_score(score: Option) -> Cell { } /// Build a cell used for checks output. -fn cell_check(output: &Option>) -> Cell { +fn cell_check(output: Option<&CheckOutput>) -> Cell { let (content, color) = match output { Some(r) => match (r.passed, r.exempt, r.failed) { (true, _, _) => (SUCCESS_SYMBOL.to_string(), Color::Green), diff --git a/clomonitor-notifier/Dockerfile b/clomonitor-notifier/Dockerfile index af1b7883..4e76de99 100644 --- a/clomonitor-notifier/Dockerfile +++ b/clomonitor-notifier/Dockerfile @@ -1,5 +1,5 @@ # Build notifier -FROM rust:1-alpine3.20 as builder +FROM rust:1-alpine3.21 as builder RUN apk --no-cache add musl-dev perl make WORKDIR /clomonitor COPY Cargo.* ./ @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-notifier RUN cargo build --release # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor diff --git a/clomonitor-registrar/Dockerfile b/clomonitor-registrar/Dockerfile index 1f577855..f36c116d 100644 --- a/clomonitor-registrar/Dockerfile +++ b/clomonitor-registrar/Dockerfile @@ -1,5 +1,5 @@ # Build registrar -FROM rust:1-alpine3.20 as builder +FROM rust:1-alpine3.21 as builder RUN apk --no-cache add musl-dev perl make WORKDIR /clomonitor COPY Cargo.* ./ @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-registrar RUN cargo build --release # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor diff --git a/clomonitor-tracker/Dockerfile b/clomonitor-tracker/Dockerfile index d0d5037d..40597fa8 100644 --- a/clomonitor-tracker/Dockerfile +++ b/clomonitor-tracker/Dockerfile @@ -1,5 +1,5 @@ # Build tracker -FROM rust:1-alpine3.20 as builder +FROM rust:1-alpine3.21 as builder RUN apk --no-cache add musl-dev perl make WORKDIR /clomonitor COPY Cargo.* ./ @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-tracker RUN cargo build --release # Build OpenSSF scorecard -FROM golang:1.23.3-alpine3.20 AS scorecard +FROM golang:1.23.4-alpine3.21 AS scorecard WORKDIR /tmp RUN apk --no-cache add git make bash gcc musl-dev binutils-gold RUN git clone https://github.com/ossf/scorecard @@ -24,7 +24,7 @@ RUN make install RUN make build # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor diff --git a/database/migrations/Dockerfile b/database/migrations/Dockerfile index 9ba3f411..bfb90ef7 100644 --- a/database/migrations/Dockerfile +++ b/database/migrations/Dockerfile @@ -1,10 +1,10 @@ # Build tern -FROM golang:1.23.3-alpine3.20 AS tern +FROM golang:1.23.4-alpine3.21 AS tern RUN apk --no-cache add git RUN go install github.com/jackc/tern@latest # Build final image -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN addgroup -S clomonitor && adduser -S clomonitor -G clomonitor USER clomonitor WORKDIR /home/clomonitor