diff --git a/Cargo.lock b/Cargo.lock index 28f056033..b4a2966b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arc-swap" @@ -186,9 +186,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.10" +version = "1.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924" +checksum = "649316840239f4e58df0b7f620c428f5fababbbca2d504488c641534050bd141" dependencies = [ "aws-credential-types", "aws-runtime", @@ -197,7 +197,7 @@ dependencies = [ "aws-sdk-sts", "aws-smithy-async", "aws-smithy-http", - "aws-smithy-json 0.60.7", + "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", @@ -254,9 +254,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.4" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea" +checksum = "44f6f1124d6e19ab6daf7f2e615644305dc6cb2d706892a8a8c0b98db35de020" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -279,15 +279,15 @@ dependencies = [ [[package]] name = "aws-sdk-ec2" -version = "1.95.0" +version = "1.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "facb3c68b989b2a8f4b26c4c0d8c5558b3a5d5335839bf2963b3932997a166d0" +checksum = "e6f5ac33e9893f1c1e090a1f8a3c1796d4882cf0777eaf1d488158ed5533487b" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", - "aws-smithy-json 0.61.1", + "aws-smithy-json", "aws-smithy-query", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -303,15 +303,15 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.49.0" +version = "1.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4" +checksum = "cb25f7129c74d36afe33405af4517524df8f74b635af8c2c8e91c1552b8397b2" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", - "aws-smithy-json 0.60.7", + "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", @@ -325,15 +325,15 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.50.0" +version = "1.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee" +checksum = "d03a3d5ef14851625eafd89660a751776f938bf32f309308b20dcca41c44b568" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", - "aws-smithy-json 0.60.7", + "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", @@ -347,15 +347,15 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.50.0" +version = "1.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ada54e5f26ac246dc79727def52f7f8ed38915cb47781e2a72213957dc3a7d5" +checksum = "cf3a9f073ae3a53b54421503063dfb87ff1ea83b876f567d92e8b8d9942ba91b" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", - "aws-smithy-json 0.60.7", + "aws-smithy-json", "aws-smithy-query", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -393,9 +393,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +checksum = "427cb637d15d63d6f9aae26358e1c9a9c09d5aa490d64b09354c8217cfef0f28" dependencies = [ "futures-util", "pin-project-lite", @@ -422,15 +422,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-smithy-json" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" -dependencies = [ - "aws-smithy-types", -] - [[package]] name = "aws-smithy-json" version = "0.61.1" @@ -452,9 +443,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.4" +version = "1.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45" +checksum = "a05dd41a70fc74051758ee75b5c4db2c0ca070ed9229c3df50e9475cda1cb985" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -496,9 +487,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.9" +version = "1.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" +checksum = "38ddc9bd6c28aeb303477170ddd183760a956a03e083b3902a990238a7e3792d" dependencies = [ "base64-simd", "bytes", @@ -550,10 +541,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit 0.7.3", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.2", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", "axum-macros", "base64 0.22.1", "bytes", + "form_urlencoded", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -561,7 +579,7 @@ dependencies = [ "hyper 1.5.1", "hyper-util", "itoa", - "matchit", + "matchit 0.8.4", "memchr", "mime", "percent-encoding", @@ -575,7 +593,7 @@ dependencies = [ "sync_wrapper 1.0.2", "tokio", "tokio-tungstenite", - "tower 0.5.1", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -599,38 +617,55 @@ dependencies = [ "sync_wrapper 1.0.2", "tower-layer", "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", "tracing", ] [[package]] name = "axum-extra" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" +checksum = "460fc6f625a1f7705c6cf62d0d070794e94668988b1c38111baeec177c715f7b" dependencies = [ - "axum", - "axum-core", + "axum 0.8.1", + "axum-core 0.5.0", "bytes", - "fastrand", "futures-util", "headers", "http 1.1.0", "http-body 1.0.1", "http-body-util", "mime", - "multer", "pin-project-lite", "serde", - "tower 0.5.1", + "tower 0.5.2", "tower-layer", "tower-service", ] [[package]] name = "axum-macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" +checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", @@ -652,7 +687,7 @@ dependencies = [ "hyper 1.5.1", "hyper-util", "pin-project-lite", - "rustls 0.23.19", + "rustls 0.23.20", "rustls-pemfile 2.2.0", "rustls-pki-types", "tokio", @@ -820,7 +855,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror 2.0.6", + "thiserror 2.0.9", "tokio", "tokio-util", "tower-service", @@ -874,9 +909,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -1024,12 +1059,12 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -1475,7 +1510,7 @@ dependencies = [ name = "environment_file" version = "1.16.13" dependencies = [ - "thiserror 2.0.6", + "thiserror 2.0.9", ] [[package]] @@ -2060,7 +2095,7 @@ dependencies = [ "http 1.1.0", "hyper 1.5.1", "hyper-util", - "rustls 0.23.19", + "rustls 0.23.20", "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", @@ -2473,13 +2508,13 @@ dependencies = [ "futures", "mongo_indexed", "partial_derive2", - "reqwest 0.12.9", + "reqwest 0.12.12", "resolver_api", "serde", "serde_json", "serror", "strum", - "thiserror 2.0.6", + "thiserror 2.0.9", "tokio", "tokio-tungstenite", "tokio-util", @@ -2496,7 +2531,7 @@ dependencies = [ "async_timing_util", "aws-config", "aws-sdk-ec2", - "axum", + "axum 0.8.1", "axum-extra", "axum-server", "base64 0.22.1", @@ -2527,10 +2562,10 @@ dependencies = [ "periphery_client", "rand", "regex", - "reqwest 0.12.9", + "reqwest 0.12.12", "resolver_api", "response", - "rustls 0.23.19", + "rustls 0.23.20", "serde", "serde_json", "serde_yaml", @@ -2556,7 +2591,7 @@ version = "1.16.13" dependencies = [ "anyhow", "async_timing_util", - "axum", + "axum 0.8.1", "axum-server", "bollard", "cache", @@ -2576,7 +2611,7 @@ dependencies = [ "resolver_api", "response", "run_command", - "rustls 0.23.19", + "rustls 0.23.20", "serde", "serde_json", "serror", @@ -2697,6 +2732,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "md-5" version = "0.10.6" @@ -2850,23 +2891,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 1.1.0", - "httparse", - "memchr", - "mime", - "spin 0.9.8", - "version_check 0.9.5", -] - [[package]] name = "mungos" version = "1.1.0" @@ -3023,22 +3047,22 @@ dependencies = [ [[package]] name = "octorust" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a776c05d0cdd02480c12cf1484e0f3bf610eab717ba6fb2c51449b60c7a88f" +checksum = "84b68b0e407b85431ea87ee51b3d977c2490bb0601a8c251bc4c9ce567350334" dependencies = [ "async-recursion", "async-trait", "bytes", "chrono", - "http 0.2.12", + "http 1.1.0", "jsonwebtoken", "log", "mime", "parse_link_header", "pem", "percent-encoding", - "reqwest 0.11.27", + "reqwest 0.12.12", "reqwest-conditional-middleware", "reqwest-middleware", "reqwest-retry", @@ -3122,7 +3146,7 @@ dependencies = [ "bytes", "http 1.1.0", "opentelemetry", - "reqwest 0.12.9", + "reqwest 0.12.12", ] [[package]] @@ -3139,7 +3163,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost", - "reqwest 0.12.9", + "reqwest 0.12.12", "thiserror 1.0.69", "tokio", "tonic", @@ -3364,7 +3388,7 @@ version = "1.16.13" dependencies = [ "anyhow", "komodo_client", - "reqwest 0.12.9", + "reqwest 0.12.12", "resolver_api", "serde", "serde_json", @@ -3508,9 +3532,9 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.19", + "rustls 0.23.20", "socket2", - "thiserror 2.0.6", + "thiserror 2.0.9", "tokio", "tracing", ] @@ -3526,10 +3550,10 @@ dependencies = [ "rand", "ring 0.17.8", "rustc-hash 2.0.0", - "rustls 0.23.19", + "rustls 0.23.20", "rustls-pki-types", "slab", - "thiserror 2.0.6", + "thiserror 2.0.9", "tinyvec", "tracing", "web-time", @@ -3687,7 +3711,6 @@ dependencies = [ "js-sys", "log", "mime", - "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", @@ -3711,9 +3734,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", @@ -3732,11 +3755,12 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.19", + "rustls 0.23.20", "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -3747,6 +3771,7 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-rustls 0.26.0", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -3758,49 +3783,48 @@ dependencies = [ [[package]] name = "reqwest-conditional-middleware" -version = "0.2.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e50a2e70970896c99d1b8f20ddc30a70b30d3ac6e619a03a8353b64a49b277" +checksum = "f67ad7fdf5c0a015763fcd164bee294b13fb7b6f89f1b55961d40f00c3e32d6b" dependencies = [ "async-trait", - "reqwest 0.11.27", + "http 1.1.0", + "reqwest 0.12.12", "reqwest-middleware", - "task-local-extensions", ] [[package]] name = "reqwest-middleware" -version = "0.2.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" dependencies = [ "anyhow", "async-trait", - "http 0.2.12", - "reqwest 0.11.27", + "http 1.1.0", + "reqwest 0.12.12", "serde", - "task-local-extensions", "thiserror 1.0.69", + "tower-service", ] [[package]] name = "reqwest-retry" -version = "0.2.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6a11c05102e5bec712c0619b8c7b7eda8b21a558a0bd981ceee15c38df8be4" +checksum = "29c73e4195a6bfbcb174b790d9b3407ab90646976c55de58a6515da25d851178" dependencies = [ "anyhow", "async-trait", - "chrono", "futures", "getrandom", - "http 0.2.12", - "hyper 0.14.31", + "http 1.1.0", + "hyper 1.5.1", "parking_lot 0.11.2", - "reqwest 0.11.27", + "reqwest 0.12.12", "reqwest-middleware", "retry-policies", - "task-local-extensions", + "thiserror 1.0.69", "tokio", "tracing", "wasm-timer", @@ -3808,17 +3832,17 @@ dependencies = [ [[package]] name = "reqwest-tracing" -version = "0.4.8" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683" +checksum = "73e6153390585f6961341b50e5a1931d6be6dee4292283635903c26ef9d980d2" dependencies = [ "anyhow", "async-trait", "getrandom", - "matchit", - "reqwest 0.11.27", + "http 1.1.0", + "matchit 0.8.4", + "reqwest 0.12.12", "reqwest-middleware", - "task-local-extensions", "tracing", ] @@ -3857,7 +3881,7 @@ name = "response" version = "1.16.13" dependencies = [ "anyhow", - "axum", + "axum 0.8.1", "serde", "serde_json", "serror", @@ -3865,12 +3889,10 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.1.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bbcb5003282bcb688f0bae741b278e9c7e8f378f561522c9806c58e075d9b" +checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c" dependencies = [ - "anyhow", - "chrono", "rand", ] @@ -4007,9 +4029,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "aws-lc-rs", "log", @@ -4217,9 +4239,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -4245,9 +4267,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -4267,9 +4289,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "indexmap 2.6.0", "itoa", @@ -4374,12 +4396,12 @@ dependencies = [ [[package]] name = "serror" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47348b77230bc82d8c6f6452df44988f73e42a3bd68098c6236fcd656605b5e6" +checksum = "2b4167e91cc6ad0f816a0a9297ec203813d426a647c73448b2dad80239e615de" dependencies = [ "anyhow", - "axum", + "axum 0.8.1", "serde", "serde_json", ] @@ -4479,7 +4501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7351d61890f030c76e0bebcc203befb73a84cf1888db96597d2f1f6144b693" dependencies = [ "anyhow", - "reqwest 0.12.9", + "reqwest 0.12.12", "serde", "serde_derive", "serde_json", @@ -4635,9 +4657,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.33.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" dependencies = [ "core-foundation-sys", "libc", @@ -4701,15 +4723,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -4721,11 +4734,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.6" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.6", + "thiserror-impl 2.0.9", ] [[package]] @@ -4741,9 +4754,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.6" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", @@ -4861,7 +4874,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.19", + "rustls 0.23.20", "rustls-pki-types", "tokio", ] @@ -4879,9 +4892,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.24.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a" dependencies = [ "futures-util", "log", @@ -4957,7 +4970,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64 0.22.1", "bytes", "h2 0.4.7", @@ -5004,14 +5017,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.2", "tokio", "tower-layer", "tower-service", @@ -5152,9 +5165,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.24.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24" dependencies = [ "byteorder", "bytes", @@ -5164,7 +5177,7 @@ dependencies = [ "log", "rand", "sha1", - "thiserror 1.0.69", + "thiserror 2.0.9", "utf-8", ] @@ -5491,7 +5504,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9b0540e91e49de3817c314da0dd3bc518093ceacc6ea5327cb0e1eb073e5189" dependencies = [ - "thiserror 2.0.6", + "thiserror 2.0.9", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 43e9bc168..f9541611c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ git = { path = "lib/git" } # MOGH run_command = { version = "0.0.6", features = ["async_tokio"] } -serror = { version = "0.4.8", default-features = false } +serror = { version = "0.5.0", default-features = false } slack = { version = "0.3.0", package = "slack_client_rs", default-features = false, features = ["rustls"] } derive_default_builder = "0.1.8" derive_empty_traits = "0.1.0" @@ -44,30 +44,30 @@ mungos = "1.1.0" svi = "1.0.1" # ASYNC -reqwest = { version = "0.12.9", default-features = false, features = ["json", "rustls-tls"] } +reqwest = { version = "0.12.12", default-features = false, features = ["json", "rustls-tls"] } tokio = { version = "1.42.0", features = ["full"] } tokio-util = "0.7.13" futures = "0.3.31" futures-util = "0.3.31" # SERVER -axum-extra = { version = "0.9.6", features = ["typed-header"] } +axum-extra = { version = "0.10.0", features = ["typed-header"] } tower-http = { version = "0.6.2", features = ["fs", "cors"] } axum-server = { version = "0.7.1", features = ["tls-rustls"] } -axum = { version = "0.7.9", features = ["ws", "json"] } -tokio-tungstenite = "0.24.0" +axum = { version = "0.8.1", features = ["ws", "json", "macros"] } +tokio-tungstenite = "0.26.1" # SER/DE ordered_hash_map = { version = "0.4.0", features = ["serde"] } -serde = { version = "1.0.215", features = ["derive"] } +serde = { version = "1.0.217", features = ["derive"] } strum = { version = "0.26.3", features = ["derive"] } -serde_json = "1.0.133" +serde_json = "1.0.134" serde_yaml = "0.9.34" toml = "0.8.19" # ERROR -anyhow = "1.0.94" -thiserror = "2.0.6" +anyhow = "1.0.95" +thiserror = "2.0.9" # LOGGING opentelemetry-otlp = { version = "0.27.0", features = ["tls-roots", "reqwest-rustls"] } @@ -90,7 +90,7 @@ urlencoding = "2.1.3" nom_pem = "4.0.0" bcrypt = "0.16.0" base64 = "0.22.1" -rustls = "0.23.19" +rustls = "0.23.20" hmac = "0.12.1" sha2 = "0.10.8" rand = "0.8.5" @@ -99,18 +99,18 @@ hex = "0.4.3" # SYSTEM bollard = "0.18.1" -sysinfo = "0.33.0" +sysinfo = "0.33.1" # CLOUD -aws-config = "1.5.10" -aws-sdk-ec2 = "1.95.0" +aws-config = "1.5.12" +aws-sdk-ec2 = "1.99.0" # MISC derive_builder = "0.20.2" typeshare = "1.0.4" -octorust = "0.7.0" +octorust = "0.9.0" dashmap = "6.1.0" wildcard = "0.3.0" -colored = "2.1.0" +colored = "2.2.0" regex = "1.11.1" bson = "2.13.0" diff --git a/bin/core/src/ts_client.rs b/bin/core/src/ts_client.rs index 8eedb9e0c..7f15092ce 100644 --- a/bin/core/src/ts_client.rs +++ b/bin/core/src/ts_client.rs @@ -30,6 +30,7 @@ struct FilePath { path: String, } +#[axum::debug_handler] async fn serve_client_file( Path(FilePath { path }): Path, ) -> serror::Result<(HeaderMap, String)> { diff --git a/bin/core/src/ws.rs b/bin/core/src/ws.rs index cc3998f3f..8d48ecf96 100644 --- a/bin/core/src/ws.rs +++ b/bin/core/src/ws.rs @@ -62,7 +62,7 @@ async fn ws_handler(ws: WebSocketUpgrade) -> impl IntoResponse { let user = match user { Err(e) => { let _ = ws_sender - .send(Message::Text(json!({ "type": "INVALID_USER", "msg": serialize_error(&e) }).to_string())) + .send(Message::text(json!({ "type": "INVALID_USER", "msg": serialize_error(&e) }).to_string())) .await; let _ = ws_sender.close().await; return; @@ -73,7 +73,7 @@ async fn ws_handler(ws: WebSocketUpgrade) -> impl IntoResponse { // Only send if user has permission on the target resource. if user_can_see_update(&user, &update.target).await.is_ok() { let _ = ws_sender - .send(Message::Text(serde_json::to_string(&update).unwrap())) + .send(Message::text(serde_json::to_string(&update).unwrap())) .await; } } @@ -103,7 +103,9 @@ async fn ws_login( mut socket: WebSocket, ) -> Option<(WebSocket, User)> { let login_msg = match socket.recv().await { - Some(Ok(Message::Text(login_msg))) => LoginMessage::Ok(login_msg), + Some(Ok(Message::Text(login_msg))) => { + LoginMessage::Ok(login_msg.to_string()) + } Some(Ok(msg)) => { LoginMessage::Err(format!("invalid login message: {msg:?}")) } @@ -117,7 +119,7 @@ async fn ws_login( let login_msg = match login_msg { LoginMessage::Ok(login_msg) => login_msg, LoginMessage::Err(msg) => { - let _ = socket.send(Message::Text(msg)).await; + let _ = socket.send(Message::text(msg)).await; let _ = socket.close().await; return None; } @@ -127,13 +129,12 @@ async fn ws_login( Ok(WsLoginMessage::Jwt { jwt }) => { match auth_jwt_check_enabled(&jwt).await { Ok(user) => { - let _ = - socket.send(Message::Text("LOGGED_IN".to_string())).await; + let _ = socket.send(Message::text("LOGGED_IN")).await; Some((socket, user)) } Err(e) => { let _ = socket - .send(Message::Text(format!( + .send(Message::text(format!( "failed to authenticate user using jwt | {e:#}" ))) .await; @@ -146,13 +147,12 @@ async fn ws_login( Ok(WsLoginMessage::ApiKeys { key, secret }) => { match auth_api_key_check_enabled(&key, &secret).await { Ok(user) => { - let _ = - socket.send(Message::Text("LOGGED_IN".to_string())).await; + let _ = socket.send(Message::text("LOGGED_IN")).await; Some((socket, user)) } Err(e) => { let _ = socket - .send(Message::Text(format!( + .send(Message::text(format!( "failed to authenticate user using api keys | {e:#}" ))) .await; @@ -163,7 +163,7 @@ async fn ws_login( } Err(e) => { let _ = socket - .send(Message::Text(format!( + .send(Message::text(format!( "failed to parse login message: {e:#}" ))) .await; diff --git a/client/core/rs/src/ws.rs b/client/core/rs/src/ws.rs index b374611d5..cf7d9cd53 100644 --- a/client/core/rs/src/ws.rs +++ b/client/core/rs/src/ws.rs @@ -137,7 +137,7 @@ impl KomodoClient { // SEND LOGIN MSG // ================== let login_send_res = ws - .send(Message::Text(login_msg.clone())) + .send(Message::text(&login_msg)) .await .context("failed to send login message"); @@ -157,7 +157,7 @@ impl KomodoClient { Ok(Some(Message::Text(msg))) => { if msg != "LOGGED_IN" { let _ = tx.send(UpdateWsMessage::Error( - UpdateWsError::LoginError(msg.clone()), + UpdateWsError::LoginError(msg.to_string()), )); let _ = ws.close(None).await; warn!("breaking inner loop | got msg {msg} instead of 'LOGGED_IN' | inner uuid {inner_uuid} | outer uuid {outer_uuid} | master uuid {master_uuid}"); @@ -227,7 +227,7 @@ impl KomodoClient { "got unrecognized message: {msg:?} | inner uuid {inner_uuid} | outer uuid {outer_uuid} | master uuid {master_uuid}" ); let _ = tx.send(UpdateWsMessage::Error( - UpdateWsError::MessageUnrecognized(msg), + UpdateWsError::MessageUnrecognized(msg.to_string()), )); } }