From 73fbb9213782638e2b12fc34c6f61f902c21fb06 Mon Sep 17 00:00:00 2001 From: starrysky Date: Wed, 10 Jun 2026 11:17:06 +0800 Subject: [PATCH 1/2] chore: remove unused devtools and rest_api crates - Remove src/devtools crate and all its files - Remove src/rest_api crate and all its files - Update Cargo.toml workspace members - Remove proxy-related components from cluster_mgr - Update build scripts accordingly --- Cargo.lock | 3123 +++++++++-------- Cargo.toml | 2 +- scripts/build-release-tarball.sh | 3 +- src/cluster_mgr/config/deployment_sqlite.sql | 8 - src/cluster_mgr/src/cli/cmd_base.rs | 218 +- src/cluster_mgr/src/cli/mod.rs | 78 - src/cluster_mgr/src/cli/task/check_task.rs | 5 - src/cluster_mgr/src/cli/task/download_task.rs | 40 +- .../cli/task/eloq_store_data_clean_task.rs | 1 - .../src/cli/task/group/log_srv_ctl_group.rs | 1 - src/cluster_mgr/src/cli/task/group/mod.rs | 13 - .../src/cli/task/group/monitor_ctl_group.rs | 1 - .../src/cli/task/group/proxy_ctl_group.rs | 193 - .../src/cli/task/group/remove_group.rs | 6 +- .../src/cli/task/group/update_config_group.rs | 1 - src/cluster_mgr/src/cli/task/mod.rs | 1 - .../src/cli/task/proxy_ctl_task.rs | 363 -- .../src/cli/task/task_controller.rs | 1 - src/cluster_mgr/src/cli/task/upload/mod.rs | 1 - .../cli/task/upload/proxy_upload_builder.rs | 136 - .../cli/task/upload/tx_conf_upload_builder.rs | 1 - .../cli/task/upload/upload_task_builder.rs | 9 +- src/cluster_mgr/src/config/config_base.rs | 1 - src/cluster_mgr/src/config/deployment.rs | 3 - src/cluster_mgr/src/config/mod.rs | 9 - .../src/config/proxy_config_base.rs | 139 - src/cluster_mgr/src/config/proxy_service.rs | 27 - .../src/config/storage_service_config.rs | 4 +- src/cluster_mgr/src/state/mod.rs | 1 - src/cluster_mgr/src/state/proxy_operation.rs | 40 - src/cluster_mgr/src/state/state_mgr.rs | 45 - src/devtools/Cargo.toml | 25 - src/devtools/config/cassandra.toml | 8 - src/devtools/config/common-template.toml | 56 - src/devtools/config/common.toml | 104 - src/devtools/config/deps/darwin | 13 - src/devtools/config/deps/ubuntu | 26 - src/devtools/config/mysql/init.sql | 8 - src/devtools/config/mysql/mysql_template.cnf | 17 - src/devtools/src/cmd/base.rs | 239 -- src/devtools/src/cmd/check_mysql_status.rs | 134 - src/devtools/src/cmd/check_user_exists.rs | 67 - src/devtools/src/cmd/cmd_const.rs | 64 - src/devtools/src/cmd/cmd_macro.rs | 225 -- src/devtools/src/cmd/cmd_runner.rs | 112 - src/devtools/src/cmd/cmd_utils.rs | 427 --- src/devtools/src/cmd/ctl_mysql_process.rs | 179 - src/devtools/src/cmd/download_third_party.rs | 189 - src/devtools/src/cmd/exec_init_sql_script.rs | 72 - src/devtools/src/cmd/gen_mysql_cnf.rs | 135 - src/devtools/src/cmd/git_clone_source.rs | 80 - src/devtools/src/cmd/init_db.rs | 53 - src/devtools/src/cmd/install_deps.rs | 67 - src/devtools/src/cmd/install_dev_deps.rs | 38 - src/devtools/src/cmd/mod.rs | 18 - src/devtools/src/cmd/mysql_ctl_util.rs | 96 - src/devtools/src/cmd/playground.rs | 65 - src/devtools/src/cmd/setup_workspace.rs | 57 - src/devtools/src/config/common.rs | 81 - src/devtools/src/config/config_macro.rs | 126 - src/devtools/src/config/mod.rs | 134 - src/devtools/src/lib.rs | 5 - src/devtools/src/main.rs | 48 - src/devtools/src/term.rs | 114 - src/rest_api/Cargo.toml | 38 - src/rest_api/src/global_handler.rs | 77 - src/rest_api/src/handler.rs | 274 -- src/rest_api/src/lib.rs | 91 - src/rest_api/src/main.rs | 22 - src/rest_api/src/server.rs | 80 - 70 files changed, 1732 insertions(+), 6406 deletions(-) delete mode 100644 src/cluster_mgr/src/cli/task/group/proxy_ctl_group.rs delete mode 100644 src/cluster_mgr/src/cli/task/proxy_ctl_task.rs delete mode 100644 src/cluster_mgr/src/cli/task/upload/proxy_upload_builder.rs delete mode 100644 src/cluster_mgr/src/config/proxy_config_base.rs delete mode 100644 src/cluster_mgr/src/config/proxy_service.rs delete mode 100644 src/cluster_mgr/src/state/proxy_operation.rs delete mode 100644 src/devtools/Cargo.toml delete mode 100644 src/devtools/config/cassandra.toml delete mode 100644 src/devtools/config/common-template.toml delete mode 100644 src/devtools/config/common.toml delete mode 100644 src/devtools/config/deps/darwin delete mode 100644 src/devtools/config/deps/ubuntu delete mode 100644 src/devtools/config/mysql/init.sql delete mode 100644 src/devtools/config/mysql/mysql_template.cnf delete mode 100644 src/devtools/src/cmd/base.rs delete mode 100644 src/devtools/src/cmd/check_mysql_status.rs delete mode 100644 src/devtools/src/cmd/check_user_exists.rs delete mode 100644 src/devtools/src/cmd/cmd_const.rs delete mode 100644 src/devtools/src/cmd/cmd_macro.rs delete mode 100644 src/devtools/src/cmd/cmd_runner.rs delete mode 100644 src/devtools/src/cmd/cmd_utils.rs delete mode 100644 src/devtools/src/cmd/ctl_mysql_process.rs delete mode 100644 src/devtools/src/cmd/download_third_party.rs delete mode 100644 src/devtools/src/cmd/exec_init_sql_script.rs delete mode 100644 src/devtools/src/cmd/gen_mysql_cnf.rs delete mode 100644 src/devtools/src/cmd/git_clone_source.rs delete mode 100644 src/devtools/src/cmd/init_db.rs delete mode 100644 src/devtools/src/cmd/install_deps.rs delete mode 100644 src/devtools/src/cmd/install_dev_deps.rs delete mode 100644 src/devtools/src/cmd/mod.rs delete mode 100644 src/devtools/src/cmd/mysql_ctl_util.rs delete mode 100644 src/devtools/src/cmd/playground.rs delete mode 100644 src/devtools/src/cmd/setup_workspace.rs delete mode 100644 src/devtools/src/config/common.rs delete mode 100644 src/devtools/src/config/config_macro.rs delete mode 100644 src/devtools/src/config/mod.rs delete mode 100644 src/devtools/src/lib.rs delete mode 100644 src/devtools/src/main.rs delete mode 100644 src/devtools/src/term.rs delete mode 100644 src/rest_api/Cargo.toml delete mode 100644 src/rest_api/src/global_handler.rs delete mode 100644 src/rest_api/src/handler.rs delete mode 100644 src/rest_api/src/lib.rs delete mode 100644 src/rest_api/src/main.rs delete mode 100644 src/rest_api/src/server.rs diff --git a/Cargo.lock b/Cargo.lock index ea52f97a..fd8fa9f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,203 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "actix-codec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "futures-core", - "futures-sink", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "actix-http" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "ahash", - "base64 0.22.1", - "bitflags 2.6.0", - "brotli", - "bytes", - "bytestring", - "derive_more", - "encoding_rs", - "flate2", - "futures-core", - "h2", - "http 0.2.12", - "httparse", - "httpdate", - "itoa", - "language-tags", - "local-channel", - "mime", - "percent-encoding", - "pin-project-lite", - "rand 0.8.5", - "sha1", - "smallvec", - "tokio", - "tokio-util", - "tracing", - "zstd", -] - -[[package]] -name = "actix-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" -dependencies = [ - "quote", - "syn 2.0.87", -] - -[[package]] -name = "actix-router" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" -dependencies = [ - "bytestring", - "cfg-if", - "http 0.2.12", - "regex", - "regex-lite", - "serde", - "tracing", -] - -[[package]] -name = "actix-rt" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" -dependencies = [ - "futures-core", - "tokio", -] - -[[package]] -name = "actix-server" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "futures-util", - "mio", - "socket2 0.5.7", - "tokio", - "tracing", -] - -[[package]] -name = "actix-service" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" -dependencies = [ - "futures-core", - "paste", - "pin-project-lite", -] - -[[package]] -name = "actix-utils" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" -dependencies = [ - "local-waker", - "pin-project-lite", -] - -[[package]] -name = "actix-web" -version = "4.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" -dependencies = [ - "actix-codec", - "actix-http", - "actix-macros", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-utils", - "actix-web-codegen", - "ahash", - "bytes", - "bytestring", - "cfg-if", - "cookie", - "derive_more", - "encoding_rs", - "futures-core", - "futures-util", - "itoa", - "language-tags", - "log", - "mime", - "once_cell", - "pin-project-lite", - "regex", - "regex-lite", - "serde", - "serde_json", - "serde_urlencoded", - "smallvec", - "socket2 0.5.7", - "time", - "url", -] - -[[package]] -name = "actix-web-codegen" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" -dependencies = [ - "actix-router", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.1" @@ -211,7 +14,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array", ] @@ -223,7 +26,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -242,12 +45,12 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.2.15", + "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -255,39 +58,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" @@ -300,9 +82,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -321,37 +103,38 @@ checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "once_cell_polyfill", + "windows-sys 0.61.2", ] [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "arbitrary" @@ -362,15 +145,24 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arc-swap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207" +dependencies = [ + "rustversion", +] + [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -382,17 +174,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" -version = "1.3.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-config" -version = "1.5.11" +version = "1.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d1c2c88936a73c699225d0bc00684a534166b0cebc2659c3cdf08de8edc64c" +checksum = "e33f815b73a3899c03b380d543532e5865f230dce9678d108dc10732a8682275" dependencies = [ "aws-credential-types", "aws-runtime", @@ -404,13 +202,14 @@ dependencies = [ "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "aws-types", "bytes", "fastrand", "hex", - "http 0.2.12", - "ring", + "http 1.4.2", + "sha1 0.10.6", "time", "tokio", "tracing", @@ -420,9 +219,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.1" +version = "1.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" +checksum = "8f20799b373a1be121fe3005fba0c2090af9411573878f224df44b42727fcaf7" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -430,11 +229,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "aws-lc-rs" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + [[package]] name = "aws-runtime" -version = "1.5.4" +version = "1.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee7643696e7fdd74c10f9eb42848a87fe469d35eae9c3323f80aa98f350baac" +checksum = "77ed8e8c52d2dc2390ad9f15647fe663f71e9780b4262c190fbb823a32721566" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -446,10 +267,12 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", + "bytes-utils", "fastrand", "http 0.2.12", + "http 1.4.2", "http-body 0.4.6", - "once_cell", + "http-body 1.0.1", "percent-encoding", "pin-project-lite", "tracing", @@ -458,10 +281,11 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.72.0" +version = "1.135.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7ce6d85596c4bcb3aba8ad5bb134b08e204c8a475c9999c1af9290f80aa8ad" +checksum = "f97e3e7e7d86fd26fcdc18bc382da5ca9e8b2ff8d54030d187fd0dac8a236d96" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-sigv4", @@ -470,6 +294,7 @@ dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-json", + "aws-smithy-observability", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", @@ -478,90 +303,99 @@ dependencies = [ "bytes", "fastrand", "hex", - "hmac", + "hmac 0.13.0", "http 0.2.12", - "http-body 0.4.6", + "http 1.4.2", + "http-body 1.0.1", "lru", - "once_cell", "percent-encoding", "regex-lite", - "sha2", + "sha2 0.11.0", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "1.57.0" +version = "1.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54bab121fe1881a74c338c5f723d1592bf3b53167f80268a1274f404e1acc38" +checksum = "b647baea49ff551960b904f905681e9b4765a6c4ea08631e89dc52d8bd3f5896" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", "aws-smithy-json", + "aws-smithy-observability", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", + "fastrand", "http 0.2.12", - "once_cell", + "http 1.4.2", "regex-lite", "tracing", ] [[package]] name = "aws-sdk-ssooidc" -version = "1.58.0" +version = "1.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8234fd024f7ac61c4e44ea008029bde934250f371efe7d4a39708397b1080c" +checksum = "7ae401c65ff288aa7873117fe535cd32b7b1bb0bc43751d28901a1d5f20636b9" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", "aws-smithy-json", + "aws-smithy-observability", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", + "fastrand", "http 0.2.12", - "once_cell", + "http 1.4.2", "regex-lite", "tracing", ] [[package]] name = "aws-sdk-sts" -version = "1.58.0" +version = "1.106.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba60e1d519d6f23a9df712c04fdeadd7872ac911c84b2f62a8bda92e129b7962" +checksum = "4c80de7bb7d03e9ca8c9fd7b489f20f3948d3f3be91a7953591347d238115408" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-smithy-async", "aws-smithy-http", "aws-smithy-json", + "aws-smithy-observability", "aws-smithy-query", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", + "fastrand", "http 0.2.12", - "once_cell", + "http 1.4.2", "regex-lite", "tracing", ] [[package]] name = "aws-sigv4" -version = "1.2.9" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe75fad52793ce6dec0dc3d4b1f388f038b5eb866c8d4d7f3a8e21b5ea5051" +checksum = "bae38512beae0ffee7010fc24e7a8a123c53efdfef42a61e80fda4882418dc71" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -569,17 +403,15 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "crypto-bigint 0.5.5", + "crypto-bigint", "form_urlencoded", "hex", - "hmac", + "hmac 0.13.0", "http 0.2.12", - "http 1.3.1", - "once_cell", - "p256 0.11.1", + "http 1.4.2", + "p256", "percent-encoding", - "ring", - "sha2", + "sha2 0.11.0", "subtle", "time", "tracing", @@ -588,9 +420,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.4" +version = "1.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa59d1327d8b5053c54bf2eaae63bf629ba9e904434d0835a28ed3c0ed0a614e" +checksum = "2ffcaf626bdda484571968400c326a244598634dc75fd451325a54ad1a59acfc" dependencies = [ "futures-util", "pin-project-lite", @@ -599,31 +431,30 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.62.0" +version = "0.64.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f45a1c384d7a393026bc5f5c177105aa9fa68e4749653b985707ac27d77295" +checksum = "e9e8e65f4f81fcccdeb6c3eca2af17ac21d421a1786a26a394aecf421d616d3a" dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "crc32c", - "crc32fast", - "crc64fast-nvme", + "crc-fast", "hex", - "http 0.2.12", - "http-body 0.4.6", - "md-5", + "http 1.4.2", + "http-body 1.0.1", + "http-body-util", + "md-5 0.11.0", "pin-project-lite", - "sha1", - "sha2", + "sha1 0.11.0", + "sha2 0.11.0", "tracing", ] [[package]] name = "aws-smithy-eventstream" -version = "0.60.7" +version = "0.60.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461e5e02f9864cba17cff30f007c2e37ade94d01e87cdb5204e44a84e6d38c17" +checksum = "faf09d74e5e32f76b8762da505a3cd59303e367a664ca67295387baa8c1d7548" dependencies = [ "aws-smithy-types", "bytes", @@ -632,9 +463,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.12" +version = "0.63.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc" +checksum = "ba1ab2dc1c2c3749ead27180d333c42f11be8b0e934058fb4b2258ee8dbe5231" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -642,29 +473,71 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", + "futures-util", + "http 1.4.2", + "http-body 1.0.1", + "http-body-util", "percent-encoding", "pin-project-lite", "pin-utils", "tracing", ] +[[package]] +name = "aws-smithy-http-client" +version = "1.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3ef8931ad1c98aa6a55b4256f847f3116090819844e0dd41ea682cac5dd2d3" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "h2 0.3.27", + "h2 0.4.14", + "http 0.2.12", + "http 1.4.2", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper 1.10.1", + "hyper-rustls 0.24.2", + "hyper-rustls 0.27.9", + "hyper-util", + "pin-project-lite", + "rustls 0.21.12", + "rustls 0.23.40", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.4", + "tower 0.5.3", + "tracing", +] + [[package]] name = "aws-smithy-json" -version = "0.61.2" +version = "0.62.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623a51127f24c30776c8b374295f2df78d92517386f77ba30773f15a30ce1422" +checksum = "701a947f4797e52a911e114a898667c746c39feea467bbd1abd7b3721f702ffa" dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", ] +[[package]] +name = "aws-smithy-observability" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06c2315d173edbf1920da8ba3a7189695827002e4c0fc961973ab1c54abca9c" +dependencies = [ + "aws-smithy-runtime-api", +] + [[package]] name = "aws-smithy-query" -version = "0.60.7" +version = "0.60.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" +checksum = "1a56d79744fb3edb5d722ef79d86081e121d3b9422cb209eb03aea6aa4f21ebd" dependencies = [ "aws-smithy-types", "urlencoding", @@ -672,60 +545,82 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.7" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865f7050bbc7107a6c98a397a9fcd9413690c27fa718446967cf03b2d3ac517e" +checksum = "b8e6f5caf6fea86f8c2206541ab5857cfcda9013426cdbe8fa0098b9e2d32182" dependencies = [ "aws-smithy-async", "aws-smithy-http", + "aws-smithy-http-client", + "aws-smithy-observability", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "bytes", "fastrand", - "h2", "http 0.2.12", + "http 1.4.2", "http-body 0.4.6", "http-body 1.0.1", - "httparse", - "hyper", - "hyper-rustls", - "once_cell", + "http-body-util", "pin-project-lite", "pin-utils", - "rustls", "tokio", "tracing", ] [[package]] name = "aws-smithy-runtime-api" -version = "1.7.3" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" +checksum = "9db177daa6ba8afb9ee1aefcf548c907abcf52065e394ee11a92780057fe0e8c" dependencies = [ "aws-smithy-async", + "aws-smithy-runtime-api-macros", "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.3.1", + "http 1.4.2", "pin-project-lite", "tokio", "tracing", "zeroize", ] +[[package]] +name = "aws-smithy-runtime-api-macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7396fd9500589e62e460e987ecb671bad374934e55ec3b5f498cc7a8a8a7b7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "aws-smithy-schema" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7442cb268338f0eb8278140a107c046756aa01093d8ef5e99628d34ae09c94f5" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "http 1.4.2", +] + [[package]] name = "aws-smithy-types" -version = "1.2.13" +version = "1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b8a53819e42f10d0821f56da995e1470b199686a1809168db6ca485665f042" +checksum = "53f93074121a1be41317b9aa607143ae17900631f7f59a99f2b905d519d6783b" dependencies = [ "base64-simd", "bytes", "bytes-utils", "futures-core", "http 0.2.12", - "http 1.3.1", + "http 1.4.2", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -742,22 +637,23 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.12" +version = "0.60.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab77cdd036b11056d2a30a7af7b775789fb024bf216acc13884c6c97752ae56" +checksum = "0ce02add1aa3677d022f8adf81dcbe3046a95f17a1b1e8979c145cd21d3d22b3" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.3.5" +version = "1.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbd0a668309ec1f66c0f6bda4840dd6d4796ae26d699ebc266d7cc95c6d040f" +checksum = "d16bf10b03a3c01e6b3b7d47cd964e873ffe9e7d4e80fad16bd4c077cb068531" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "rustc_version", "tracing", @@ -776,7 +672,7 @@ dependencies = [ "futures-util", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.32", "itoa", "matchit", "memchr", @@ -786,7 +682,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -808,27 +704,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.7.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" @@ -859,9 +734,9 @@ dependencies = [ [[package]] name = "base64ct" -version = "1.6.0" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bcrypt-pbkdf" @@ -871,7 +746,7 @@ checksum = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2" dependencies = [ "blowfish", "pbkdf2 0.12.2", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -888,11 +763,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -904,6 +779,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + [[package]] name = "block-padding" version = "0.3.3" @@ -923,27 +807,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - [[package]] name = "bumpalo" version = "3.20.3" @@ -952,9 +815,9 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytecount" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" +checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" [[package]] name = "byteorder" @@ -964,9 +827,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "bytes-utils" @@ -978,15 +841,6 @@ dependencies = [ "either", ] -[[package]] -name = "bytestring" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" -dependencies = [ - "bytes", -] - [[package]] name = "cbc" version = "0.1.2" @@ -998,9 +852,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.44" +version = "1.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f" dependencies = [ "find-msvc-tools", "jobserver", @@ -1010,9 +864,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chacha20" @@ -1022,22 +876,32 @@ checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.17", +] + +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", ] [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -1046,15 +910,15 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "inout", ] [[package]] name = "clap" -version = "4.5.60" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -1062,9 +926,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.60" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", @@ -1074,23 +938,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.6.2" +version = "4.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff7a1dccbdd8b078c2bdebff47e404615151534d5043da397ec50286816f9cb" +checksum = "e0a7a9bfdb35811f9e59832f0f05975114d2251b415fb534108e6f34060fd772" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.55" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -1119,7 +983,7 @@ dependencies = [ "futures", "futures-async-stream", "humantime", - "indexmap 2.2.6", + "indexmap 2.14.0", "indicatif", "itertools 0.12.1", "local-ip-address", @@ -1128,7 +992,7 @@ dependencies = [ "owo-colors", "prettytable", "prost", - "rand 0.8.5", + "rand 0.8.6", "rcgen", "redis", "regex", @@ -1141,16 +1005,16 @@ dependencies = [ "serde_json", "serde_with", "serde_yaml", - "sha2", + "sha2 0.10.9", "sqlx", "strum_macros", - "sysinfo 0.30.12", + "sysinfo", "tabled", "tar", - "thiserror 1.0.61", + "thiserror 1.0.69", "tokio", "tokio-postgres", - "toml 0.8.14", + "toml", "tonic", "tonic-build", "tracing", @@ -1159,15 +1023,30 @@ dependencies = [ "users", "uuid", "walkdir", - "whoami", + "whoami 1.6.1", "zip", ] +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + +[[package]] +name = "cmov" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" + [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" @@ -1185,24 +1064,24 @@ dependencies = [ [[package]] name = "configparser" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" +checksum = "b46dec724fd22199ebde05033a0cbae453bc3b1ecff11eb6a6bb3eec4b90c6a4" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.14.0", ] [[package]] name = "console" -version = "0.15.8" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" dependencies = [ - "encode_unicode 0.3.6", - "lazy_static", + "encode_unicode", "libc", - "unicode-width", - "windows-sys 0.52.0", + "once_cell", + "unicode-width 0.2.2", + "windows-sys 0.59.0", ] [[package]] @@ -1211,6 +1090,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const-random" version = "0.1.18" @@ -1226,33 +1111,26 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.17", "once_cell", "tiny-keccak", ] [[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.16.2" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "percent-encoding", - "time", - "version_check", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -1260,81 +1138,82 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.2.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc16" -version = "0.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" [[package]] -name = "crc32c" -version = "0.6.8" +name = "crc-fast" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" +checksum = "e75b2483e97a5a7da73ac68a05b629f9c53cff58d8ed1c77866079e18b00dba5" dependencies = [ - "rustc_version", + "digest 0.10.7", + "spin 0.10.0", ] [[package]] -name = "crc32fast" -version = "1.4.2" +name = "crc16" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" [[package]] -name = "crc64fast-nvme" -version = "1.2.0" +name = "crc32fast" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4955638f00a809894c947f85a024020a20815b65a5eea633798ea7924edab2b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ - "crc", + "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -1351,9 +1230,9 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] @@ -1366,15 +1245,15 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -1383,45 +1262,42 @@ dependencies = [ ] [[package]] -name = "crypto-bigint" -version = "0.5.5" +name = "crypto-common" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "rand_core 0.6.4", - "subtle", - "zeroize", + "typenum", ] [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ - "generic-array", - "rand_core 0.6.4", - "typenum", + "hybrid-array", ] [[package]] name = "csv" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", - "serde", + "serde_core", ] [[package]] name = "csv-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] @@ -1435,6 +1311,15 @@ dependencies = [ "cipher", ] +[[package]] +name = "ctutils" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +dependencies = [ + "cmov", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1442,9 +1327,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", - "digest", + "digest 0.10.7", "fiat-crypto", "rustc_version", "subtle", @@ -1459,7 +1344,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -1499,36 +1384,26 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der" -version = "0.6.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] +checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "const-oid", + "const-oid 0.9.6", "pem-rfc7468", "zeroize", ] [[package]] name = "deranged" -version = "0.3.11" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", ] @@ -1541,69 +1416,31 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.87", -] - -[[package]] -name = "devtools" -version = "1.8.1" -dependencies = [ - "anyhow", - "async-trait", - "clap", - "configparser", - "dialoguer", - "futures", - "futures-util", - "indicatif", - "libc", - "once_cell", - "os_pipe", - "reqwest", - "serde", - "serde_derive", - "sysinfo 0.27.8", - "thiserror 1.0.61", - "tokio", - "toml 0.5.11", -] - -[[package]] -name = "dialoguer" -version = "0.10.4" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "console", - "fuzzy-matcher", - "shell-words", - "tempfile", - "zeroize", + "block-buffer 0.10.4", + "const-oid 0.9.6", + "crypto-common 0.1.7", + "subtle", ] [[package]] name = "digest" -version = "0.10.7" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", + "block-buffer 0.12.0", + "const-oid 0.10.2", + "crypto-common 0.2.2", + "ctutils", ] [[package]] @@ -1650,13 +1487,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -1675,22 +1512,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] -name = "dyn-clone" -version = "1.0.17" +name = "dunce" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] -name = "ecdsa" -version = "0.14.8" +name = "dyn-clone" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "ecdsa" @@ -1698,12 +1529,12 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.9", - "digest", - "elliptic-curve 0.13.8", - "rfc6979 0.4.0", - "signature 2.2.0", - "spki 0.7.3", + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -1712,80 +1543,54 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", + "pkcs8", + "signature", ] [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", "rand_core 0.6.4", "serde", - "sha2", + "sha2 0.10.9", "subtle", "zeroize", ] [[package]] name = "either" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" dependencies = [ "serde", ] -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest", - "ff 0.12.1", - "generic-array", - "group 0.12.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", - "digest", - "ff 0.13.0", + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", "generic-array", - "group 0.13.0", + "group", "pem-rfc7468", - "pkcs8 0.10.2", + "pkcs8", "rand_core 0.6.4", - "sec1 0.7.3", + "sec1", "subtle", "zeroize", ] -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encode_unicode" version = "1.0.0" @@ -1794,27 +1599,27 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1842,25 +1647,15 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "ff" -version = "0.12.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "ff" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ "rand_core 0.6.4", "subtle", @@ -1884,9 +1679,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixedbitset" @@ -1901,19 +1696,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.9", + "miniz_oxide", "zlib-rs", ] [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", - "spin", + "spin 0.9.8", ] [[package]] @@ -1928,6 +1723,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1945,18 +1746,24 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -1969,9 +1776,9 @@ dependencies = [ [[package]] name = "futures-async-stream" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cce57e88ba9fe4953f476112b2c8e315a2da07725a14dc091ac3e5b6e4cca72" +checksum = "1890317fad72bd60d4254c0a06140676bcc321889e73b8be23ddf1e7adb2b62d" dependencies = [ "futures-async-stream-macro", "futures-core", @@ -1980,13 +1787,13 @@ dependencies = [ [[package]] name = "futures-async-stream-macro" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac45ed0bddbd110eb68862768a194f88700f5b91c39931d2f432fab67a16d08" +checksum = "8fc954740d4b5ce849e6d8e01b79dbdb0e156b02737f7fb8d17130e25f36ff00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -2007,14 +1814,13 @@ checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] @@ -2042,7 +1848,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -2074,15 +1880,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2107,13 +1904,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", ] [[package]] @@ -2124,8 +1921,22 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "rand_core 0.10.1", "wasip2", + "wasip3", ] [[package]] @@ -2138,47 +1949,49 @@ dependencies = [ "polyval", ] -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.12.1", + "ff", "rand_core 0.6.4", "subtle", ] [[package]] -name = "group" -version = "0.13.0" +name = "h2" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" dependencies = [ - "ff 0.13.0", - "rand_core 0.6.4", - "subtle", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.14.0", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] name = "h2" -version = "0.3.26" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.2.6", + "http 1.4.2", + "indexmap 2.14.0", "slab", "tokio", "tokio-util", @@ -2206,12 +2019,27 @@ name = "hashbrown" version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.2.0", ] +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" + [[package]] name = "hashlink" version = "0.8.4" @@ -2238,15 +2066,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -2266,7 +2088,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "hmac", + "hmac 0.12.1", ] [[package]] @@ -2275,16 +2097,25 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.7", +] + +[[package]] +name = "hmac" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" +dependencies = [ + "digest 0.11.3", ] [[package]] name = "home" -version = "0.5.9" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2300,12 +2131,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -2327,7 +2157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.4.2", ] [[package]] @@ -2338,16 +2168,16 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.2", "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.9.4" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -2357,31 +2187,61 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "2.1.0" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" + +[[package]] +name = "hybrid-array" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" +dependencies = [ + "typenum", +] + +[[package]] +name = "hyper" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.27", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", + "want", +] [[package]] name = "hyper" -version = "0.14.29" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ + "atomic-waker", "bytes", "futures-channel", "futures-core", - "futures-util", - "h2", - "http 0.2.12", - "http-body 0.4.6", + "h2 0.4.14", + "http 1.4.2", + "http-body 1.0.1", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] @@ -2393,12 +2253,27 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.32", "log", - "rustls", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +dependencies = [ + "http 1.4.2", + "hyper 1.10.1", + "hyper-util", + "rustls 0.23.40", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.4", + "tower-service", ] [[package]] @@ -2407,7 +2282,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.32", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -2420,24 +2295,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.32", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-util", + "http 1.4.2", + "http-body 1.0.1", + "hyper 1.10.1", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2 0.6.4", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -2449,6 +2348,94 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" + +[[package]] +name = "icu_properties" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" + +[[package]] +name = "icu_provider" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "ident_case" version = "1.0.1" @@ -2457,12 +2444,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -2477,68 +2475,61 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.17.1", + "serde", + "serde_core", ] [[package]] name = "indicatif" -version = "0.17.8" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" dependencies = [ "console", - "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.2", + "web-time", ] [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ "block-padding", "generic-array", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "ipnet" -version = "2.9.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ - "hermit-abi 0.5.1", + "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -2560,43 +2551,46 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "f2025f20d7a4fa7785846e7b63d10a76d3f1cee98ee5cb79ea59703f95e42162" dependencies = [ + "cfg-if", + "futures-util", "wasm-bindgen", ] -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin", + "spin 0.9.8", ] +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" version = "0.2.186" @@ -2605,18 +2599,20 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.13.0", "libc", + "plain", + "redox_syscall 0.8.1", ] [[package]] @@ -2632,20 +2628,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] -name = "local-channel" -version = "0.1.5" +name = "linux-raw-sys" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" -dependencies = [ - "futures-core", - "futures-sink", - "local-waker", -] +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" + +[[package]] +name = "litemap" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "local-ip-address" @@ -2655,48 +2652,41 @@ checksum = "612ed4ea9ce5acfb5d26339302528a5e1e59dfed95e9e11af3c083236ff1d15d" dependencies = [ "libc", "neli", - "thiserror 1.0.61", + "thiserror 1.0.69", "windows-sys 0.48.0", ] -[[package]] -name = "local-waker" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" - [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.30" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" +checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" [[package]] name = "lru" -version = "0.12.5" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" dependencies = [ - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -2712,7 +2702,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "md-5" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.3", ] [[package]] @@ -2723,9 +2723,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "mime" @@ -2739,15 +2739,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2760,14 +2751,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", ] [[package]] @@ -2778,9 +2768,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" dependencies = [ "libc", "log", @@ -2795,9 +2785,9 @@ dependencies = [ [[package]] name = "neli" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" +checksum = "93062a0dce6da2517ea35f301dfc88184ce18d3601ec786a727a87bf535deca9" dependencies = [ "byteorder", "libc", @@ -2807,9 +2797,9 @@ dependencies = [ [[package]] name = "neli-proc-macros" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" +checksum = "0c8034b7fbb6f9455b2a96c19e6edf8dc9fc34c70449938d8ee3b4df363f61fe" dependencies = [ "either", "proc-macro2", @@ -2830,21 +2820,20 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" dependencies = [ "winapi", ] [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -2855,7 +2844,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -2869,7 +2858,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand 0.8.6", "serde", "smallvec", "zeroize", @@ -2877,9 +2866,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-integer" @@ -2911,16 +2900,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -2928,19 +2907,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] -name = "object" -version = "0.36.1" +name = "objc2-core-foundation" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "memchr", + "bitflags 2.13.0", +] + +[[package]] +name = "objc2-system-configuration" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7216bd11cbda54ccabcab84d523dc93b858ec75ecfb3a7d89513fa22464da396" +dependencies = [ + "objc2-core-foundation", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "opaque-debug" @@ -2950,15 +2944,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.13.0", "cfg-if", "foreign-types", "libc", - "once_cell", "openssl-macros", "openssl-sys", ] @@ -2971,20 +2964,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" dependencies = [ "cc", "libc", @@ -3008,44 +3001,17 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "os_pipe" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "outref" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "owo-colors" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" - -[[package]] -name = "p256" -version = "0.11.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2", -] +checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d" [[package]] name = "p256" @@ -3053,10 +3019,10 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "primeorder", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -3065,12 +3031,12 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" dependencies = [ - "base16ct 0.2.0", - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "base16ct", + "ecdsa", + "elliptic-curve", "primeorder", "rand_core 0.6.4", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -3081,14 +3047,14 @@ checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb" dependencies = [ "bytecount", "fnv", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -3096,15 +3062,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.18", "smallvec", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -3130,10 +3096,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest", - "hmac", + "digest 0.10.7", + "hmac 0.12.1", "password-hash", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -3142,7 +3108,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -3166,9 +3132,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "petgraph" @@ -3177,52 +3143,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.14.0", ] [[package]] name = "phf" -version = "0.11.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ "phf_shared", + "serde", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" dependencies = [ "siphasher", ] [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -3236,19 +3203,9 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.9", - "pkcs8 0.10.2", - "spki 0.7.3", -] - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", + "der", + "pkcs8", + "spki", ] [[package]] @@ -3257,15 +3214,21 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.9", - "spki 0.7.3", + "der", + "spki", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" + +[[package]] +name = "plain" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "poly1305" @@ -3273,7 +3236,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", "opaque-debug", "universal-hash", ] @@ -3285,46 +3248,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "opaque-debug", "universal-hash", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "postgres-protocol" -version = "0.6.6" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +checksum = "56201207dac53e2f38e848e31b4b91616a6bb6e0c7205b77718994a7f49e70fc" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "byteorder", "bytes", "fallible-iterator", - "hmac", - "md-5", + "hmac 0.13.0", + "md-5 0.11.0", "memchr", - "rand 0.8.5", - "sha2", + "rand 0.10.1", + "sha2 0.11.0", "stringprep", ] [[package]] name = "postgres-types" -version = "0.2.6" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" +checksum = "8dc729a129e682e8d24170cd30ae1aa01b336b096cbb56df6d534ffec133d186" dependencies = [ "bytes", "fallible-iterator", "postgres-protocol", ] +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3333,18 +3305,31 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] @@ -3354,11 +3339,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46480520d1b77c9a3482d39939fcf96831537a250ec62d4fd8fbdf8e0302e781" dependencies = [ "csv", - "encode_unicode 1.0.0", + "encode_unicode", "is-terminal", "lazy_static", "term", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -3367,7 +3352,7 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.8", + "elliptic-curve", ] [[package]] @@ -3396,9 +3381,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -3426,7 +3411,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.25", "prost", "prost-types", "regex", @@ -3459,9 +3444,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -3472,6 +3457,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.7.3" @@ -3487,9 +3478,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -3506,6 +3497,17 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +dependencies = [ + "chacha20 0.10.0", + "getrandom 0.4.2", + "rand_core 0.10.1", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -3551,7 +3553,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.17", ] [[package]] @@ -3563,6 +3565,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + [[package]] name = "rand_hc" version = "0.2.0" @@ -3574,9 +3582,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -3584,9 +3592,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3626,7 +3634,7 @@ dependencies = [ "rand 0.9.4", "ryu", "sha1_smol", - "socket2 0.6.3", + "socket2 0.6.4", "tokio", "tokio-native-tls", "tokio-util", @@ -3635,82 +3643,67 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.13.0", ] [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.13.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.17", "libredox", - "thiserror 1.0.61", + "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax", ] [[package]] name = "regex-lite" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" - -[[package]] -name = "regex-syntax" -version = "0.6.29" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "reqwest" @@ -3723,10 +3716,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.27", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.32", "hyper-tls", "ipnet", "js-sys", @@ -3754,44 +3747,13 @@ dependencies = [ "winreg", ] -[[package]] -name = "rest_api" -version = "1.8.1" -dependencies = [ - "actix-server", - "actix-web", - "anyhow", - "clap", - "cluster_mgr", - "crossbeam-channel", - "derive_more", - "itertools 0.10.5", - "reqwest", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - [[package]] name = "rfc6979" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac", + "hmac 0.12.1", "subtle", ] @@ -3803,7 +3765,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -3811,20 +3773,20 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "const-oid", - "digest", + "const-oid 0.9.6", + "digest 0.10.7", "num-bigint-dig", "num-integer", "num-traits", "pkcs1", - "pkcs8 0.10.2", + "pkcs8", "rand_core 0.6.4", - "signature 2.2.0", - "spki 0.7.3", + "signature", + "spki", "subtle", "zeroize", ] @@ -3838,29 +3800,29 @@ dependencies = [ "aes", "aes-gcm", "async-trait", - "bitflags 2.6.0", + "bitflags 2.13.0", "byteorder", - "chacha20", + "chacha20 0.9.1", "ctr", "curve25519-dalek", - "digest", + "digest 0.10.7", "flate2", "futures", "generic-array", "hex-literal", - "hmac", + "hmac 0.12.1", "log", "num-bigint", "once_cell", "openssl", "poly1305", - "rand 0.8.5", + "rand 0.8.6", "russh-cryptovec", "russh-keys", - "sha1", - "sha2", + "sha1 0.10.6", + "sha2 0.10.9", "subtle", - "thiserror 1.0.61", + "thiserror 1.0.69", "tokio", "tokio-util", ] @@ -3874,9 +3836,9 @@ dependencies = [ "dirs-next", "futures", "log", - "thiserror 1.0.61", + "thiserror 1.0.69", "tokio", - "whoami", + "whoami 1.6.1", ] [[package]] @@ -3907,23 +3869,23 @@ dependencies = [ "dirs", "ed25519-dalek", "futures", - "hmac", + "hmac 0.12.1", "inout", "log", "md5", "num-bigint", "num-integer", "openssl", - "p256 0.13.2", + "p256", "p521", "pbkdf2 0.11.0", "rand 0.7.3", "rand_core 0.6.4", "russh-cryptovec", "serde", - "sha1", - "sha2", - "thiserror 1.0.61", + "sha1 0.10.6", + "sha2 0.10.9", + "thiserror 1.0.69", "tokio", "tokio-stream", "yasna", @@ -3940,31 +3902,38 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.24" +name = "rustc_version" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustix" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "semver", + "bitflags 2.13.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", ] [[package]] name = "rustix" -version = "0.38.34" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.13.0", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.52.0", + "linux-raw-sys 0.12.1", + "windows-sys 0.61.2", ] [[package]] @@ -3975,18 +3944,32 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +dependencies = [ + "aws-lc-rs", + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.103.13", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] @@ -4019,17 +4002,29 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.103.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "same-file" @@ -4042,11 +4037,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4065,42 +4060,28 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct 0.2.0", - "der 0.7.9", + "base16ct", + "der", "generic-array", - "pkcs8 0.10.2", + "pkcs8", "subtle", "zeroize", ] [[package]] name = "security-framework" -version = "2.11.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.6.0", - "core-foundation", + "bitflags 2.13.0", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -4108,9 +4089,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -4118,9 +4099,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" @@ -4149,25 +4130,27 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", - "ryu", + "memchr", "serde", + "serde_core", + "zmij", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" dependencies = [ "serde", ] @@ -4212,7 +4195,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.14.0", "itoa", "ryu", "serde", @@ -4226,25 +4209,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", ] [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[package]] +name = "sha2" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] [[package]] name = "sha2" -version = "0.10.8" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.3.0", + "digest 0.11.3", ] [[package]] @@ -4256,44 +4261,29 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - [[package]] name = "signature" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -4305,30 +4295,27 @@ checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4336,9 +4323,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", @@ -4354,14 +4341,10 @@ dependencies = [ ] [[package]] -name = "spki" -version = "0.6.0" +name = "spin" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] +checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" [[package]] name = "spki" @@ -4370,14 +4353,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.9", + "der", ] [[package]] name = "sqlformat" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ "nom", "unicode_categories", @@ -4418,7 +4401,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.6", + "indexmap 2.14.0", "log", "memchr", "native-tls", @@ -4427,10 +4410,10 @@ dependencies = [ "percent-encoding", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "smallvec", "sqlformat", - "thiserror 1.0.61", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -4465,7 +4448,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -4484,12 +4467,12 @@ checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.6.0", + "bitflags 2.13.0", "byteorder", "bytes", "chrono", "crc", - "digest", + "digest 0.10.7", "dotenvy", "either", "futures-channel", @@ -4499,24 +4482,24 @@ dependencies = [ "generic-array", "hex", "hkdf", - "hmac", + "hmac 0.12.1", "itoa", "log", - "md-5", + "md-5 0.10.6", "memchr", "once_cell", "percent-encoding", - "rand 0.8.5", + "rand 0.8.6", "rsa", "serde", - "sha1", - "sha2", + "sha1 0.10.6", + "sha2 0.10.9", "smallvec", "sqlx-core", "stringprep", - "thiserror 1.0.61", + "thiserror 1.0.69", "tracing", - "whoami", + "whoami 1.6.1", ] [[package]] @@ -4527,7 +4510,7 @@ checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.6.0", + "bitflags 2.13.0", "byteorder", "chrono", "crc", @@ -4539,23 +4522,23 @@ dependencies = [ "futures-util", "hex", "hkdf", - "hmac", + "hmac 0.12.1", "home", "itoa", "log", - "md-5", + "md-5 0.10.6", "memchr", "once_cell", - "rand 0.8.5", + "rand 0.8.6", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "smallvec", "sqlx-core", "stringprep", - "thiserror 1.0.61", + "thiserror 1.0.69", "tracing", - "whoami", + "whoami 1.6.1", ] [[package]] @@ -4582,6 +4565,12 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + [[package]] name = "stringprep" version = "0.1.5" @@ -4615,7 +4604,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -4637,9 +4626,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -4653,25 +4642,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "sysinfo" -version = "0.27.8" +name = "synstructure" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4689,7 +4674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -4711,7 +4696,7 @@ checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e" dependencies = [ "papergrid", "tabled_derive", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -4740,14 +4725,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ - "cfg-if", "fastrand", - "rustix", - "windows-sys 0.52.0", + "getrandom 0.4.2", + "once_cell", + "rustix 1.1.4", + "windows-sys 0.61.2", ] [[package]] @@ -4763,11 +4749,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.61", + "thiserror-impl 1.0.69", ] [[package]] @@ -4781,13 +4767,13 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -4798,45 +4784,44 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -4851,11 +4836,21 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" -version = "1.7.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" dependencies = [ "tinyvec_macros", ] @@ -4868,28 +4863,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ - "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2 0.6.4", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-io-timeout" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76" dependencies = [ "pin-project-lite", "tokio", @@ -4897,13 +4890,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] @@ -4918,9 +4911,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.10" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +checksum = "4dd8df5ef180f6364759a6f00f7aadda4fbbac86cdee37480826a6ff9f3574ce" dependencies = [ "async-trait", "byteorder", @@ -4935,11 +4928,11 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "rand 0.8.5", - "socket2 0.5.7", + "rand 0.10.1", + "socket2 0.6.4", "tokio", "tokio-util", - "whoami", + "whoami 2.1.2", ] [[package]] @@ -4948,15 +4941,25 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls 0.23.40", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -4965,9 +4968,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -4978,18 +4981,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.14" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned", @@ -4999,26 +4993,33 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.14.0", "serde", "serde_spanned", "toml_datetime", + "toml_write", "winnow", ] +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + [[package]] name = "tonic" version = "0.9.2" @@ -5031,17 +5032,17 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.27", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.32", "hyper-timeout", "percent-encoding", "pin-project", "prost", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -5053,7 +5054,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ - "prettyplease", + "prettyplease 0.1.25", "proc-macro2", "prost-build", "quote", @@ -5071,7 +5072,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand 0.8.6", "slab", "tokio", "tokio-util", @@ -5080,6 +5081,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -5088,15 +5099,15 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -5106,20 +5117,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -5138,15 +5149,15 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", "once_cell", "parking_lot", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", @@ -5164,48 +5175,60 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.17.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] -name = "unicode-width" -version = "0.1.13" +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -5219,7 +5242,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle", ] @@ -5237,14 +5260,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -5263,6 +5287,12 @@ dependencies = [ "log", ] +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -5271,18 +5301,20 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.4.2", + "js-sys", + "wasm-bindgen", ] [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -5292,9 +5324,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vsimd" @@ -5329,9 +5361,18 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] [[package]] name = "wasip2" @@ -5339,7 +5380,16 @@ version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen 0.51.0", ] [[package]] @@ -5349,47 +5399,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] -name = "wasm-bindgen" -version = "0.2.92" +name = "wasite" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "66fe902b4a6b8028a753d5424909b764ccf79b7a209eac9bf97e59cda9f71a42" dependencies = [ - "cfg-if", - "wasm-bindgen-macro", + "wasi 0.14.7+wasi-0.2.4", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" +name = "wasm-bindgen" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "a254a4b10c19a76f09a27640e7ffbf9bc30bf67e16a3bf28aaefa4920fe81563" dependencies = [ - "bumpalo", - "log", + "cfg-if", "once_cell", - "proc-macro2", - "quote", - "syn 2.0.87", + "rustversion", + "wasm-bindgen-macro", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "54568702fabf5d4849ce2b90fadfa64168a097eaf4b351ce9df8b687a0086aaf" dependencies = [ - "cfg-if", "js-sys", "wasm-bindgen", - "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "24a40fc75b0ec6f3746ceb10d36f53a93dcd68a93b11b6445983945d79eba0dc" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5397,28 +5442,53 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "908f34bd9b9ce3d4caf07b72dfab63d61504d156856c6bd3cd87fa350cf3985b" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.87", - "wasm-bindgen-backend", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acbf7616c27b194bbb550bf77ed0c2c3e5b7fd1260a93082b95fb7f47959b92" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.14.0", + "wasm-encoder", + "wasmparser", +] [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -5427,11 +5497,33 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.13.0", + "hashbrown 0.15.5", + "indexmap 2.14.0", + "semver", +] + [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0871acf327f283dc6da28a1696cdc64fb355ba9f935d052021fa77f35cce69" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -5446,17 +5538,30 @@ dependencies = [ "either", "home", "once_cell", - "rustix", + "rustix 0.38.44", ] [[package]] name = "whoami" -version = "1.5.1" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite 0.1.0", + "web-sys", +] + +[[package]] +name = "whoami" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +checksum = "998767ef88740d1f5b0682a9c53c24431453923962269c2db68ee43788c5a40d" dependencies = [ - "redox_syscall 0.4.1", - "wasite", + "libc", + "libredox", + "objc2-system-configuration", + "wasite 1.0.2", "web-sys", ] @@ -5478,11 +5583,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5497,7 +5602,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", "windows-targets 0.52.6", ] @@ -5510,12 +5615,65 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -5534,6 +5692,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -5666,9 +5833,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" dependencies = [ "memchr", ] @@ -5683,21 +5850,114 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck 0.5.0", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck 0.5.0", + "indexmap 2.14.0", + "prettyplease 0.2.37", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease 0.2.37", + "proc-macro2", + "quote", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.13.0", + "indexmap 2.14.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.14.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + [[package]] name = "xattr" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "rustix 1.1.4", ] [[package]] @@ -5717,31 +5977,108 @@ dependencies = [ "time", ] +[[package]] +name = "yoke" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", + "synstructure", +] + [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.117", + "synstructure", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] [[package]] name = "zip" @@ -5754,7 +6091,7 @@ dependencies = [ "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.2.6", + "indexmap 2.14.0", "memchr", "thiserror 2.0.18", "zopfli", @@ -5766,42 +6103,20 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + [[package]] name = "zopfli" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", "log", "simd-adler32", ] - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.12+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index 6da5fe1e..6614b461 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["src/cluster_mgr", "src/devtools", "src/rest_api"] +members = ["src/cluster_mgr"] resolver = "2" diff --git a/scripts/build-release-tarball.sh b/scripts/build-release-tarball.sh index 330ec835..e3f9d303 100755 --- a/scripts/build-release-tarball.sh +++ b/scripts/build-release-tarball.sh @@ -34,13 +34,12 @@ mkdir -p "${PKG_DIR}/bin" "${OUTPUT_DIR}" pushd "${WORKSPACE_DIR}" >/dev/null -cargo build --package cluster_mgr --package rest_api --release +cargo build --package cluster_mgr --release "${WORKSPACE_DIR}/version.sh" >"${PKG_DIR}/version" 2>/dev/null || true cp -r "${WORKSPACE_DIR}/src/cluster_mgr/config" "${PKG_DIR}/" cp -r "${WORKSPACE_DIR}/tests" "${PKG_DIR}/" cp "${TARGET_DIR}/release/cluster_mgr" "${PKG_DIR}/bin/" -cp "${TARGET_DIR}/release/rest_api" "${PKG_DIR}/bin/" ln -sfn cluster_mgr "${PKG_DIR}/bin/eloqctl" tar -czf "${OUTPUT_DIR}/${TARBALL}" -C "${PKG_DIR}" . diff --git a/src/cluster_mgr/config/deployment_sqlite.sql b/src/cluster_mgr/config/deployment_sqlite.sql index fe986688..014add15 100644 --- a/src/cluster_mgr/config/deployment_sqlite.sql +++ b/src/cluster_mgr/config/deployment_sqlite.sql @@ -39,14 +39,6 @@ create table if not exists t_snapshot_info dest_user varchar(100) not null, primary key (cluster_name, snapshot_ts) ); -create table if not exists t_proxy -( - proxy_name varchar(200) not null primary key, - proxy_config text not null, - proxy_host_list text not null, - create_timestamp timestamp not null DEFAULT CURRENT_TIMESTAMP, - update_timestamp timestamp not null DEFAULT CURRENT_TIMESTAMP -); create table if not exists t_topology_tx ( cluster_name varchar(200) not null, diff --git a/src/cluster_mgr/src/cli/cmd_base.rs b/src/cluster_mgr/src/cli/cmd_base.rs index 3e7cdd1e..591dc5e4 100644 --- a/src/cluster_mgr/src/cli/cmd_base.rs +++ b/src/cluster_mgr/src/cli/cmd_base.rs @@ -16,10 +16,10 @@ use crate::cli::task::upload::upload_task_builder::{ build_task_instance, get_source_host, upload_tasks, UploadTaskBuilderType, }; use crate::cli::util::{cpu_arch, file_pg_bar, os_id, os_major_version}; +use crate::cli::BackupCommand; use crate::cli::{ download_dir, upload_dir, MonitorCommand, SubCommand, UpdateMonitorComponent, HOME_DIR, }; -use crate::cli::{BackupCommand, ProxyCommand}; use crate::config::config_base::{DeployConfig, UploadFile, VersionRow}; use crate::config::config_base::{ ALERTMANAGER_FILE_KEY, GRAFANA_FILE_KEY, NODE_EXPORTER_FILE_KEY, PROMETHEUSALERT_FILE_KEY, @@ -30,7 +30,6 @@ use crate::config::monitor::{ Alertmanager, Exporter, Grafana, Monitor, Prometheus, ALERTMANAGER_WEBHOOK_ADAPTER_DEFAULT_URL, ALERTMANAGER_WEBHOOK_ADAPTER_PORT, }; -use crate::config::proxy_config_base::ProxyConfig; use crate::config::storage_service_config::{ DataStoreServiceBackend, DataStoreServiceMode, RocksDB, RocksLocal, StorageService, }; @@ -40,10 +39,7 @@ use crate::config::{ use crate::github_release::{ fetch_eloqkv_releases, find_eloqkv_asset, find_product_asset, list_versions_from_releases, }; -use crate::state::proxy_operation::{ProxyEntity, ProxyOperation}; -use crate::state::state_base::{QueryCondition, StateOperation}; -use crate::state::state_mgr::{StateMgr, PROXY_STATE, STATE_MGR}; -use crate::StateValue; +use crate::state::state_mgr::{StateMgr, STATE_MGR}; use anyhow::{anyhow, bail, Result}; use futures::StreamExt; use itertools::Itertools; @@ -1173,8 +1169,8 @@ impl CmdExecutor { quiet: bool, verbose: bool, ) -> Result<()> { - let Config::Cluster(cfg) = config.clone() else { - unreachable!(); + let cfg = match config.clone() { + Config::Cluster(cfg) => cfg, }; let download_only = match &cmd { @@ -1384,40 +1380,6 @@ impl CmdExecutor { } } } - Config::Proxy(proxy_config) => { - proxy_config.connection.auth.check_keypair()?; - match cmd.clone() { - SubCommand::Proxy { .. } => { - let task_mgr = self.task_mgr.clone(); - let outfile = if quiet { - let f = fs::OpenOptions::new() - .create(true) - .truncate(true) - .open(self.home.join("operation-result"))?; - Some(f) - } else { - None - }; - - let recv_rs_and_print_join = tokio::task::spawn(async move { - task_mgr - .write_task_result(outfile, verbose) - .await - .expect("write operation result failed"); - }); - - let rs = self - .task_mgr - .run_tasks(cmd.clone(), Config::Proxy(proxy_config.clone())) - .await?; - recv_rs_and_print_join.await?; - info!(r#"all tasks complete. task_size={}"#, rs.len()); - - self.finishing(cmd, Config::Proxy(proxy_config)).await?; - } - _ => unreachable!(), - } - } } Ok(()) @@ -1433,47 +1395,6 @@ impl CmdExecutor { Ok(()) } - async fn save_proxy_config(&self, config: &ProxyConfig, upsert: bool) -> Result<()> { - println!("save_proxy_config for ProxyConfig"); - let proxy_operation = self - .state_mgr - .get_state_operation::(PROXY_STATE); - - let proxy_name = config.proxy_service.proxy_name.clone(); - let proxy_entity = proxy_operation - .load(|| -> Option { - Some(QueryCondition { - cond_text: "proxy_name = $1".to_string(), - bind_values: vec![StateValue::Varchar(proxy_name.to_string())], - }) - }) - .await?; - if !proxy_entity.is_empty() && !upsert { - bail!("Proxy {proxy_name} already exists"); - } - // Extract and concatenate hosts - let all_hosts = config - .proxy_service - .proxy_addrs - .iter() - .map(|addr| addr.split(':').next().unwrap()) - .collect::>() - .join(";"); - let config_string = config.to_yaml(); - info!("ProxyConfig saved: proxy_name={proxy_name} @ {all_hosts}"); - let default_timestamp = chrono::DateTime::default(); - proxy_operation - .put(ProxyEntity { - proxy_name: proxy_name.to_string(), - proxy_config: config_string, - proxy_host_list: all_hosts, - create_timestamp: default_timestamp, - update_timestamp: default_timestamp, - }) - .await?; - Ok(()) - } - fn validate_metrics_config(config: &DeployConfig) -> Result<()> { if let Some(monitor) = &config.deployment.monitor { let has_eloq = monitor.eloq_metrics.is_some(); @@ -2043,36 +1964,6 @@ impl CmdExecutor { Ok(Config::Cluster(config)) } - SubCommand::Proxy { command } => { - match &command { - ProxyCommand::Start { config } => { - // Load and handle the Start command with the provided config - let mut proxy_config = ProxyConfig::load(Some(config.to_string()))?; - self.resolve_proxy_version(&mut proxy_config); - self.save_proxy_config(&proxy_config, true).await?; - Ok(Config::Proxy(proxy_config)) - } - ProxyCommand::Stop { proxy_name } => { - let proxy_config = self - .state_mgr - .load_proxy_from_state(Some(proxy_name.clone())) - .await? - .ok_or(anyhow!("proxy config not found"))?; - Ok(Config::Proxy(proxy_config)) - } - ProxyCommand::List { proxy_name } => { - let proxy_config = self - .state_mgr - .load_proxy_from_state(proxy_name.clone()) - .await? - .ok_or_else(|| anyhow!("proxy config not found"))?; - Ok(Config::Proxy(proxy_config)) - } - ProxyCommand::Add { .. } | ProxyCommand::Remove { .. } => { - todo!() - } - } - } _ => Err(anyhow!("unexpected command: {cmd:?}")), } @@ -2195,7 +2086,6 @@ impl CmdExecutor { self.save_deployment_config(&deploy_config, true).await?; Config::Cluster(deploy_config) } - Config::Proxy(proxy_config) => Config::Proxy(proxy_config), }, None => self.get_config(cmd.clone()).await?, }; @@ -2322,46 +2212,11 @@ impl CmdExecutor { } } } - Config::Proxy(proxy_config) => { - proxy_config.connection.auth.check_keypair()?; - match cmd.clone() { - SubCommand::Proxy { .. } => { - let task_mgr = self.task_mgr.clone(); - let outfile = if quiet { - let f = fs::OpenOptions::new() - .create(true) - .truncate(true) - .open(self.home.join("task-result"))?; - Some(f) - } else { - None - }; - - let recv_rs_and_print_join = tokio::task::spawn(async move { - task_mgr - .write_task_result(outfile, verbose) - .await - .expect("write task result failed"); - }); - - // Generate and run tasks - let rs = self - .task_mgr - .run_tasks(cmd.clone(), Config::Proxy(proxy_config.clone())) - .await?; - recv_rs_and_print_join.await?; - info!(r#"all tasks complete. task_size={}"#, rs.len()); - - // Using cluster_config again without moving it - self.finishing(cmd, Config::Proxy(proxy_config)).await?; - } - _ => unreachable!(), - } - } } Ok(()) } + async fn finishing(&self, cmd: SubCommand, config: Config) -> Result<()> { // After all tasks finished match config { @@ -2544,54 +2399,6 @@ impl CmdExecutor { }, _ => {} }, - Config::Proxy(..) => match cmd { - SubCommand::Proxy { command } => match &command { - ProxyCommand::Start { .. } => { - println!("Launch proxy finished, Enjoy!"); - } - ProxyCommand::Stop { .. } => { - println!("Proxy stopped."); - } - ProxyCommand::List { proxy_name } => { - let success_task_entity = STATE_MGR.list_proxy(proxy_name).await?; - - let success_task_vec = success_task_entity - .iter() - .map(|proxy_info_entity| { - let proxy_name = &proxy_info_entity.proxy_name; - let proxy_config = &proxy_info_entity.proxy_config; - (proxy_name, proxy_config) - }) - .collect_vec(); - - // Iterate over each proxy configuration - for (proxy_name, proxy_config) in success_task_vec { - // Parse the proxy_config string as YAML - let proxy_config: ProxyConfig = serde_yaml::from_str(proxy_config) - .map_err(|e| { - anyhow!( - "Failed to parse proxy_config for '{}': {}", - proxy_name, - e - ) - })?; - - // Extract eloqkv_cluster_addr - println!( - "Proxy Name: {}\neloqkv_cluster_addr: {:#?}\n", - proxy_name, proxy_config.proxy_service.eloqkv_cluster_addr - ); - } - } - ProxyCommand::Add { cluster_name, .. } => { - println!("Cluster {cluster_name} is added to proxy service."); - } - ProxyCommand::Remove { cluster_name, .. } => { - println!("Cluster {cluster_name} is removed from proxy service."); - } - }, - _ => unreachable!(), - }, } Ok(()) } @@ -2680,20 +2487,6 @@ impl CmdExecutor { Ok(()) } - pub fn resolve_proxy_version(&self, cnf: &mut ProxyConfig) { - let arch = cpu_arch(); - let os = self.os_vers(); - - // Bind the PathBuf to a variable to extend its lifetime - let path_buf = PathBuf::from(CDN); - let prefix = path_buf.as_path().to_str().unwrap(); - - // Rest of your code remains the same - let url = format!("{prefix}/eloqkv/tools/{arch}/{os}/eloqkv-proxy"); - info!("proxy service binary is set: {url}"); - cnf.proxy_service.bin_download_url = Some(url); - } - async fn gen_demo_config(&self, cmd: SubCommand) -> Result { match cmd { SubCommand::Demo { @@ -2713,7 +2506,6 @@ impl CmdExecutor { let deploy = &mut config.deployment; // set storage match store { - StorageProvider::Dynamodb => unimplemented!(), StorageProvider::Rocksdb => { deploy .storage_service diff --git a/src/cluster_mgr/src/cli/mod.rs b/src/cluster_mgr/src/cli/mod.rs index 86ea5482..ff3a154b 100644 --- a/src/cluster_mgr/src/cli/mod.rs +++ b/src/cluster_mgr/src/cli/mod.rs @@ -178,24 +178,6 @@ Behavior:\n\ - Reports any issues that would prevent a successful launch or deploy.")] #[strum(serialize = "check")] Check { topology_file: String }, - #[command( - long_about = "Manage the proxy service that routes client connections to EloqKV clusters.\n\n\ -Available subcommands:\n\ - start - Start a proxy with a YAML config file\n\ - stop - Stop a running proxy by name\n\ - list - List all proxies and the clusters behind them\n\ - add - Add a cluster behind an existing proxy\n\ - remove - Remove a cluster from behind an existing proxy\n\n\ -Examples:\n\ - eloqctl proxy start --config proxy.yaml\n\ - eloqctl proxy list\n\ - eloqctl proxy stop --proxy-name my-proxy" - )] - #[strum(serialize = "proxy")] - Proxy { - #[command(subcommand)] - command: ProxyCommand, - }, #[command(long_about = "Launch a cluster from a topology YAML file.\n\n\ Examples:\n\ eloqctl launch topology.yaml\n\ @@ -909,66 +891,6 @@ Behavior:\n\ }, } -#[derive(Subcommand, Clone, Debug, Hash, PartialEq, Eq, AsRefStr)] -#[command(next_line_help = true)] -pub enum ProxyCommand { - #[command(long_about = "Start a proxy service with the given configuration.\n\n\ -Examples:\n\ - eloqctl proxy start --config proxy.yaml\n\n\ -Behavior:\n\ - - Loads the proxy configuration from the YAML file and starts the proxy process.\n\ - - The proxy routes client connections to the appropriate EloqKV cluster.\n\ - - Configuration is saved to local state for future management.")] - #[strum(serialize = "start")] - Start { - #[arg(long)] - config: String, - }, - #[command(long_about = "Stop a running proxy service.\n\n\ -Examples:\n\ - eloqctl proxy stop --proxy-name my-proxy\n\n\ -Behavior:\n\ - - Stops the proxy process identified by --proxy-name.\n\ - - The proxy configuration remains in local state and can be restarted later.")] - #[strum(serialize = "stop")] - Stop { - #[arg(long)] - proxy_name: String, - }, - #[command( - long_about = "List all proxy names and the clusters behind each of them.\n\ -If --proxy-name is provided, displays only the clusters behind the specified proxy.\n\n\ -Examples:\n\ - eloqctl proxy list\n\ - eloqctl proxy list --proxy-name my-proxy" - )] - #[strum(serialize = "list")] - List { - #[arg(long)] - proxy_name: Option, - }, - #[command(long_about = "Add a cluster behind an existing proxy.\n\n\ -Examples:\n\ - eloqctl proxy add --proxy-name my-proxy --cluster-name my-cluster")] - #[strum(serialize = "add")] - Add { - #[arg(long)] - proxy_name: String, - #[arg(long)] - cluster_name: String, - }, - #[command(long_about = "Remove a cluster from behind an existing proxy.\n\n\ -Examples:\n\ - eloqctl proxy remove --proxy-name my-proxy --cluster-name my-cluster")] - #[strum(serialize = "remove")] - Remove { - #[arg(long)] - proxy_name: String, - #[arg(long)] - cluster_name: String, - }, -} - pub const HOME_DIR: &str = "ELOQCTL_HOME"; pub fn home_path() -> PathBuf { diff --git a/src/cluster_mgr/src/cli/task/check_task.rs b/src/cluster_mgr/src/cli/task/check_task.rs index 2b21ed54..35c2c91a 100644 --- a/src/cluster_mgr/src/cli/task/check_task.rs +++ b/src/cluster_mgr/src/cli/task/check_task.rs @@ -171,10 +171,6 @@ impl CheckTask { } Ok(None) } - - async fn check_proxy(&self, _: TaskHost) -> Result> { - Ok(None) - } } #[async_trait::async_trait] @@ -205,7 +201,6 @@ impl TaskExecutor for CheckTask { DeploymentPackage::Grafana => self.check_grafana(host).await, DeploymentPackage::PrometheusAlert => self.check_prometheusalert(host).await, DeploymentPackage::EloqLog => self.check_log_sv(host).await, - DeploymentPackage::Proxy => self.check_proxy(host).await, } } } diff --git a/src/cluster_mgr/src/cli/task/download_task.rs b/src/cluster_mgr/src/cli/task/download_task.rs index ef41e11d..d39d11c2 100644 --- a/src/cluster_mgr/src/cli/task/download_task.rs +++ b/src/cluster_mgr/src/cli/task/download_task.rs @@ -5,9 +5,8 @@ use crate::cli::task::task_base::{ TaskInstance, }; use crate::cli::util::file_pg_bar; -use crate::cli::{download_dir, CMD, CMD_OUTPUT, CMD_STATUS}; +use crate::cli::{CMD, CMD_OUTPUT, CMD_STATUS}; use crate::config::config_base::DeployConfig; -use crate::config::proxy_config_base::ProxyConfig; use crate::config::DownloadUrl; use anyhow::{anyhow, Result}; use futures::stream::StreamExt; @@ -76,43 +75,6 @@ impl DownloadTask { Ok(Self::instances(Self::from_urls(urls))) } - pub fn from_proxy_config(config: &ProxyConfig) -> Result> { - let proxy_ref = &config.proxy_service; - let proxy_download_str = &proxy_ref.bin_download_url.clone().unwrap(); - let proxy_download_url = DownloadUrl::from_url_str(proxy_download_str)?; - - let mut urls = vec![]; - if !proxy_download_url.is_local() { - urls.push(proxy_download_str.to_owned()); - } - - let mpg_bar = MultiProgress::new(); - - let tasks: Vec = urls - .into_iter() - .map(|url| { - let d_url = DownloadUrl::from_url_str(url.as_str()).unwrap(); - let dir = download_dir(); - let filename = d_url.file_name(); - let task_id = TaskId { - cmd: "deploy".to_string(), - task: format!("{filename}_download"), - host: "127.0.0.1".to_owned(), - }; - let pg_bar = mpg_bar.add(file_pg_bar()); - DownloadTask { - task_id, - url, - name: filename, - dir, - pg_bar, - } - }) - .collect(); - - Ok(Self::instances(tasks)) - } - pub fn from_urls(urls: Vec) -> Vec { let mpg_bar = MultiProgress::new(); urls.into_iter() diff --git a/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs b/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs index d684d038..649aee55 100644 --- a/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs +++ b/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs @@ -93,7 +93,6 @@ impl EloqStoreDataCleanTask { let deploy_config = match config { Config::Cluster(cfg) => cfg, - Config::Proxy(_) => return task_map, }; // Check if EloqStore Cloud mode is enabled diff --git a/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs b/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs index 0c9d4fb5..dc79976f 100644 --- a/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs +++ b/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs @@ -26,7 +26,6 @@ impl TaskGroup for LogServiceCtlTaskGroup { cluster: _, command: log_ctl_cmd, } => log_ctl_cmd, - _ => unreachable!(), }; let is_start_cmd = log_ctl_cmd_name.to_lowercase().eq("start") || log_ctl_cmd_name.to_lowercase().eq("status"); diff --git a/src/cluster_mgr/src/cli/task/group/mod.rs b/src/cluster_mgr/src/cli/task/group/mod.rs index 85e32451..423ef3c6 100644 --- a/src/cluster_mgr/src/cli/task/group/mod.rs +++ b/src/cluster_mgr/src/cli/task/group/mod.rs @@ -9,7 +9,6 @@ mod install_dep_pkg; mod launch_group; mod log_srv_ctl_group; mod monitor_ctl_group; -mod proxy_ctl_group; mod remove_group; mod scale_group; mod scale_log_group; @@ -20,7 +19,6 @@ use crate::cli::task::task_base::TaskExecutionContext; use crate::cli::SubCommand; use crate::config::config_base::DeployConfig; use crate::config::connection::Connection; -use crate::config::proxy_config_base::ProxyConfig; use dyn_clone::DynClone; use once_cell::sync::OnceCell; use std::collections::HashMap; @@ -29,57 +27,48 @@ use std::collections::HashMap; #[derive(Debug, Clone)] pub enum Config { Cluster(DeployConfig), - Proxy(ProxyConfig), - // Future config types } impl Config { pub fn conn_ref(&self) -> &Connection { match self { Config::Cluster(cfg) => &cfg.connection, - Config::Proxy(cfg) => &cfg.connection, } } pub fn conn_user(&self) -> &str { match self { Config::Cluster(cfg) => &cfg.connection.username, - Config::Proxy(cfg) => &cfg.connection.username, } } pub fn ssh_port(&self) -> u16 { match self { Config::Cluster(cfg) => cfg.connection.ssh_port(), - Config::Proxy(cfg) => cfg.connection.ssh_port(), } } pub fn ssh_endpoint(&self, host: &str) -> (String, u16) { match self { Config::Cluster(cfg) => cfg.connection.ssh_endpoint(host), - Config::Proxy(cfg) => cfg.connection.ssh_endpoint(host), } } pub fn service_endpoint(&self, host: &str, port: u16) -> (String, u16) { match self { Config::Cluster(cfg) => cfg.connection.service_endpoint(host, port), - Config::Proxy(cfg) => cfg.connection.service_endpoint(host, port), } } pub fn conn_ssh_auth_key(&self) -> String { match self { Config::Cluster(cfg) => cfg.connection.ssh_auth_key().unwrap(), - Config::Proxy(cfg) => cfg.connection.ssh_auth_key().unwrap(), } } pub fn get_unique_host_list(&self) -> Vec { match self { Config::Cluster(cfg) => cfg.get_unique_host_list(), - Config::Proxy(cfg) => cfg.get_unique_host_list(), } } } @@ -116,7 +105,6 @@ macro_rules! task_group_boxed { task_group_boxed! { {InstallDBTaskGroup}, {DeploymentTaskGroup}, - {ProxyTaskGroup}, {CtrlDBTaskGroup}, {CustomCmdTaskGroup}, {InstallDepPkgTaskGroup}, @@ -140,7 +128,6 @@ pub fn init_task_group() -> &'static HashMap> { HashMap::from([ ("deploy".to_string(), DeploymentTaskGroup::boxed()), ("install".to_string(), InstallDBTaskGroup::boxed()), - ("proxy".to_string(), ProxyTaskGroup::boxed()), ("start".to_string(), CtrlDBTaskGroup::boxed()), ("stop".to_string(), CtrlDBTaskGroup::boxed()), ("restart".to_string(), CtrlDBTaskGroup::boxed()), diff --git a/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs b/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs index e0f6692c..14dbee1d 100644 --- a/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs +++ b/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs @@ -44,7 +44,6 @@ impl TaskGroup for MonitorCtlTaskGroup { } let monitor_ctl_cmd = match &cmd_arg { SubCommand::Monitor { command, .. } => command, - _ => unreachable!(), }; let mut executable = IndexMap::new(); let mut barrier = vec![]; diff --git a/src/cluster_mgr/src/cli/task/group/proxy_ctl_group.rs b/src/cluster_mgr/src/cli/task/group/proxy_ctl_group.rs deleted file mode 100644 index bfef58c9..00000000 --- a/src/cluster_mgr/src/cli/task/group/proxy_ctl_group.rs +++ /dev/null @@ -1,193 +0,0 @@ -use crate::cli::task::download_task::DownloadTask; -use crate::cli::task::exec_custom_cmd::ExecCustomCommand; -use crate::cli::task::group::{Config, ProxyTaskGroup, TaskGroup}; -use crate::cli::task::proxy_ctl_task::ProxyCtlTask; -use crate::cli::task::task_base::TaskExecutionContext; -use crate::cli::task::upload::upload_task_builder::{upload_tasks, UploadTaskBuilderType}; -use crate::cli::ProxyCommand; -use crate::cli::SubCommand; -use anyhow::Result; -use indexmap::IndexMap; -use std::collections::HashMap; - -#[async_trait::async_trait] -impl TaskGroup for ProxyTaskGroup { - async fn tasks(&self, cmd: SubCommand, config: &Config) -> Result { - let proxy_config = match config { - Config::Proxy(cfg) => cfg, - _ => return Err(anyhow::anyhow!("Expected ProxyConfig for ProxyTaskGroup")), - }; - - let mut executable = IndexMap::new(); - let mut barrier = vec![]; - - match &cmd { - SubCommand::Proxy { command } => { - let ssh_key = proxy_config.connection.ssh_auth_key(); - let user = proxy_config.connection.username.clone(); - let ssh_port = proxy_config.connection.ssh_port() as usize; - - match command { - ProxyCommand::Start { - config: config_path, - } => { - // download binary - let download_task = DownloadTask::from_proxy_config(proxy_config)?; - barrier.push(download_task.len()); - executable.extend(download_task); - - // mkdir - let mkdir_remote_task = ExecCustomCommand::from_config( - &cmd, - "mkdir", - format!("mkdir -p {}", proxy_config.proxy_service.install_dir()), - config, - ); - barrier.push(mkdir_remote_task.len()); - executable.extend(mkdir_remote_task); - - // upload ini config file and binary - let proxy_upload_task = upload_tasks(UploadTaskBuilderType::Proxy, config); - barrier.push(proxy_upload_task.len()); - executable.extend(proxy_upload_task); - - // start proxy - - // Extract and concatenate hosts with error handling - let hosts = proxy_config - .proxy_service - .proxy_addrs - .iter() - .filter_map(|addr| addr.split(':').next().map(|s| s.to_string())) - .collect::>(); - - let mut args = HashMap::new(); - args.insert( - "proxy_bin".to_string(), - proxy_config.proxy_service.proxy_bin(), - ); - let cluster_ip_port_list = proxy_config - .proxy_service - .eloqkv_cluster_addr - .iter() - .flat_map(|ip_port| { - ip_port - .split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - args.insert("cluster_addr".to_string(), cluster_ip_port_list); - let cluster_token = proxy_config - .proxy_service - .eloqkv_cluster_token - .iter() - .flat_map(|ip_port| { - ip_port - .split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - args.insert("cluster_token".to_string(), cluster_token); - let cluster_password = proxy_config - .proxy_service - .eloqkv_cluster_password - .iter() - .flat_map(|ip_port| { - ip_port - .split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - args.insert("cluster_password".to_string(), cluster_password); - - let start_proxy_task = ProxyCtlTask::from_config( - ProxyCommand::Start { - config: config_path.clone(), - }, - ssh_key.unwrap(), - user, - ssh_port, - hosts, - &args, - proxy_config, - ); - - barrier.push(start_proxy_task.len()); - executable.extend(start_proxy_task); - } - ProxyCommand::Stop { .. } => { - // kill proxy process - let hosts = proxy_config - .proxy_service - .proxy_addrs - .iter() - .filter_map(|addr| addr.split(':').next().map(|s| s.to_string())) - .collect::>(); - let proxy_name = proxy_config.proxy_service.proxy_name.clone(); - - let mut args = HashMap::new(); - args.insert("proxy_bin".to_string(), "/path/to/install".to_string()); - // Add other necessary args as needed - - let stop_proxy_task = ProxyCtlTask::from_config( - ProxyCommand::Stop { proxy_name }, - ssh_key.unwrap(), - user, - ssh_port, - hosts, - &args, - proxy_config, - ); - - barrier.push(stop_proxy_task.len()); - executable.extend(stop_proxy_task); - } - ProxyCommand::List { .. } => {} - ProxyCommand::Add { .. } => { - todo!() - - // // kill proxy process - // let host = proxy_config.proxy_service.proxy_hosts.clone(); - // let proxy_name = proxy_config.proxy_service.proxy_name.clone(); - - // let mut args = HashMap::new(); - // args.insert("proxy_bin".to_string(), "/path/to/install".to_string()); - // // Add other necessary args as needed - - // let stop_proxy_task = ProxyCtlTask::from_config( - // ProxyCommand::Stop { proxy_name }, - // ssh_key.unwrap(), - // user, - // ssh_port, - // host, - // &args, - // proxy_config, - // ); - - // barrier.push(stop_proxy_task.len()); - // executable.extend(stop_proxy_task); - - // // upload ini config file and binary - // let proxy_upload_task = upload_tasks(UploadTaskBuilderType::Proxy, &config); - // barrier.push(proxy_upload_task.len()); - // executable.extend(proxy_upload_task); - } - ProxyCommand::Remove { .. } => { - todo!() - } - } - } - _ => unreachable!(), - } - - let cmd_str = cmd.as_ref().to_owned(); - Ok(TaskExecutionContext { - task_group: format!("proxy-control-{cmd_str}"), - barrier: Some(barrier), // Wrap in Some() if needed - executable, - }) - } -} diff --git a/src/cluster_mgr/src/cli/task/group/remove_group.rs b/src/cluster_mgr/src/cli/task/group/remove_group.rs index c5ece93f..4df0223c 100644 --- a/src/cluster_mgr/src/cli/task/group/remove_group.rs +++ b/src/cluster_mgr/src/cli/task/group/remove_group.rs @@ -6,7 +6,6 @@ use crate::cli::task::group::{ }; use crate::cli::task::task_base::{TaskExecutionContext, TaskHost, TaskId, TaskInstance}; use crate::cli::{BackupCommand, SubCommand}; -use anyhow::bail; use indexmap::IndexMap; use itertools::Itertools; @@ -105,10 +104,6 @@ impl TaskGroup for RemoveTaskGroup { // remove keyspace in external dynamo if let Some(store) = &cluster_config.deployment.storage_service { match store.provider().unwrap() { - crate::config::StorageProvider::Dynamodb => { - bail!("drop dynamodb keyspace is not implemented") - } - crate::config::StorageProvider::Rocksdb => {} crate::config::StorageProvider::EloqDSS => { // Handle DataStoreService storage provider cleanup if let Some(dss) = &store.eloqdss { @@ -121,6 +116,7 @@ impl TaskGroup for RemoveTaskGroup { } } } + _ => {} } } diff --git a/src/cluster_mgr/src/cli/task/group/update_config_group.rs b/src/cluster_mgr/src/cli/task/group/update_config_group.rs index 15df6816..d6999056 100644 --- a/src/cluster_mgr/src/cli/task/group/update_config_group.rs +++ b/src/cluster_mgr/src/cli/task/group/update_config_group.rs @@ -38,7 +38,6 @@ impl TaskGroup for UpdateConfigTaskGroup { password, .. } => (*restart, fields.clone(), *tx_node_id, password), - _ => unreachable!(), }; // Build config update tasks diff --git a/src/cluster_mgr/src/cli/task/mod.rs b/src/cluster_mgr/src/cli/task/mod.rs index def74ac7..8e0d886b 100644 --- a/src/cluster_mgr/src/cli/task/mod.rs +++ b/src/cluster_mgr/src/cli/task/mod.rs @@ -26,7 +26,6 @@ mod local_backup_delete_task; mod local_copy_task; pub mod local_extract_task; pub mod monitor_ctl_task; -mod proxy_ctl_task; mod redis_op_task; pub mod rolling_upgrade; pub mod s3_delete_task; diff --git a/src/cluster_mgr/src/cli/task/proxy_ctl_task.rs b/src/cluster_mgr/src/cli/task/proxy_ctl_task.rs deleted file mode 100644 index 692e775e..00000000 --- a/src/cluster_mgr/src/cli/task/proxy_ctl_task.rs +++ /dev/null @@ -1,363 +0,0 @@ -use std::collections::HashMap; - -use crate::cli::ssh::{SSHCommandOption, SSHSession}; -use crate::cli::task::task_base::{ - ExecutionValue, TaskArgValue, TaskExecutor, TaskHost, TaskId, TaskInstance, -}; -use crate::cli::task::task_utils::NodeId; -use crate::cli::ProxyCommand; -use crate::config::proxy_config_base::ProxyConfig; -use crate::config::PROXY_CONF_TEMPLATE; -use indexmap::IndexMap; - -#[derive(Debug, Clone)] -pub struct ProxyCtlTask { - ssh_key: String, - user: String, - port: usize, - host: String, - task_type: ProxyTaskType, -} - -#[derive(Debug, Clone)] -#[allow(dead_code)] -pub enum ProxyTaskType { - StartProxy { - command: String, - }, - StopProxy { - command: String, - }, - AddCluster { - cluster_name: String, - request_body: String, - node_id: NodeId, - }, - RemoveCluster { - cluster_name: String, - token: String, - node_id: NodeId, - }, -} - -impl ProxyCtlTask { - pub fn from_config( - command: ProxyCommand, - ssh_key: String, - user: String, - port: usize, - proxy_hosts: Vec, - args: &HashMap, - proxy_config: &ProxyConfig, - ) -> IndexMap { - let mut all_tasks = IndexMap::default(); - - match command { - ProxyCommand::Start { .. } => { - for host in &proxy_hosts { - for (idx, _) in proxy_config.proxy_service.proxy_addrs.iter().enumerate() { - let task = Self::start_proxy( - ssh_key.clone(), - user.clone(), - port, - host.clone(), - args, - proxy_config, - idx, - ); - - task.task_instance(&mut all_tasks); - } - } - } - ProxyCommand::Stop { .. } => { - for host in &proxy_hosts { - for (idx, _) in proxy_config.proxy_service.proxy_addrs.iter().enumerate() { - let task = Self::stop_proxy( - ssh_key.clone(), - user.clone(), - port, - host.clone(), - proxy_config, - idx, - ); - task.task_instance(&mut all_tasks); - } - } - } - ProxyCommand::List { .. } => { - todo!() - } - ProxyCommand::Add { .. } => { - todo!() - // let task = - // Self::add_cluster(ssh_key.clone(), proxy_hosts.clone(), &cluster_name, args); - // task.task_instance(&mut all_tasks); - } - ProxyCommand::Remove { .. } => { - todo!() - // let task = - // Self::remove_cluster(ssh_key.clone(), proxy_hosts.clone(), &cluster_name, args); - // task.task_instance(&mut all_tasks); - } - } - all_tasks - } - - fn start_proxy( - ssh_key: String, - user: String, - port: usize, - host: String, - args: &HashMap, - proxy_config: &ProxyConfig, - idx: usize, - ) -> Self { - let bin_path = args.get("proxy_bin").expect("proxy_bin is required"); - - let template_base = PROXY_CONF_TEMPLATE.trim_end_matches(".ini"); - let config_file = format!( - "{}/{}_{}.ini", - proxy_config.proxy_service.install_dir(), - template_base, - idx - ); - let log_path = format!( - "{}/proxy_{}.log", - proxy_config.proxy_service.install_dir(), - idx - ); - let pid_path = format!( - "{}/proxy_{}.pid", - proxy_config.proxy_service.install_dir(), - idx - ); - - let command = format!( - "chmod +x {}; nohup {} --config={} --proxy_addr={} --web_service_addr=:{} > {} 2>&1 & echo $! > {}", - bin_path, - bin_path, - config_file, - proxy_config.proxy_service.proxy_addrs[idx], - proxy_config.proxy_service.web_service_ports[idx], - log_path, - pid_path - ); - - Self { - ssh_key, - user, - port, - host, - task_type: ProxyTaskType::StartProxy { command }, - } - } - - fn stop_proxy( - ssh_key: String, - user: String, - port: usize, - host: String, - proxy_config: &ProxyConfig, - idx: usize, - ) -> Self { - let pid_path = format!( - "{}/proxy_{}.pid", - proxy_config.proxy_service.install_dir(), - idx - ); - - let command = format!("kill $(cat {})", pid_path); - - Self { - ssh_key, - user, - port, - host, - task_type: ProxyTaskType::StopProxy { command }, - } - } - - // fn add_cluster( - // ssh_key: String, - // host: String, - // cluster_name: &str, - // args: &HashMap, - // ) -> Self { - // let web_service_addr = args - // .get("web_service_addr") - // .expect("web_service_addr is required"); - - // // Get cluster details from args - // let cluster_id = args - // .get("cluster_id") - // .expect("cluster_id is required") - // .to_string(); - // let addrs = args - // .get("cluster_addrs") - // .expect("cluster_addrs is required"); - // let token = args - // .get("cluster_token") - // .expect("cluster_token is required") - // .to_string(); - // let password = args - // .get("cluster_password") - // .expect("cluster_password is required") - // .to_string(); - - // let addrs: Vec = addrs.split(',').map(|s| s.trim().to_string()).collect(); - - // #[derive(Serialize)] - // struct AddClusterRequest { - // cluster_id: String, - // addrs: Vec, - // token: String, - // password: String, - // } - - // let request_body = AddClusterRequest { - // cluster_id, - // addrs, - // token, - // password, - // }; - - // Self { - // ssh_key, - // user: String::new(), // Not needed for local tasks - // port: 0, // Not needed for local tasks - // host: web_service_addr.to_string(), - // task_type: ProxyTaskType::AddCluster { - // // cluster_name: cluster_name.to_string(), - // // request_body: serde_json::to_string(&request_body).unwrap(), - // }, - // } - // } - - // fn remove_cluster( - // ssh_key: String, - // host: String, - // cluster_name: &str, - // args: &HashMap, - // ) -> Self { - // let web_service_addr = args - // .get("web_service_addr") - // .expect("web_service_addr is required"); - // let token = args - // .get("cluster_token") - // .expect("cluster_token is required") - // .to_string(); - - // Self { - // ssh_key, - // user: String::new(), // Not needed for local tasks - // port: 0, // Not needed for local tasks - // host: web_service_addr.to_string(), - // task_type: ProxyTaskType::RemoveCluster { - // // cluster_name: cluster_name.to_string(), - // // token, - // }, - // } - // } - - fn task_instance(self, tasks: &mut IndexMap) { - let host = match &self.task_type { - ProxyTaskType::AddCluster { .. } | ProxyTaskType::RemoveCluster { .. } => { - TaskHost::Local - } - _ => TaskHost::Remote { - user: self.user.clone(), - port: self.port, - host: self.host.clone(), - }, - }; - let inst = TaskInstance { - task_input: HashMap::default(), - task: Box::new(self), - task_host: host, - }; - tasks.insert(inst.task.identifier(), inst); - } -} - -#[async_trait::async_trait] -impl TaskExecutor for ProxyCtlTask { - fn identifier(&self) -> TaskId { - let cmd = match &self.task_type { - ProxyTaskType::StartProxy { .. } => "proxy_start", - ProxyTaskType::StopProxy { .. } => "proxy_stop", - ProxyTaskType::AddCluster { .. } => "proxy_add_cluster", - ProxyTaskType::RemoveCluster { .. } => "proxy_remove_cluster", - } - .to_owned(); - - TaskId { - cmd, - task: format!("{:?}", self.task_type), - host: self.host.clone(), - } - } - - async fn execute( - &self, - host: TaskHost, - _input: HashMap, - ) -> anyhow::Result> { - match &self.task_type { - ProxyTaskType::StartProxy { command } => { - let sess = SSHSession::from_task_host(host.clone(), self.ssh_key.clone()).await?; - - let output = sess - .command(command, SSHCommandOption::CollectOutput) - .await?; - Ok(Some(output)) - } - ProxyTaskType::StopProxy { command } => { - let sess = SSHSession::from_task_host(host.clone(), self.ssh_key.clone()).await?; - let output = sess - .command(command, SSHCommandOption::CollectOutput) - .await?; - Ok(Some(output)) - } - ProxyTaskType::AddCluster { .. } => { - todo!() - // let url = format!("http://{}/cluster", self.host); - // let client = reqwest::Client::new(); - // let res = client - // .post(&url) - // .header("Content-Type", "application/json") - // .body(request_body.clone()) - // .send() - // .await?; - // let status = res.status(); - // let text = res.text().await?; - // if status.is_success() { - // panic!("") - // } else { - // Err(anyhow::anyhow!( - // "Failed to add cluster {}: {}", - // cluster_name, - // text - // )) - // } - } - ProxyTaskType::RemoveCluster { .. } => { - todo!() - // let url = format!("http://{}/cluster/{}", self.host, token); - // let client = reqwest::Client::new(); - // let res = client.delete(&url).send().await?; - // let status = res.status(); - // let text = res.text().await?; - // if status.is_success() { - // panic!("") - // } else { - // Err(anyhow::anyhow!( - // "Failed to remove cluster {}: {}", - // cluster_name, - // text - // )) - // } - } - } - } -} diff --git a/src/cluster_mgr/src/cli/task/task_controller.rs b/src/cluster_mgr/src/cli/task/task_controller.rs index b1e998db..2d513661 100644 --- a/src/cluster_mgr/src/cli/task/task_controller.rs +++ b/src/cluster_mgr/src/cli/task/task_controller.rs @@ -208,7 +208,6 @@ impl TaskController { let name = match config { Config::Cluster(cfg) => cfg.deployment.cluster_name.clone(), - Config::Proxy(cfg) => cfg.proxy_service.proxy_name.clone(), }; splits.iter().for_each(|execution_context| { diff --git a/src/cluster_mgr/src/cli/task/upload/mod.rs b/src/cluster_mgr/src/cli/task/upload/mod.rs index 129f2cca..07baa547 100644 --- a/src/cluster_mgr/src/cli/task/upload/mod.rs +++ b/src/cluster_mgr/src/cli/task/upload/mod.rs @@ -1,7 +1,6 @@ mod data_dir_upload_builder; pub mod eloq_upload_builder; pub mod monitor_upload_builder; -mod proxy_upload_builder; mod tx_conf_upload_builder; mod upload_task; pub mod upload_task_builder; diff --git a/src/cluster_mgr/src/cli/task/upload/proxy_upload_builder.rs b/src/cluster_mgr/src/cli/task/upload/proxy_upload_builder.rs deleted file mode 100644 index c8373ad8..00000000 --- a/src/cluster_mgr/src/cli/task/upload/proxy_upload_builder.rs +++ /dev/null @@ -1,136 +0,0 @@ -use crate::cli::task::group::Config; -use crate::cli::task::task_base::{TaskId, TaskInstance}; -use crate::cli::task::upload::upload_task_builder::{ - build_task_instance, get_source_host, UploadTaskBuilder, -}; -use crate::cli::{download_dir, upload_dir}; -use crate::config::config_base::UploadFile; -use crate::config::PROXY_CONF_TEMPLATE; -use crate::config::{config_template, PROXY_BIN}; -use indexmap::IndexMap; -use std::fs; - -pub struct ProxyUploadBuilder; - -impl UploadTaskBuilder for ProxyUploadBuilder { - fn build(&self, config: &Config) -> IndexMap { - let proxy_config = match config { - Config::Proxy(cfg) => cfg, - _ => panic!("Expected ProxyConfig for ProxyUploadBuilder"), - }; - - // Read the template config file - let config_template_file_path = - config_template(PROXY_CONF_TEMPLATE).expect("get proxy config template error"); - - // Copy the template to upload dir first (this creates eloqproxy.ini) - let template_dest = upload_dir().join(PROXY_CONF_TEMPLATE); - fs::copy(&config_template_file_path, &template_dest) - .expect("Failed to copy proxy config template to upload dir"); - - // Generate full proxy config (the original with all proxy_addrs) - let full_config = proxy_config - .gen_proxy_configs() - .expect("Failed to generate proxy configurations"); - - // Load the fully populated original ini - let full_ini = ini::Ini::load_from_file(&full_config) - .expect("Failed to load complete proxy config as INI"); - - // Generate individual config files for each proxy address - let template_base = PROXY_CONF_TEMPLATE.trim_end_matches(".ini"); - let upload_base_dir = upload_dir(); - - // For each proxy address in proxy_addrs, create a separate config file - for (idx, proxy_addr) in proxy_config.proxy_service.proxy_addrs.iter().enumerate() { - // Create a new INI file starting with all settings from the full config - let mut proxy_ini = full_ini.clone(); - - // Override only the proxy_addr field for this specific address - proxy_ini.set_to::(None, "proxy_addr".to_string(), proxy_addr.clone()); - - // Set individual web_service_port if available - if idx < proxy_config.proxy_service.web_service_ports.len() { - let web_service_port = &proxy_config.proxy_service.web_service_ports[idx]; - proxy_ini.set_to::( - None, - "web_service_port".to_string(), - web_service_port.clone(), - ); - } else if !proxy_config.proxy_service.web_service_ports.is_empty() { - // If we have more proxy addresses than web service ports, cycle through them - let port_idx = idx % proxy_config.proxy_service.web_service_ports.len(); - let web_service_port = &proxy_config.proxy_service.web_service_ports[port_idx]; - proxy_ini.set_to::( - None, - "web_service_port".to_string(), - web_service_port.clone(), - ); - } - - // Create the config file path with index - let config_filename = format!("{}_{}.ini", template_base, idx); - let config_path = upload_base_dir.join(&config_filename); - - // Write the customized INI file - proxy_ini.write_to_file(&config_path).unwrap_or_else(|_| { - panic!("Failed to write config content to {}", config_filename) - }); - } - - let source_host = get_source_host(None); - let mut tasks: IndexMap = Default::default(); - - // For each proxy address, create a task to upload the corresponding config file - for (idx, proxy_addr) in proxy_config.proxy_service.proxy_addrs.iter().enumerate() { - let host = proxy_addr - .split(':') - .next() - .map(|s| s.to_string()) - .expect("Invalid proxy address format"); - - // Configure the upload task for the specific config file - let config_filename = format!("{}_{}.ini", template_base, idx); - let config_path = upload_base_dir.join(&config_filename); - - let upload_cnf_file = UploadFile { - source: config_path.to_string_lossy().into_owned(), - dest: proxy_config.proxy_service.install_dir(), - extension: "".to_string(), // Empty because filename already includes extension - host: host.clone(), - copy_dir: false, - delete_remote: false, - }; - - let (id, task) = build_task_instance( - source_host.clone(), - upload_cnf_file, - config, - &format!("proxy-ini-{}", idx), - &format!("upload-proxy-ini-{}", idx), - ); - tasks.insert(id, task); - - // Upload binary to the same host - let bin_source = download_dir().join(PROXY_BIN); - let upload_bin = UploadFile { - source: bin_source.to_str().unwrap().to_string(), - dest: proxy_config.proxy_service.install_dir(), - extension: "".to_string(), - host: host.clone(), - copy_dir: false, - delete_remote: false, - }; - let (id, task) = build_task_instance( - source_host.clone(), - upload_bin, - config, - &format!("proxy-bin-{}", idx), - &format!("upload-proxy-bin-{}", idx), - ); - tasks.insert(id, task); - } - - tasks - } -} diff --git a/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs b/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs index 7466673e..993524cf 100644 --- a/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs @@ -550,7 +550,6 @@ impl TxConfUpload { // Get the candidate status for this node from the is_candidate parameter let node_is_candidate = match is_candidate { Some(candidate_list) => candidate_list[i], - _ => unreachable!(), }; // Choose the right config file type based on is_candidate diff --git a/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs b/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs index b9b9b186..0a1802e3 100644 --- a/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs @@ -3,9 +3,9 @@ use crate::cli::task::group::Config; use crate::cli::task::task_base::{TaskArgValue, TaskHost, TaskId, TaskInstance}; use crate::cli::task::task_utils::{ClusterNodesWithConfig, ScaleOperationType}; use crate::cli::task::upload::data_dir_upload_builder::DataDirUploadBuilder; -use crate::cli::task::upload::eloq_upload_builder::{EloqUpload, EloqUploadBuilder}; -use crate::cli::task::upload::monitor_upload_builder::*; -use crate::cli::task::upload::proxy_upload_builder::ProxyUploadBuilder; +use crate::cli::task::upload::eloq_upload_builder::EloqUpload; +use crate::cli::task::upload::eloq_upload_builder::EloqUploadBuilder; +use crate::cli::task::upload::monitor_upload_builder::MonitorInfraConfUploadBuilder; use crate::cli::task::upload::tx_conf_upload_builder::TxConfUpload; use crate::cli::task::upload::upload_task::UploadTask; use crate::config::config_base::UploadFile; @@ -109,7 +109,6 @@ pub enum UploadTaskBuilderType { MonitorConf, TxConf, EloqImage, - Proxy, ScaleTxConf, } @@ -142,11 +141,9 @@ pub fn upload_tasks( EloqUpload::eloq_image_upload(&cluster_config.deployment), ) } - UploadTaskBuilderType::Proxy => ProxyUploadBuilder {}.build(conf), } } -/// Upload tasks with node list that is being added or removed pub fn upload_tasks_with_nodes( builder_type: UploadTaskBuilderType, conf: &Config, diff --git a/src/cluster_mgr/src/config/config_base.rs b/src/cluster_mgr/src/config/config_base.rs index c532c55c..b2c2380e 100644 --- a/src/cluster_mgr/src/config/config_base.rs +++ b/src/cluster_mgr/src/config/config_base.rs @@ -291,7 +291,6 @@ impl DeployConfig { DeploymentPackage::PrometheusAlert => { extract_monitor_link!(monitor_link, PROMETHEUSALERT_FILE_KEY, unpack_files); } - DeploymentPackage::Proxy => unreachable!(), } (pkg.clone(), unpack_files) diff --git a/src/cluster_mgr/src/config/deployment.rs b/src/cluster_mgr/src/config/deployment.rs index b5356ca1..3fbe5123 100644 --- a/src/cluster_mgr/src/config/deployment.rs +++ b/src/cluster_mgr/src/config/deployment.rs @@ -516,7 +516,6 @@ impl Deployment { // Only configure storage if storage_service is provided if let Some(storage) = self.storage_service.as_ref() { match storage.provider().unwrap() { - StorageProvider::Dynamodb => bail!("Dynamodb storage provider is not supported"), StorageProvider::Rocksdb => match storage.rocksdb.clone().unwrap() { RocksDB::LOCAL(local) => { let rocks_path = match &local.path { @@ -2149,7 +2148,6 @@ impl Deployment { DeploymentPackage::PrometheusAlert => { extract_monitor_host!(self, alertmanager) } - DeploymentPackage::Proxy => unreachable!(), } } @@ -2222,7 +2220,6 @@ impl Deployment { }) }) .unwrap_or_default(), - DeploymentPackage::Proxy => unreachable!(), } } diff --git a/src/cluster_mgr/src/config/mod.rs b/src/cluster_mgr/src/config/mod.rs index 854d4c70..09011e36 100644 --- a/src/cluster_mgr/src/config/mod.rs +++ b/src/cluster_mgr/src/config/mod.rs @@ -17,14 +17,10 @@ pub mod deployment; #[allow(dead_code)] pub mod log_service; pub mod monitor; -pub mod proxy_config_base; -pub mod proxy_service; pub mod storage_service_config; pub const ELOQKV_TEMPLATE_INI: &str = "EloqKv.ini"; pub const ELOQDSS_TEMPLATE_INI: &str = "EloqDss.ini"; -pub const PROXY_CONF_TEMPLATE: &str = "eloqproxy.ini"; -pub const PROXY_BIN: &str = "eloqkv-proxy"; pub const ELOQKV_NODE_INI: &str = "EloqKv-node"; pub const START_LOG_TEMPLATE: &str = "start_tx_log.bash"; pub const JVM_SETTING_HOLDER: &str = "_GC_SETTINGS_PLACEHOLDER_"; @@ -77,12 +73,9 @@ pub const SECTION_LOCAL: &str = "local"; pub const SECTION_CLUSTER: &str = "cluster"; pub const SECTION_STORE: &str = "store"; pub const SECTION_METRIC: &str = "metrics"; -pub const SECTION_PROXY: &str = "proxy"; #[derive(Hash, Debug, Clone, PartialEq, Eq, AsRefStr, Display, clap::ValueEnum)] pub enum StorageProvider { - #[strum(serialize = "dynamodb")] - Dynamodb, #[strum(serialize = "rocksdb")] Rocksdb, #[strum(serialize = "eloqdss")] @@ -194,8 +187,6 @@ pub enum DeploymentPackage { EloqStandby, #[strum(serialize = "eloq_voter")] EloqVoter, - #[strum(serialize = "proxy")] - Proxy, } pub fn config_path_string(path: Option) -> anyhow::Result { diff --git a/src/cluster_mgr/src/config/proxy_config_base.rs b/src/cluster_mgr/src/config/proxy_config_base.rs deleted file mode 100644 index 95f182a7..00000000 --- a/src/cluster_mgr/src/config/proxy_config_base.rs +++ /dev/null @@ -1,139 +0,0 @@ -use crate::all_hosts_merge; -use crate::cli::upload_dir; -use crate::cli::HOME_DIR; -use crate::config::config_path_string; -use crate::config::connection::Connection; -use crate::config::proxy_service::ProxyService; -use crate::config::{DeploymentPackage, PathBuf, PROXY_CONF_TEMPLATE}; -use anyhow::anyhow; -use itertools::Itertools; -use serde::{Deserialize, Serialize}; -use std::fs; -use tracing::info; - -#[serde_with::skip_serializing_none] -#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)] -pub struct ProxyConfig { - pub connection: Connection, - pub proxy_service: ProxyService, -} - -impl ProxyConfig { - pub fn get_host_list(&self, _service: DeploymentPackage) -> Vec { - self.proxy_service - .proxy_addrs - .iter() - .filter_map(|addr| addr.split(':').next().map(|s| s.to_string())) - .collect::>() - } - - pub fn get_unique_host_list(&self) -> Vec { - let all_hosts = all_hosts_merge!(self, Proxy,); - all_hosts.iter().unique().cloned().collect_vec() - } - - pub fn gen_proxy_configs(&self) -> anyhow::Result { - let cnf_path = upload_dir().join(PROXY_CONF_TEMPLATE); - let mut proxy_ini = - ini::Ini::load_from_file(&cnf_path).expect("can not load proxy config template"); - - let proxy_addr_list = self.proxy_service.proxy_addrs.join(","); - proxy_ini.set_to::(None, "proxy_addr".to_string(), proxy_addr_list); - - let web_service_port_list = self - .proxy_service - .web_service_ports - .iter() - .flat_map(|port| { - port.split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - proxy_ini.set_to::(None, "web_service_port".to_string(), web_service_port_list); - - let eloqkv_cluster_addr_list = self - .proxy_service - .eloqkv_cluster_addr - .iter() - .flat_map(|host_str| { - host_str - .split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - proxy_ini.set_to::( - None, - "eloqkv_cluster_addr".to_string(), - eloqkv_cluster_addr_list, - ); - - let eloqkv_cluster_token_list = self - .proxy_service - .eloqkv_cluster_token - .iter() - .flat_map(|host_str| { - host_str - .split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - proxy_ini.set_to::( - None, - "eloqkv_cluster_token".to_string(), - eloqkv_cluster_token_list, - ); - - let eloqkv_cluster_password_list = self - .proxy_service - .eloqkv_cluster_password - .iter() - .flat_map(|host_str| { - host_str - .split(',') // Split on ',' - .map(str::trim) // Trim any whitespace - }) - .collect::>() - .join(","); - proxy_ini.set_to::( - None, - "eloqkv_cluster_password".to_string(), - eloqkv_cluster_password_list, - ); - - proxy_ini.write_to_file(&cnf_path)?; - Ok(cnf_path) - } - - fn read_config_from_file(path: String) -> anyhow::Result { - let content = fs::read_to_string(path)? - .replace("${USER}", &whoami::username()) - .replace(&format!("${{{HOME_DIR}}}"), &std::env::var(HOME_DIR)?); - let proxy_config = serde_yaml::from_str::(&content)?; - Ok(proxy_config) - } - - pub fn load(path: Option) -> anyhow::Result { - let path_string = config_path_string(path)?; - info!("ProxyConfig load file from {}", path_string); - let config = ProxyConfig::read_config_from_file(path_string.clone()) - .map_err(|err| anyhow!("{path_string}: {err}"))?; - config.connection.auth.check_keypair()?; - Ok(config) - } - - pub fn load_from_string(config_content: String) -> anyhow::Result { - let proxy_config_rs = serde_yaml::from_str::(config_content.as_str()); - if let Ok(proxy_config) = proxy_config_rs { - Ok(proxy_config) - } else { - Err(anyhow!(proxy_config_rs.err().unwrap().to_string())) - } - } - - pub fn to_yaml(&self) -> String { - serde_yaml::to_string(self).unwrap() - } -} diff --git a/src/cluster_mgr/src/config/proxy_service.rs b/src/cluster_mgr/src/config/proxy_service.rs deleted file mode 100644 index 8eb2dfce..00000000 --- a/src/cluster_mgr/src/config/proxy_service.rs +++ /dev/null @@ -1,27 +0,0 @@ -use serde::{Deserialize, Serialize}; - -#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)] -pub struct ProxyService { - pub proxy_name: String, - pub bin_download_url: Option, - pub proxy_addrs: Vec, - pub web_service_ports: Vec, - pub install_dir: String, - pub eloqkv_cluster_addr: Vec, - pub eloqkv_cluster_token: Vec, - pub eloqkv_cluster_password: Vec, -} - -impl ProxyService { - pub fn install_dir(&self) -> String { - format!("{}/proxy-service", &self.install_dir) - } - - pub fn proxy_bin(&self) -> String { - format!("{}/eloqkv-proxy", &self.install_dir()) - } - - pub fn proxy_conf_path(&self) -> String { - format!("{}/eloqproxy.ini", &self.install_dir()) - } -} diff --git a/src/cluster_mgr/src/config/storage_service_config.rs b/src/cluster_mgr/src/config/storage_service_config.rs index 25f9993d..ebadcc92 100644 --- a/src/cluster_mgr/src/config/storage_service_config.rs +++ b/src/cluster_mgr/src/config/storage_service_config.rs @@ -114,9 +114,7 @@ pub enum RocksDB { impl StorageService { pub fn provider(&self) -> Option { - if self.dynamodb.is_some() { - Some(StorageProvider::Dynamodb) - } else if self.rocksdb.is_some() { + if self.rocksdb.is_some() { Some(StorageProvider::Rocksdb) } else if self.eloqdss.is_some() { Some(StorageProvider::EloqDSS) diff --git a/src/cluster_mgr/src/state/mod.rs b/src/cluster_mgr/src/state/mod.rs index 81d1e7c0..1d73f2bd 100644 --- a/src/cluster_mgr/src/state/mod.rs +++ b/src/cluster_mgr/src/state/mod.rs @@ -1,6 +1,5 @@ pub mod cluster_index_operation; pub mod deployment_operation; -pub mod proxy_operation; pub mod snapshot_info_operation; pub mod state_base; pub mod state_mgr; diff --git a/src/cluster_mgr/src/state/proxy_operation.rs b/src/cluster_mgr/src/state/proxy_operation.rs deleted file mode 100644 index b8042216..00000000 --- a/src/cluster_mgr/src/state/proxy_operation.rs +++ /dev/null @@ -1,40 +0,0 @@ -use crate::{state_operation_impl, StateValue, Stateful}; -use chrono::Utc; -use sqlx::FromRow; - -pub(crate) const PROXY_SELECT: &str = r#"select proxy_name, proxy_config, proxy_host_list, - create_timestamp, update_timestamp - from t_proxy"#; - -pub(crate) const PROXY_UPSERT: [&str; 2] = [ - r#"insert into t_proxy (proxy_name, proxy_config, proxy_host_list, create_timestamp, update_timestamp) values ("#, - r#" )on CONFLICT (proxy_name) DO UPDATE SET proxy_config = excluded.proxy_config, proxy_host_list = excluded.proxy_host_list"#, -]; - -pub(crate) const PROXY_DELETE: &str = r#"delete from t_proxy"#; - -#[derive(Eq, PartialEq, Clone, Debug, FromRow)] -pub struct ProxyEntity { - pub proxy_name: String, - pub proxy_config: String, - pub proxy_host_list: String, - pub create_timestamp: chrono::DateTime, - pub update_timestamp: chrono::DateTime, -} - -impl Stateful for ProxyEntity { - fn to_values(&self) -> Vec { - let self_cloned = self.clone(); - vec![ - StateValue::Varchar(self_cloned.proxy_name), - StateValue::Varchar(self_cloned.proxy_config), - StateValue::Varchar(self_cloned.proxy_host_list), - StateValue::Timestamp(self_cloned.create_timestamp), - StateValue::Timestamp(self_cloned.update_timestamp), - ] - } -} - -state_operation_impl! { - { ProxyOperation, ProxyEntity, PROXY_SELECT, PROXY_UPSERT, PROXY_DELETE } -} diff --git a/src/cluster_mgr/src/state/state_mgr.rs b/src/cluster_mgr/src/state/state_mgr.rs index 11aa357c..953916b0 100644 --- a/src/cluster_mgr/src/state/state_mgr.rs +++ b/src/cluster_mgr/src/state/state_mgr.rs @@ -1,10 +1,8 @@ use crate::cli::HOME_DIR; use crate::config::config_base::DeployConfig; -use crate::config::proxy_config_base::ProxyConfig; use crate::config::CONFIG_PATH_DIR; use crate::state::cluster_index_operation::{ClusterIndexEntity, ClusterIndexOperation}; use crate::state::deployment_operation::DeploymentOperation; -use crate::state::proxy_operation::{ProxyEntity, ProxyOperation}; use crate::state::snapshot_info_operation::{SnapshotEntity, SnapshotOperation}; use crate::state::state_base::{QueryCondition, StateOperation, StateOperationAny}; use crate::state::task_status_operation::{TaskStatusEntity, TaskStatusOperation}; @@ -26,7 +24,6 @@ use tracing::{error, info}; pub const DEPLOYMENT_STATE: &str = "Deployment"; pub const CLUSTER_INDEX_STATE: &str = "ClusterIndex"; -pub const PROXY_STATE: &str = "Proxy"; pub const TASK_STATUS_STATE: &str = "TaskStatus"; pub const SNAPSHOT_STATUS_STATE: &str = "SnapshotStatus"; pub const TOPOLOGY_TX_STATE: &str = "TopologyTx"; @@ -251,43 +248,6 @@ impl StateMgr { } } - pub async fn load_proxy_from_state( - &self, - proxy_name: Option, - ) -> Result> { - let proxy_state = self.get_state_operation::(PROXY_STATE); - let proxy_entity_vec = proxy_state - .load(|| -> Option { - proxy_name.as_ref().map(|name| QueryCondition { - cond_text: "proxy_name = $1".to_string(), - bind_values: vec![StateValue::Varchar(name.clone())], - }) - }) - .await?; - - if let Some(proxy_entity) = proxy_entity_vec.first() { - let config_content = &proxy_entity.proxy_config; - let config = ProxyConfig::load_from_string(config_content.to_string())?; - Ok(Some(config)) - } else { - Ok(None) - } - } - - pub async fn list_proxy(&self, proxy_name: &Option) -> Result> { - let proxy_info_operation = self.get_state_operation::(PROXY_STATE); - - let proxy_status_entity = proxy_info_operation - .load(|| -> Option { - proxy_name.as_ref().map(|name| QueryCondition { - cond_text: "proxy_name = $1".to_string(), - bind_values: vec![StateValue::Varchar(name.clone())], - }) - }) - .await?; - Ok(proxy_status_entity) - } - pub async fn delete_cluster(&self, cluster: &str) -> Result { let cond = QueryCondition { cond_text: "cluster_name = $1".to_string(), @@ -486,9 +446,6 @@ impl StateMgr { let snapshot_status_opt_ref = Box::leak(SnapshotOperation::boxed(db_conn_pool.clone())) as &dyn StateOperationAny; - let proxy_opt_ref = - Box::leak(ProxyOperation::boxed(db_conn_pool.clone())) as &dyn StateOperationAny; - let topo_tx_opt_ref = Box::leak(TopologyTxOperation::boxed(db_conn_pool.clone())) as &dyn StateOperationAny; let topo_log_opt_ref = Box::leak(TopologyLogOperation::boxed(db_conn_pool.clone())) @@ -505,7 +462,6 @@ impl StateMgr { SNAPSHOT_STATUS_STATE.to_string(), Arc::new(snapshot_status_opt_ref), ), - (PROXY_STATE.to_string(), Arc::new(proxy_opt_ref)), (TOPOLOGY_TX_STATE.to_string(), Arc::new(topo_tx_opt_ref)), (TOPOLOGY_LOG_STATE.to_string(), Arc::new(topo_log_opt_ref)), ]); @@ -675,7 +631,6 @@ mod tests { "t_deployment", "t_task_status", "t_snapshot_info", - "t_proxy", "t_topology_tx", "t_topology_log", ] diff --git a/src/devtools/Cargo.toml b/src/devtools/Cargo.toml deleted file mode 100644 index 0df61358..00000000 --- a/src/devtools/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -[package] -name = "devtools" -version.workspace = true -edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -anyhow = "1.0" -async-trait = "0.1" -clap = { version = "4", features = ["derive"] } -configparser = { version = "3.0.0", features = ["indexmap"] } -dialoguer = { version = "0.10", features = ["history", "completion", "fuzzy-select"] } -futures = "0.3" -futures-util = "0.3" -indicatif = "0.17" -libc = "0.2" -once_cell = "1" -os_pipe = "1" -reqwest = { version = "0.11", features = ["stream", "json"] } -serde = { version = "1", features = ["derive"] } -serde_derive = "1" -sysinfo = "0.27" -thiserror = "1" -tokio = { version = "1", features = ["full"] } -toml = "0.5.9" diff --git a/src/devtools/config/cassandra.toml b/src/devtools/config/cassandra.toml deleted file mode 100644 index 4d1de9df..00000000 --- a/src/devtools/config/cassandra.toml +++ /dev/null @@ -1,8 +0,0 @@ -[download] -url = "https://downloads.apache.org/cassandra/4.1-alpha1/apache-cassandra-4.1-alpha1-bin.tar.gz" - -[command] -start_script = ''' -#!/bin/bash -$CASSANDRA_HOME/bin/cassandra -f -''' \ No newline at end of file diff --git a/src/devtools/config/common-template.toml b/src/devtools/config/common-template.toml deleted file mode 100644 index 4048bd80..00000000 --- a/src/devtools/config/common-template.toml +++ /dev/null @@ -1,56 +0,0 @@ -workspace = "/test_workspace" -initialize_script = '''{INSTALL_DIR}/scripts/mysql_install_db --defaults-file=${CONFIG_FILE}/my-conf-1.cnf \ - --basedir={INSTALL_DIR} --datadir={DATA_DIR} --plugin-dir={INSTALL_DIR}/lib/plugin''' -[compile.download] -protobuf = { url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-cpp-3.17.3.tar.gz", build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/protobuf-3.17.3 -echo 'build protobuf' -pwd -./configure -make -j$(nproc) -make check -sudo make install -''' } - -[compile.git] -brpc = { git = "https://github.com/apache/incubator-brpc.git", third_party = true, build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/brpc -echo 'build brpc' -pwd -sh config_brpc.sh --headers=/usr/local/include --libs=/usr/local/lib --cc=clang --cxx=clang++ -make -j8 -''' } -braft = { git = "https://github.com/baidu/braft.git", build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/braft -echo 'build braft' -sed -i '' 's/libbrpc.a//g' CMakeLists.txt -mkdir -p bld && cd bld -cmake ../ -DOPENSSL_ROOT_DIR="/opt/homebrew/opt/openssl@1.1" -make -j8 -''' } -catch2 = { git = "https://github.com/catchorg/Catch2.git", branch = "v2.x", build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/catch2 -echo 'build catch2' -pwd -''' } -aws = { git = "https://github.com/aws/aws-sdk-cpp.git", options = ["--recurse-submodules"], build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/aws -echo 'build aws' -pwd -mkdir -p bld && cd bld -cmake ../ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=./output/ -DBUILD_SHARED_LIBS=OFF -DFORCE_SHARED_CRT=OFF -DBUILD_ONLY=dynamodb -make -j8 -make install -''' } -log_service = { git = "git@github.com:monographdb/log_service.git" } -tx_service = { git = "git@github.com:monographdb/tx_service.git" } -monograph = { git = "git@github.com:monographdb/monographdb_engine_for_mariadb.git" } -cass = { git = "https://github.com/datastax/cpp-driver.git" } -mariadb = { git = "git@github.com:monographdb/mariadb.git", branch = "monograph-10.6.5" } -[monograph] -storage = "cassandra" \ No newline at end of file diff --git a/src/devtools/config/common.toml b/src/devtools/config/common.toml deleted file mode 100644 index 4a2d8c18..00000000 --- a/src/devtools/config/common.toml +++ /dev/null @@ -1,104 +0,0 @@ -workspace = "/tmp/monograph_workspace" -initialize_script = ''' -#!/bin/bash -rm -rf ${MONOGRAPH_WORKSPACE_DIR}/monograph/datafarm/data_0/ -mkdir -p ${MONOGRAPH_WORKSPACE_DIR}/monograph/datafarm/data_0 -config_file_name=`ls ${MONOGRAPH_WORKSPACE_DIR}/monograph/etc/ | head -1` -echo ${config_file_name} -config_file_dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/etc/${config_file_name} -${MONOGRAPH_WORKSPACE_DIR}/monograph/install/scripts/mysql_install_db --defaults-file=${config_file_dir} \ - --basedir=${MONOGRAPH_WORKSPACE_DIR}/monograph/install \ - --datadir=${MONOGRAPH_WORKSPACE_DIR}/monograph/datafarm/data_0 \ - --plugin-dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/install/lib/plugin - ''' -[compile.download] -protobuf = { url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-cpp-3.17.3.tar.gz", build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/protobuf-3.17.3 -echo 'build protobuf' -pwd -./configure -make -j$(nproc) -make check -sudo make install -sudo ldconfig -''' } - -[compile.git] -brpc = { git = "https://github.com/apache/incubator-brpc.git", build = ''' -#!/bin/bash -brpc_dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/brpc -echo 'build brpc' -cd ${brpc_dir} -pwd -rm -rf ${brpc_dir}/build/* -cmake -B build -cmake --build build -j5 -sudo cp -r ${brpc_dir}/build/output/include/* /usr/include/ -sudo cp ${brpc_dir}/build/output/lib/* /usr/lib/ -sudo ldconfig -''' } -braft = { git = "https://github.com/baidu/braft.git", build = ''' -#!/bin/bash -braft_dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/braft -cd ${braft_dir} -pwd -mkdir -p bld && rm -rf ./bld/* && cd bld -cmake .. && make -j8 -sudo cp -r ${braft_dir}/bld/output/include/* /usr/include/ -sudo cp ${braft_dir}/bld/output/lib/* /usr/lib/ -sudo ldconfig -''' } -catch2 = { git = "https://github.com/catchorg/Catch2.git", branch = "v2.x", build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/catch2 -pwd -echo 'build catch2' -mkdir -p bld && rm -rf ./bld/* && cd bld -cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ -DCATCH_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -cmake --build . -j4 -sudo cmake --install . -sudo ldconfig -''' } -aws = { git = "https://github.com/aws/aws-sdk-cpp.git", options = ["--recurse-submodules"], build = ''' -#!/bin/bash -aws_cpp_sdk_dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/third_party/aws -cd ${aws_cpp_sdk_dir} -echo 'build aws' -pwd -mkdir -p bld && rm -rf bld/* && cd bld -cmake ../ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=./output/ -DBUILD_SHARED_LIBS=OFF -DFORCE_SHARED_CRT=OFF -DBUILD_ONLY=dynamodb -make -j8 -make install -sudo cp -r ${aws_cpp_sdk_dir}/bld/output/include/* /usr/include/ -sudo cp -r ${aws_cpp_sdk_dir}/bld/output/lib/* /usr/lib/ -sudo ldconfig -''' } -log_service = { git = "git@github.com:monographdb/log_service.git" } -tx_service = { git = "git@github.com:monographdb/tx_service.git" } -monograph = { git = "git@github.com:monographdb/monographdb_engine_for_mariadb.git" } -cass = { git = "https://github.com/datastax/cpp-driver.git" } -mariadb = { git = "git@github.com:monographdb/mariadb.git", branch = "monograph-10.6.5", build = ''' -#!/bin/bash -cd ${MONOGRAPH_WORKSPACE_DIR}/monograph/source/mariadb -echo 'build MonographDB' -pwd -mkdir -p bld && rm -rf ./bld/* && cd bld -cmake ../ -DCMAKE_INSTALL_PREFIX="${MONOGRAPH_WORKSPACE_DIR}/monograph/install" -DCMAKE_BUILD_TYPE=Debug \ - -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,PERFSCHEMA,SPIDER,SPHINX,HEAP,MYISAMMRG,SEQUENCE}=NO \ - -DINSTALL_MYSQLTESTDIR="" \ - -DCMAKE_CXX_FLAGS_DEBUG="${CMAKE_CXX_FLAGS_DEBUG} -Wno-error" -DMYSQL_MAINTAINER_MODE=OFF -DWITH_SSL=system -DWITH_DEBUG=1 -cmake --build . --config Debug -j4 -cmake --install . --config Debug -''' } -rocksdb = { git = "https://github.com/facebook/rocksdb.git", build= ''' -#!/bin/bash -rocksdb_dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/source/rocksdb -cd ${rocksdb_dir} -echo 'build rocksdb' -export PORTABLE=1 -make clean && make -j4 shared_lib && sudo make install-shared -sudo ldconfig -'''} -[monograph] -storage = "cassandra" diff --git a/src/devtools/config/deps/darwin b/src/devtools/config/deps/darwin deleted file mode 100644 index 04969d37..00000000 --- a/src/devtools/config/deps/darwin +++ /dev/null @@ -1,13 +0,0 @@ -git -cmake -ninja -libuv -glog -openssl@1.1 -openjdk@11 -gnu-getopt -coreutils -gflags -leveldb -gperftools -bison \ No newline at end of file diff --git a/src/devtools/config/deps/ubuntu b/src/devtools/config/deps/ubuntu deleted file mode 100644 index f8c6257d..00000000 --- a/src/devtools/config/deps/ubuntu +++ /dev/null @@ -1,26 +0,0 @@ -libcurl4-openssl-dev -build-essential -libncurses5-dev -bison -zlib1g-dev -ccache -cmake -ninja-build -libuv1-dev -git -g++ -make -libssl-dev -libgflags-dev -libgoogle-glog-dev -libprotobuf-dev -libprotoc-dev -protobuf-compiler -libleveldb-dev -libsnappy-dev -openssh-server -lcov -libbz2-dev -liblz4-dev -libzstd-dev -openjdk-11-jre-headless diff --git a/src/devtools/config/mysql/init.sql b/src/devtools/config/mysql/init.sql deleted file mode 100644 index f74cb02d..00000000 --- a/src/devtools/config/mysql/init.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TABLE IF NOT EXISTS test.test_table -( - i int primary key , - j int -) engine=monograph; -INSERT INTO test.test_table VALUES (11, 22); -INSERT INTO test.test_table VALUES (33, 44); -INSERT INTO test.test_table VALUES (55, 66); \ No newline at end of file diff --git a/src/devtools/config/mysql/mysql_template.cnf b/src/devtools/config/mysql/mysql_template.cnf deleted file mode 100644 index eaa1e8f2..00000000 --- a/src/devtools/config/mysql/mysql_template.cnf +++ /dev/null @@ -1,17 +0,0 @@ -[mariadb] -performance_schema=ON -plugin_maturity=experimental -datadir={DATD_DIR} -lc_messages_dir={INSTALL_DIR}/share -max_connections=500 -skip-log-bin -port=3317 -socket=/tmp/mysqld3317.sock -plugin_load_add=ha_monograph -monograph -monograph_cass_hosts=127.0.0.1 -monograph_core_num=1 -monograph_cass_user=cassandra -monograph_cass_password=cassandra -monograph_local_ip=127.0.0.1:8000 -monograph_ip_list=127.0.0.1:8000 \ No newline at end of file diff --git a/src/devtools/src/cmd/base.rs b/src/devtools/src/cmd/base.rs deleted file mode 100644 index 6b132bff..00000000 --- a/src/devtools/src/cmd/base.rs +++ /dev/null @@ -1,239 +0,0 @@ -use crate::cmd::cmd_utils::{cmd_process, get_process_bar}; -use indicatif::ProgressBar; -use std::collections::HashMap; -use std::fmt::{Debug, Display, Formatter}; -use std::io::Write; -use thiserror::Error; - -#[derive(Debug, Clone)] -pub enum CmdEnum { - CmdExec(CmdDef), - PipeExec(PipeDef), -} - -#[derive(Error, Debug)] -pub enum CmdErrorCode { - #[error("For now only support Ubuntu and MacOS. current OS is {0}")] - UnSupportOS(String), -} - -#[derive(Clone, Debug)] -pub struct CmdDef { - pub name: String, - pub args: Option>, - pub show_progress_type: Option, - // TODO refactor use generic - pub payload: Option>, -} - -impl CmdDef { - pub fn is_empty(&self) -> bool { - self.name.is_empty() - } -} - -#[derive(Clone, Debug, Default)] -pub struct PipeDef { - pub cmd_vec: Vec, -} - -impl Display for CmdDef { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - let args = if let Some(arg_vec) = self.args.clone() { - arg_vec.join(" ") - } else { - "None".to_string() - }; - - write!( - f, - "{}", - format_args!( - "{} {} {} payload={:#?}", - self.name, - args, - self.show_progress_type.clone().unwrap_or_default(), - self.payload - ) - ) - } -} - -impl CmdDef { - pub fn cmd_string(&self) -> String { - let args_string = if let Some(cmd_args) = &self.args { - cmd_args.join(" ") - } else { - "".to_string() - }; - format!("{} {}", self.name, args_string) - } -} - -impl Default for CmdDef { - fn default() -> Self { - Self { - name: "".to_string(), - args: None, - show_progress_type: None, - payload: None, - } - } -} - -pub trait CmdV2: 'static + Send { - type Executable: Default; - type StatsData; - /// Description of executable command, can be [`CmdDef`] or [`PipeDef`]. - /// for example : command -v brew. - fn definition(&self) -> Self::Executable; - /// Execute the command and log it, e.g.: brew list leveldb - fn exec( - &self, - context: &mut CmdContext, - ) -> Vec<(CmdDef, CmdStatus)> - where - Self::StatsData: Clone + Debug; -} - -#[derive(Clone, Debug)] -pub struct UserInfo { - pub is_root: bool, - pub has_sudo: bool, - pub user_name: String, -} - -#[derive(Clone, Debug)] -pub struct Platform { - pub os_type: String, - pub arch: String, - pub family: String, - pub deps: Vec, - pub user: UserInfo, -} - -#[derive(Clone, Debug)] -pub struct CmdStatus -where - T: Clone + Debug, -{ - pub success: bool, - pub output: Option, - /// The data returned by completing the command execution, - /// for i. e. checking the status of a process, will return information about it. - pub data: Option, -} - -impl Default for CmdStatus<()> { - fn default() -> Self { - CmdStatus { - success: false, - output: None, - data: None, - } - } -} - -impl Display for CmdStatus<()> { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - let prefix = if self.success { - "✅ success" - } else { - "❗error" - }; - let output_string = if let Some(output) = self.output.clone() { - output - } else { - "".to_string() - }; - write!(f, "{}", format_args!("{prefix} {output_string}")) - } -} - -impl Default for CmdStatus { - fn default() -> Self { - Self { - success: true, - output: None, - data: None, - } - } -} - -#[derive(Clone, Debug)] -pub struct CmdContext -where - Log: Write, -{ - logger: Log, -} - -pub fn default_stdout_process(stdout: &str, progress_bar: Option) { - if let Some(pb) = progress_bar { - pb.set_message(stdout.to_owned()); - } else { - println!("{stdout}") - } -} - -impl CmdContext -where - Log: Write, -{ - pub fn new(log: Log) -> Self { - Self { logger: log } - } - - pub fn cmd_run(&mut self, cmd: CmdDef, mut cmd_stdout: F) -> CmdStatus - where - F: FnMut(&str, Option), - S: Clone + Debug, - { - let mut runtime_log = String::default(); - let cmd_status = if let Some(progress_type) = cmd.clone().show_progress_type { - let pb = get_process_bar(progress_type.as_str(), cmd.name.as_str()); - cmd_process(cmd.clone(), |output_by_line: &str| { - runtime_log.push_str(output_by_line); - cmd_stdout(output_by_line, Some(pb.clone())); - }) - } else { - cmd_process(cmd.clone(), |output_by_line: &str| { - runtime_log.push_str(output_by_line); - cmd_stdout(output_by_line, None); - }) - }; - let write_status_to_log = writeln!( - self.logger, - "command={cmd}, \n{runtime_log}\n,status={cmd_status:?}", - ); - if let Err(write_log_err) = write_status_to_log { - println!("write {cmd:?} status to log error={write_log_err:?}"); - } - cmd_status - } - - pub fn logging(&mut self, log: String) { - let _rs = writeln!(self.logger, "{log}"); - } - - pub fn run_and_record_context(&mut self, cmd: CmdEnum) -> Vec<(CmdDef, CmdStatus<()>)> { - match cmd { - CmdEnum::CmdExec(cmd_def) => { - let cmd_status = self.cmd_run(cmd_def.clone(), |stdout, pb| { - default_stdout_process(stdout, pb) - }); - vec![(cmd_def, cmd_status)] - } - CmdEnum::PipeExec(pipe_def) => { - let mut cmd_status_rs: Vec<(CmdDef, CmdStatus<()>)> = Vec::new(); - for cmd_def in pipe_def.cmd_vec { - let cmd_status = self.cmd_run(cmd_def.clone(), |stdout, pb| { - default_stdout_process(stdout, pb) - }); - cmd_status_rs.push((cmd_def.clone(), cmd_status)); - } - cmd_status_rs - } - } - } -} diff --git a/src/devtools/src/cmd/check_mysql_status.rs b/src/devtools/src/cmd/check_mysql_status.rs deleted file mode 100644 index a01e26c7..00000000 --- a/src/devtools/src/cmd/check_mysql_status.rs +++ /dev/null @@ -1,134 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::mysql_ctl_util::list_mysql_cnf; -use std::fmt::Debug; -use std::io::Write; -use std::path::Path; -use sysinfo::{PidExt, ProcessExt, ProcessStatus, SystemExt}; - -#[derive(Clone, Debug)] -pub struct CheckMysqlStatus; - -#[derive(Clone, Default, Debug)] -pub struct MySQLProcess { - pub(crate) pid: u32, - pub(crate) cmd: Vec, -} - -impl MySQLProcess { - fn extract_cmd_arg(&self, arg_name: &str) -> Vec { - self.cmd - .iter() - .filter(|arg| (*arg).clone().contains(arg_name)) - .cloned() - .collect::>() - } - - pub fn is_monograph_instance(&self, monograph_conf_list: &[String]) -> bool { - println!("MonographDB config lis = {monograph_conf_list:?}"); - let exec_cmd = self - .cmd - .iter() - .filter(|arg| (*arg).contains("--defaults-file=")) - .cloned() - .collect::>(); - if exec_cmd.is_empty() { - false - } else { - for arg in exec_cmd { - if !arg.contains("--defaults-file=") { - continue; - } - let config_file = arg.replace("--defaults-file=", ""); - let file_name = Path::new(config_file.as_str()) - .file_name() - .unwrap() - .to_str() - .unwrap() - .to_string(); - println!("current mysql process config file {file_name}"); - if monograph_conf_list.contains(&file_name) { - return true; - } - } - false - } - } - - pub fn config_file(&self) -> Option { - let default_files = self.extract_cmd_arg("defaults-file"); - if default_files.is_empty() { - None - } else { - Some( - default_files - .first() - .unwrap() - .replace("--defaults-file=", ""), - ) - } - } -} - -impl CmdV2 for CheckMysqlStatus { - type Executable = CmdDef; - type StatsData = Vec; - - fn definition(&self) -> CmdDef { - CmdDef { - name: "check_mysql_status".to_string(), - args: None, - show_progress_type: None, - payload: None, - } - } - - fn exec( - &self, - context: &mut CmdContext, - ) -> Vec<(CmdDef, CmdStatus>)> { - let sys = sysinfo::System::new_all(); - let process_list = sys.processes_by_name("mysqld"); - let mut mysql_process_vec: Vec = Vec::new(); - let monograph_conf_list = list_mysql_cnf(None) - .iter() - .map(|p| { - Path::new(p.as_str()) - .file_name() - .unwrap() - .to_str() - .unwrap() - .to_string() - }) - .collect::>(); - for process in process_list { - //println!("{:?}", process); - if process.status() == ProcessStatus::Zombie { - continue; - } - let pid = process.pid(); - let process_info = MySQLProcess { - pid: pid.as_u32(), - cmd: process.cmd().to_vec(), - }; - if !process_info.is_monograph_instance(&monograph_conf_list) { - continue; - } - context.logging(format!( - "mysqld pid={:?}/cmd={:?}/cwd={:?}\n", - pid, - process.cmd(), - process.cwd() - )); - mysql_process_vec.push(process_info); - } - println!("found mysql process={mysql_process_vec:#?}"); - vec![( - self.definition(), - CmdStatus { - success: true, - output: None, - data: Some(mysql_process_vec), - }, - )] - } -} diff --git a/src/devtools/src/cmd/check_user_exists.rs b/src/devtools/src/cmd/check_user_exists.rs deleted file mode 100644 index 7df3f729..00000000 --- a/src/devtools/src/cmd/check_user_exists.rs +++ /dev/null @@ -1,67 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::cmd_utils::get_platform_info; -use crate::cmd::mysql_ctl_util::get_mysql_prepare_cmd; -use indicatif::ProgressBar; -use std::io::Write; - -pub struct CheckDBUser; - -impl CmdV2 for CheckDBUser { - type Executable = CmdDef; - type StatsData = bool; - - fn definition(&self) -> CmdDef { - let check_user_sql = vec![ - "-e".to_string(), - "select user from mysql.user where length(user)>0".to_string(), - ]; - get_mysql_prepare_cmd("root".to_string(), None, None, check_user_sql) - } - - fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus)> { - let cmd = self.definition(); - if cmd.is_empty() { - return vec![( - cmd, - CmdStatus { - success: false, - output: None, - data: Some(false), - }, - )]; - } - let user = get_platform_info(None).user.clone(); - if !user.has_sudo && !user.is_root { - return vec![( - cmd, - CmdStatus { - success: false, - output: Some("current user whether sudo privileges are available.".to_string()), - data: None, - }, - )]; - } - let mut user_table = Vec::default(); - let check_user_status = - context.cmd_run(cmd.clone(), |record: &str, _: Option| { - user_table.push(record.to_string()); - println!("{record}"); - }); - if !check_user_status.success { - return vec![(cmd, check_user_status)]; - } - let has_mono = user_table[1..] - .iter() - .filter(|user| <&String>::clone(user).eq("mono")) - .count() - > 0_usize; - vec![( - cmd, - CmdStatus { - success: true, - output: None, - data: Some(has_mono), - }, - )] - } -} diff --git a/src/devtools/src/cmd/cmd_const.rs b/src/devtools/src/cmd/cmd_const.rs deleted file mode 100644 index 4c85169a..00000000 --- a/src/devtools/src/cmd/cmd_const.rs +++ /dev/null @@ -1,64 +0,0 @@ -use once_cell::sync::Lazy; -use std::collections::HashMap; -use sysinfo::{SystemExt, UserExt}; - -pub static SYSTEM_DEPS: &[&str; 2] = &["darwin", "ubuntu"]; -pub static MONO_WATER_CONF: &str = "MONO_WATER_CONF_DIR"; -pub static PROTOBUF_TAR_FILE_NAME: &str = "protobuf-bin.tar.gz"; -pub static CASSANDRA_TAR_FILE_NAME: &str = "cassandra-bin.tar.gz"; - -pub static SUPPORT_CMD_LIST: Lazy> = Lazy::new(|| { - vec![ - "check_deps", - "install_deps", - "setup_workspace", - "ln_source", - "gen_mysql_cnf", - "build_all", - "build_monograph", - "playground", - "init_db", - "stop", - "start", - ] -}); - -pub static SYSTEM_INFO: Lazy> = Lazy::new(|| { - let mut sys_info_map = HashMap::new(); - let system = sysinfo::System::new_all(); - let os_type = system.name().unwrap().to_lowercase(); - sys_info_map.insert("os_type", os_type.clone()); - sys_info_map.insert("os_version", system.os_version().unwrap()); - let is_linux = os_type.eq("darwin"); - unsafe { - let (uid, euid) = (libc::getuid(), libc::geteuid()); - let current_super_user = system - .users() - .iter() - .filter(|user| user.id().to_string().eq(&uid.to_string())) - .map(|user| user.name()) - .collect::>(); - assert!(!current_super_user.is_empty()); - sys_info_map.insert("uid", uid.to_string()); - sys_info_map.insert("euid", euid.to_string()); - // is_root, has_sudo - let mut running_as = (false, false); - match (uid, euid) { - (0, 0) => running_as.0 = true, - (_, 0) => running_as.1 = true, - (_, _) => {} - }; - sys_info_map.insert("is_root", running_as.0.to_string()); - if is_linux { - sys_info_map.insert("has_sudo", (!current_super_user.is_empty()).to_string()); - } else { - //TODO check others OS_TYPE. currently if MacOS set default value. - sys_info_map.insert("has_sudo", true.to_string()); - } - sys_info_map.insert( - "current_user", - current_super_user.first().unwrap().to_string(), - ); - } - sys_info_map -}); diff --git a/src/devtools/src/cmd/cmd_macro.rs b/src/devtools/src/cmd/cmd_macro.rs deleted file mode 100644 index 21065890..00000000 --- a/src/devtools/src/cmd/cmd_macro.rs +++ /dev/null @@ -1,225 +0,0 @@ -use crate::cmd::base::*; -use crate::cmd::cmd_utils::*; -use crate::cmd::mysql_ctl_util::*; -use crate::extract_config_value; -use crate::{build_script, cmd}; - -#[macro_export] -macro_rules! check_deps_cmds { - ($platform:expr, $check_cmd:expr, $check_cmd_arg:expr) => {{ - use $crate::cmd::base::CmdDef; - $platform - .deps - .iter() - .map(|dep| CmdDef { - name: $check_cmd.to_string(), - args: Some(vec![$check_cmd_arg.to_string(), dep.to_string()]), - show_progress_type: Some("pipe".to_string()), - payload: None, - }) - .collect::>() - }}; -} - -#[macro_export] -macro_rules! sync_cmd_impl { - ($cmd_impl:ident, $cmd_obj:ident, $cmd_enum:ident, $cmd_build_closure:expr) => { - #[derive(Clone, Debug)] - pub struct $cmd_impl; - - impl Default for $cmd_impl { - fn default() -> Self { - $cmd_impl {} - } - } - - impl CmdV2 for $cmd_impl { - type Executable = $cmd_obj; - type StatsData = (); - - fn definition(&self) -> $cmd_obj { - $cmd_build_closure() - } - - fn exec( - &self, - context: &mut CmdContext, - ) -> Vec<(CmdDef, CmdStatus<()>)> { - context.run_and_record_context(CmdEnum::$cmd_enum(self.definition())) - } - } - }; -} - -sync_cmd_impl!(CheckDeps, PipeDef, PipeExec, || { - let platform = get_platform_info(None); - println!("current OS Name is {}", platform.os_type); - match platform.os_type.as_str() { - "darwin" => PipeDef { - cmd_vec: check_deps_cmds!(platform.clone(), "brew", "list"), - }, - "ubuntu" => PipeDef { - cmd_vec: check_deps_cmds!(platform.clone(), "dpkg", "-s"), - }, - _ => { - panic!("not support platform"); - } - } -}); - -sync_cmd_impl!(MkdirWorkspace, CmdDef, CmdExec, || { - use crate::config::{MONOGRAPH_WORKSPACE_DIR, WORKSPACE_LAYOUT}; - let workspace_dir = std::env::var(MONOGRAPH_WORKSPACE_DIR).unwrap(); - let workspace_layout = WORKSPACE_LAYOUT - .iter() - .map(|entry| format!("{}/{}", workspace_dir, entry.1)) - .collect::>(); - let mut cmd_args = vec!["-p".to_string()]; - cmd_args.extend(workspace_layout); - - CmdDef { - name: "mkdir".to_string(), - args: Some(cmd_args), - show_progress_type: None, - payload: None, - } -}); - -sync_cmd_impl!(ExtractProtobufFile, CmdDef, CmdExec, || { - use cmd::cmd_const::PROTOBUF_TAR_FILE_NAME; - extract_tar_cmd(PROTOBUF_TAR_FILE_NAME.to_string()) -}); - -sync_cmd_impl!(ExtractTarFile, PipeDef, PipeExec, || { - use cmd::cmd_const::{CASSANDRA_TAR_FILE_NAME, PROTOBUF_TAR_FILE_NAME}; - let extract_protobuf = extract_tar_cmd(PROTOBUF_TAR_FILE_NAME.to_string()); - let extract_cassandra = extract_tar_cmd(CASSANDRA_TAR_FILE_NAME.to_string()); - PipeDef { - cmd_vec: vec![extract_protobuf, extract_cassandra], - } -}); - -sync_cmd_impl!(LinkMonographSource, CmdDef, CmdExec, || { - CmdDef { - name: "bash".to_string(), - args: Some(vec![ - "-c".to_string(), - r#" - #!/bin/bash - source_dir=${MONOGRAPH_WORKSPACE_DIR}/monograph/source - monograph_dir=${source_dir}/monograph - mariadb_dir=${source_dir}/mariadb - printf "workspace source dir %s \n" ${source_dir} - printf "workspace monograph source dir %s \n" ${monograph_dir} - printf "workspace mariadb source dir %s \n" ${mariadb_dir} - cd ${mariadb_dir} - pwd - echo "MariaDB git submodule init" - git_submodel_init="git submodule init" - eval ${git_submodel_init} - echo "Link Monograph Source" - ln -nsf ${source_dir}/log_service ${source_dir}/tx_service/log_service - ln -nsf ${source_dir}/cass ${monograph_dir}/cass - ln -nsf ${source_dir}/tx_service ${monograph_dir}/tx_service - ln -nsf ${monograph_dir} ${mariadb_dir}/storage/monograph -"# - .to_string(), - ]), - show_progress_type: None, - payload: None, - } -}); - -sync_cmd_impl!(ProtobufBuild, PipeDef, PipeExec, || { - build_script!(download, "".to_string(), protobuf) -}); - -sync_cmd_impl!(GitRepoBuild, PipeDef, PipeExec, || { - build_script!( - git, - "".to_string(), - rocksdb, - brpc, - braft, - catch2, - aws, - mariadb - ) -}); - -sync_cmd_impl!(BuildMonograph, PipeDef, PipeExec, || { - build_script!(git, "".to_string(), mariadb) -}); - -sync_cmd_impl!(MkDataDir, PipeDef, PipeExec, || { mk_data_dir_cmd(3) }); -// TODO: fixed hard code -sync_cmd_impl!(CopySchemData, PipeDef, PipeExec, || { - copy_data_dir_cmd( - "data_0".to_string(), - vec![ - "data_1".to_string(), - "data_2".to_string(), - "data_3".to_string(), - ], - ) -}); - -sync_cmd_impl!(InitMySQLInstance, CmdDef, CmdExec, || { - let common = extract_config_value!("common", Common, "".to_string()).clone(); - let init_script = common.initialize_script; - CmdDef { - name: "bash".to_string(), - args: Some(vec!["-c".to_string(), init_script]), - show_progress_type: None, - payload: None, - } -}); - -sync_cmd_impl!(StoragePrepare, PipeDef, PipeExec, || { - let mut cmd_vec = vec![]; - let cassandra_bin = set_storage_env_cmd(None).unwrap(); - std::env::set_var("CASSANDRA_BIN_DIR", cassandra_bin); - if !storage_service_running() { - println!("cassandra not running. Starting cassandra"); - let start_cassandra = start_storage_service_cmd(None); - cmd_vec.push(start_cassandra); - } - PipeDef { cmd_vec } -}); - -sync_cmd_impl!(CreateDBUser, CmdDef, CmdExec, || { - let create_user_sql = vec![ - "-e".to_string(), - "CREATE USER 'mono'@'localhost' IDENTIFIED BY 'mono'".to_string(), - ]; - get_mysql_prepare_cmd("root".to_string(), None, None, create_user_sql) -}); - -#[cfg(test)] -mod tests { - use crate::build_script; - use crate::cmd::base::*; - use crate::cmd::cmd_utils::get_platform_info; - use crate::config::MONOGRAPH_WATER_CONFIG_DIR; - use crate::extract_config_value; - - // build time too long - #[test] - #[ignore] - pub fn test_monograph_build() { - let config_path = format!("{}/config", env!("CARGO_MANIFEST_DIR").to_owned()); - std::env::set_var(MONOGRAPH_WATER_CONFIG_DIR, config_path.clone()); - let platform = get_platform_info(Some(config_path)); - println!("platform = {:?}", platform.clone()); - if platform.os_type.eq("ubuntu") { - println!("current platform is ubuntu"); - sync_cmd_impl!(TestMariaDBBuild, PipeDef, PipeExec, || { - build_script!(git, "".to_string(), mariadb) - }); - - let stdout = std::io::stdout(); - let mut context = CmdContext::new(stdout); - TestMariaDBBuild {}.exec(&mut context); - } - } -} diff --git a/src/devtools/src/cmd/cmd_runner.rs b/src/devtools/src/cmd/cmd_runner.rs deleted file mode 100644 index 0d9cc284..00000000 --- a/src/devtools/src/cmd/cmd_runner.rs +++ /dev/null @@ -1,112 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::cmd_macro::*; -use crate::cmd::cmd_utils::cmd_status_ok; -use crate::cmd::ctl_mysql_process::{CtlMySQLProcess, MySQLOpCode}; -use crate::cmd::gen_mysql_cnf::GenMySQLConf; -use crate::cmd::init_db::InitDB; -use crate::cmd::install_deps::InstallDeps; -use crate::cmd::install_dev_deps::InstallDevDeps; -use crate::cmd::playground::Playground; -use crate::cmd::setup_workspace::SetupWorkspace; -use std::collections::HashMap; -use std::fs::File; - -#[macro_export] -macro_rules! cmd_exec { - ($self:ident, $cmd_str:expr, $cmd_impl:ident) => {{ - let context = $self.cmd_context_mapping.get($cmd_str); - $cmd_impl {}.exec(&mut context.unwrap().clone()) - }}; -} - -#[macro_export] -macro_rules! cmd_context_mapping { - ($log:expr $(,$cmd_string:expr)*) => {{ - let mut cmd_context_mapping = HashMap::new(); - $( - cmd_context_mapping.insert($cmd_string, CmdContext::new($log)); - )* - cmd_context_mapping - }} -} - -pub struct CmdRunner<'s> { - cmd_context_mapping: HashMap<&'s str, CmdContext<&'s File>>, -} - -impl<'s> CmdRunner<'s> { - pub fn new(log: &'s File) -> Self { - Self { - cmd_context_mapping: cmd_context_mapping!( - log, - "check_deps", - "install_deps", - "install_dev_deps", - "setup_workspace", - "ln_source", - "gen_mysql_cnf", - "build_all", - "build_monograph", - "init_db", - "playground", - "start", - "stop" - ), - } - } - - pub async fn run(&self, cmd: String) -> Vec<(CmdDef, CmdStatus<()>)> { - let cmd_str = cmd.as_str(); - match cmd_str { - "check_deps" => { - cmd_exec!(self, cmd_str, CheckDeps) - } - "install_deps" => { - cmd_exec!(self, cmd_str, InstallDeps) - } - "install_dev_deps" => { - let context = self.cmd_context_mapping.get(cmd_str); - InstallDevDeps {}.exec(&mut context.unwrap().clone()).await - } - "setup_workspace" => { - let context = self.cmd_context_mapping.get(cmd_str); - SetupWorkspace {}.exec(&mut context.unwrap().clone()).await - } - "ln_source" => { - cmd_exec!(self, cmd_str, LinkMonographSource) - } - "gen_mysql_cnf" => { - cmd_exec!(self, cmd_str, GenMySQLConf) - } - "build_all" => { - let mut protobuf_build = cmd_exec!(self, cmd_str, ProtobufBuild); - if !cmd_status_ok(&protobuf_build) { - protobuf_build - } else { - let git_repo_build = cmd_exec!(self, cmd_str, GitRepoBuild); - protobuf_build.extend(git_repo_build); - protobuf_build - } - } - "build_monograph" => { - cmd_exec!(self, cmd_str, BuildMonograph) - } - "init_db" => { - cmd_exec!(self, cmd_str, InitDB) - } - "start" | "stop" => { - let context = self.cmd_context_mapping.get(cmd_str); - let ctl_mysql = CtlMySQLProcess { - op_code: MySQLOpCode::from(cmd_str.to_string()), - }; - ctl_mysql.exec(&mut context.unwrap().clone()) - } - "playground" => { - cmd_exec!(self, cmd_str, Playground) - } - _ => { - unreachable!() - } - } - } -} diff --git a/src/devtools/src/cmd/cmd_utils.rs b/src/devtools/src/cmd/cmd_utils.rs deleted file mode 100644 index c63912ba..00000000 --- a/src/devtools/src/cmd/cmd_utils.rs +++ /dev/null @@ -1,427 +0,0 @@ -use crate::cmd::base::{CmdDef, CmdStatus, PipeDef, Platform, UserInfo}; -use crate::cmd::cmd_const::{SUPPORT_CMD_LIST, SYSTEM_DEPS, SYSTEM_INFO}; -use crate::config::{workspace_sub_dir, MONOGRAPH_WATER_CONFIG_DIR}; -use crate::extract_config_value; -use anyhow::anyhow; -use indicatif::{ProgressBar, ProgressStyle}; -use once_cell::sync::OnceCell; -use std::collections::HashMap; -use std::env; -use std::fmt::Debug; -use std::fs::{File, OpenOptions}; -use std::io::{BufRead, BufReader}; -use std::path::Path; -use std::str::FromStr; -use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use sysinfo::{ProcessExt, SystemExt}; - -pub fn get_platform_info(config_path: Option) -> &'static Platform { - static INSTANCE: OnceCell = OnceCell::new(); - INSTANCE.get_or_init(|| { - let sys_deps = load_deps(config_path); - let os_type = SYSTEM_INFO.get("os_type").unwrap(); - Platform { - os_type: os_type.clone(), - arch: env::consts::ARCH.to_string(), - family: env::consts::FAMILY.to_string(), - deps: sys_deps.get(os_type).unwrap().clone(), - user: UserInfo { - is_root: bool::from_str(SYSTEM_INFO.get("is_root").unwrap()).unwrap(), - has_sudo: bool::from_str(SYSTEM_INFO.get("has_sudo").unwrap()).unwrap(), - user_name: SYSTEM_INFO.get("current_user").unwrap().to_string(), - }, - } - }) -} - -pub fn default_log_handler() -> anyhow::Result { - let log = OpenOptions::new() - .write(true) - .create(true) - .truncate(true) - .open(create_log_path_and_get()); - if log.is_ok() { - Ok(log.ok().unwrap()) - } else { - Err(anyhow::Error::from(log.err().unwrap())) - } -} - -pub fn get_process_bar(progress_bar_type: &str, cmd: &str) -> ProgressBar { - match progress_bar_type { - "pipe" => pipe_progress_bar(cmd.to_string()), - "elapsed" => elapsed_progress_bar(None, None), - _ => unreachable!(), - } -} - -pub fn pipe_progress_bar(cmd_str: String) -> ProgressBar { - let cmd_pb = ProgressBar::new_spinner(); - cmd_pb.set_style( - ProgressStyle::default_bar() - .template(&format!("{{spinner:.dim.bold}} {cmd_str}: {{wide_msg}}")) - .unwrap() - .progress_chars("##-"), - ); - cmd_pb -} - -pub fn elapsed_progress_bar(len: Option, customer_msg: Option) -> ProgressBar { - let total_size = len.unwrap_or(0_u64); - let cmd_pb = ProgressBar::new(total_size); - let sty = if let Some(msg) = customer_msg { - format!( - "{{spinner:.green}} {msg:15}: [{{elapsed_precise}}] [{{wide_bar:.green/white}}] {{bytes}}/{{total_bytes}} ({{eta}})") - } else { - "{spinner:.green} [{elapsed_precise}] [{wide_bar:.green/white}] {bytes}/{total_bytes} ({eta})" - .to_string() - }; - cmd_pb.set_style( - ProgressStyle::default_spinner() - .template(sty.as_str()) - .unwrap() - .progress_chars("#>-"), - ); - cmd_pb -} - -pub fn cmd_process(cmd_desc: CmdDef, mut stdout_f: F) -> CmdStatus -where - F: FnMut(&str), - T: Clone + Debug, -{ - let mut cmd = std::process::Command::new(cmd_desc.name.as_str()); - if let Some(cmd_args) = cmd_desc.args.clone() { - let real_args = cmd_args.iter().map(|c| c.as_str()).collect::>(); - cmd.args(real_args); - } - - let pipe_rs = os_pipe::pipe(); - if let Ok((reader, writer)) = pipe_rs { - let writer_clone = writer.try_clone().unwrap(); - let mut child = cmd.stdout(writer).stderr(writer_clone).spawn().unwrap(); - drop(cmd); - - let buffer_reader = std::io::BufReader::new(reader); - for line_rs in buffer_reader.lines() { - let line = line_rs.unwrap(); - let stripped_line = line.trim(); - if !stripped_line.is_empty() { - stdout_f(stripped_line); - } - } - let child_exist_status = child.wait(); - if let Ok(exitstatus) = child_exist_status { - println!("{} success={}", cmd_desc, exitstatus.success()); - CmdStatus { - success: exitstatus.success(), - output: None, - data: None, - } - } else { - CmdStatus { - success: false, - output: None, //Some(stderr_output), - data: None, - } - } - } else { - CmdStatus { - success: false, - output: Some(format!( - "os_pipe::pipe() error. cause by {}", - pipe_rs.err().unwrap() - )), - data: None, - } - } -} - -pub fn all_support_cmd_string() -> String { - SUPPORT_CMD_LIST - .iter() - .map(|cmd_str| format!("\t{cmd_str}")) - .collect::>() - .join("\n") -} - -pub fn create_log_path_and_get() -> String { - let curr_path = if let Ok(log_path) = env::var("MONO_WAITER_LOG") { - log_path - } else { - "./.mono_devtools/logs".to_string() - }; - let path_buf = Path::new(&curr_path); - let rs = std::fs::create_dir_all(path_buf.as_os_str().to_str().unwrap()); - if let Err(err) = rs { - println!("Create Log root error path={curr_path} err={err:?}"); - } - curr_path + "/mono_devtools.log" -} - -pub fn cmd_status_ok(input_status: &[(CmdDef, CmdStatus)]) -> bool -where - T: Clone + Debug, -{ - input_status - .iter() - .filter(|(_, status)| !status.success) - .count() - == 0 -} - -pub fn extract_tar_cmd(file_name: String) -> CmdDef { - let third_party = workspace_sub_dir(None).get("third_party").unwrap().clone(); - CmdDef { - name: "tar".to_string(), - args: Some(vec![ - "-zxvf".to_string(), - format!("{third_party}/{file_name}"), - "-C".to_string(), - third_party, - ]), - show_progress_type: Some("pipe".to_string()), - payload: None, - } -} - -pub fn mk_data_dir_cmd(count: usize) -> PipeDef { - let sub_dir = workspace_sub_dir(None); - let data_dir = sub_dir.get("data").unwrap(); - let mut mkdir_cmd_vec = Vec::default(); - for i in 1..=count { - mkdir_cmd_vec.push(CmdDef { - name: "mkdir".to_string(), - args: Some(vec!["-p".to_string(), format!("{data_dir}/data_{i}")]), - show_progress_type: None, - payload: None, - }); - } - PipeDef { - cmd_vec: mkdir_cmd_vec, - } -} - -pub fn copy_data_dir_cmd(source_dir: String, dest_dir: Vec) -> PipeDef { - let sub_dir = workspace_sub_dir(None); - let data_dir = sub_dir.get("data").unwrap(); - let mut cp_cmd = vec![]; - for dest in dest_dir { - let absolute_dest_dir = format!("{data_dir}/{dest}"); - let cp_cmd_vec = ["mysql", "sys", "test", "performance_schema"] - .iter() - .map(|schema| { - let source = format!("{data_dir}/{source_dir}/{schema}"); - CmdDef { - name: "cp".to_string(), - args: Some(vec!["-r".to_string(), source, absolute_dest_dir.clone()]), - show_progress_type: None, - payload: None, - } - }) - .collect::>(); - cp_cmd.extend(cp_cmd_vec); - } - PipeDef { cmd_vec: cp_cmd } -} - -pub fn load_deps(deps_path: Option) -> HashMap> { - let sys_dep_path = if let Some(path) = deps_path { - format!("{path}/deps") - } else { - format!( - "{}/deps", - std::env::var(MONOGRAPH_WATER_CONFIG_DIR).unwrap() - ) - }; - let read_dir_rs = std::fs::read_dir(Path::new(sys_dep_path.as_str())); - if read_dir_rs.is_err() { - panic!("Load system deps failure. Please check if the path = {sys_dep_path}",); - } - let read_dir = read_dir_rs.unwrap(); - read_dir - .into_iter() - .map(|dir_entry_rs| dir_entry_rs.unwrap()) - .filter(|dir_entry_rs| { - let path = dir_entry_rs.path(); - path.is_file() - }) - .filter(|file_entry| { - let file_name_os_str = file_entry.file_name(); - let file_name_str = file_name_os_str.to_str().unwrap(); - SYSTEM_DEPS.contains(&file_name_str) - }) - .map(|file_entry| { - let path = file_entry.path(); - let file_name = path.file_name().unwrap(); - let file_name_str = file_name.to_str().unwrap().to_string(); - let file = std::fs::File::open(path).unwrap(); - let file_reader = BufReader::new(file); - let dep_list = file_reader - .lines() - .map_while(Result::ok) - .collect::>(); - - (file_name_str, dep_list) - }) - .collect::>>() -} - -pub fn storage_service_running() -> bool { - let sys = sysinfo::System::new_all(); - // for now monograph use cassandra - let process_vec = sys.processes_by_name("java"); - let has_process = process_vec - .into_iter() - .filter(|process| { - let process_cmd_args = process.cmd(); - process_cmd_args - .iter() - .filter(|cmd| !cmd.is_empty() && cmd.contains("cassandra")) - .count() - > 0 - }) - .count() - > 0; - println!("list java process {has_process}"); - if !has_process { - false - } else { - if let Ok(cassandra_bin_dir) = env::var("CASSANDRA_BIN_DIR") { - let node_tools = CmdDef { - name: "bash".to_string(), - args: Some(vec![ - "-c".to_string(), - format!("{cassandra_bin_dir}/nodetool status"), - ]), - show_progress_type: None, - payload: None, - }; - println!("Check cassandra status {node_tools}"); - let mut has_un_status = false; - let mut node_status_outpout = String::new(); - let status: CmdStatus<()> = cmd_process(node_tools, |stdout| { - node_status_outpout.push_str(format!("{stdout}\n").as_str()); - has_un_status = stdout.starts_with("UN"); - println!("{stdout}"); - }); - let mut has_host_name = false; - if has_un_status { - for line in node_status_outpout.lines() { - if line.trim().is_empty() { - continue; - } - if !line.contains(char::is_whitespace) { - continue; - } - if line.starts_with("UN") { - let split_rs = line.split_whitespace().collect::>(); - has_host_name = split_rs.len() == 8; - println!("{split_rs:?}"); - } - } - } - status.success && has_host_name - } else { - println!("not found ENV CASSANDRA_BIN_DIR"); - false - } - } -} - -pub fn wait_storage_status_running(interval: Duration) -> bool { - let mut retry_count = 0; - loop { - if retry_count > 500 { - break; - } - if storage_service_running() { - // dirty hack - std::thread::sleep(Duration::from_secs(5)); - return true; - } else { - std::thread::sleep(interval); - retry_count += 1 - } - } - storage_service_running() -} - -pub fn start_storage_service_cmd(third_party_dir: Option) -> CmdDef { - let set_env = set_storage_env_cmd(third_party_dir); - if set_env.is_err() { - panic!( - "set CASSANDRA_BIN_DIR Err. please check if \ - [$MONOGRAPH_WORKSPACE_DIR/thirty_party/cassandra_XXX] exists" - ); - } - let bin_dir = env::var("CASSANDRA_BIN_DIR").unwrap(); - let user_info = get_platform_info(None).clone().user; - let start = SystemTime::now(); - let since_the_epoch = start - .duration_since(UNIX_EPOCH) - .expect("Time went backwards"); - let in_ms = since_the_epoch.as_millis(); - let start_cmd = if user_info.has_sudo || user_info.is_root { - println!("It is not recommended to start with the root user"); - format!( - "{}/cassandra -f -R > {}/cassandra_start_{}.log 2>&1 &", - bin_dir, - format_args!("{bin_dir}/.."), - in_ms - ) - } else { - format!( - "{}/cassandra -f > {}/cassandra_start_{}.log 2>&1 &", - bin_dir, - format_args!("{bin_dir}/.."), - in_ms - ) - }; - CmdDef { - name: "bash".to_string(), - args: Some(vec!["-c".to_string(), start_cmd]), - show_progress_type: None, - payload: None, - } -} - -pub fn set_storage_env_cmd(dir: Option) -> anyhow::Result { - let third_path = if let Some(third_party_dir) = dir { - third_party_dir - } else { - let sub_dirs = workspace_sub_dir(None); - sub_dirs.get("third_party").unwrap().to_string() - }; - let red_dir = Path::new(third_path.as_str()).read_dir().unwrap(); - for dir_entry in red_dir { - if dir_entry.is_err() { - return Err(anyhow::Error::from(dir_entry.err().unwrap())); - } - let dir = dir_entry.unwrap(); - let path = dir.path(); - if path.is_dir() { - let file_name = path.file_name().unwrap().to_str().unwrap(); - if file_name.contains("cassandra") { - return Ok(format!("{}/bin", path.to_str().unwrap())); - } - } - } - Err(anyhow!("not found storage from {}", third_path)) -} - -pub fn workspace_is_empty(config: Option) -> bool { - let path_string = if let Some(config_path) = config { - config_path - } else { - "".to_string() - }; - let common = extract_config_value!("common", Common, path_string).clone(); - let workspace = common.workspace; - let path = Path::new(workspace.as_str()); - if !path.exists() { - true - } else { - std::fs::read_dir(path).unwrap().count() == 0 - } -} diff --git a/src/devtools/src/cmd/ctl_mysql_process.rs b/src/devtools/src/cmd/ctl_mysql_process.rs deleted file mode 100644 index 2dd4544a..00000000 --- a/src/devtools/src/cmd/ctl_mysql_process.rs +++ /dev/null @@ -1,179 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::check_mysql_status::CheckMysqlStatus; -use crate::cmd::cmd_macro::StoragePrepare; -use crate::cmd::cmd_utils::{cmd_status_ok, wait_storage_status_running}; -use crate::cmd::mysql_ctl_util::list_mysql_cnf; -use std::io::Write; -use std::path::Path; -use std::time::Duration; -use sysinfo::{Pid, PidExt, ProcessExt, SystemExt}; - -#[derive(Clone, Debug)] -pub enum MySQLOpCode { - Start, - Stop, -} - -impl From for String { - fn from(op_code: MySQLOpCode) -> Self { - match op_code { - MySQLOpCode::Start => "start".to_string(), - MySQLOpCode::Stop => "stop".to_string(), - } - } -} - -impl From for MySQLOpCode { - fn from(op_code_string: String) -> Self { - match op_code_string.to_lowercase().as_str() { - "start" => MySQLOpCode::Start, - "stop" => MySQLOpCode::Stop, - _ => unreachable!(), - } - } -} - -#[derive(Clone, Debug)] -pub struct CtlMySQLProcess { - pub op_code: MySQLOpCode, -} - -impl CmdV2 for CtlMySQLProcess { - type Executable = CmdDef; - type StatsData = (); - - fn definition(&self) -> CmdDef { - CmdDef { - name: format!("CtlMySQLProcess:{:?}", self.op_code.clone()), - args: None, - show_progress_type: None, - payload: None, - } - } - - fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - println!("Receive OP_CODE={:?}", self.op_code); - let mut mysql_cnf_list = list_mysql_cnf(None); - if mysql_cnf_list.is_empty() { - println!("MySQL config file not exists.in etc directory"); - return vec![( - CmdDef::default(), - CmdStatus { - success: false, - output: Some("not found mysql config in etc".to_string()), - data: None, - }, - )]; - } - let check_mysql = CheckMysqlStatus {}; - let check_mysql_status = check_mysql.exec(context); - if !cmd_status_ok(&check_mysql_status) { - return vec![( - CmdDef { - name: "check_mysql_status".to_string(), - args: None, - show_progress_type: None, - payload: None, - }, - CmdStatus::default(), - )]; - } - let (_, monnograph_process_list) = check_mysql_status.first().unwrap(); - assert!(monnograph_process_list.data.is_some()); - let process_list = monnograph_process_list.data.clone().unwrap(); - for process in process_list { - let config = process.config_file(); - if config.is_none() { - continue; - } - let cnf = config.unwrap(); - let process_file_name = Path::new(cnf.as_str()) - .file_name() - .unwrap() - .to_str() - .unwrap(); - mysql_cnf_list.retain(|x| { - let file_name = Path::new(x.as_str()).file_name().unwrap().to_str().unwrap(); - file_name == process_file_name - }); - } - let mut vec_rs = vec![]; - match self.op_code.clone() { - MySQLOpCode::Start => { - let start_storage_if_need = StoragePrepare {}.exec(context); - if !cmd_status_ok(&start_storage_if_need) { - println!("Storage Service may be not running. start storage service failed."); - return start_storage_if_need; - } - let storage_status_running = - wait_storage_status_running(Duration::from_millis(500)); - if !storage_status_running { - println!("cassandra is still unavailable. pleas check"); - return vec![(self.definition(), CmdStatus::default())]; - } - println!("use mysql config list = {mysql_cnf_list:?}"); - for cnf in &mysql_cnf_list { - println!("start mysql use default_file={cnf}"); - let file_name = Path::new(cnf.as_str()) - .file_name() - .unwrap() - .to_str() - .unwrap(); - let start_script = format!( - r#" - #!/bin/bash - install_dir=${{MONOGRAPH_WORKSPACE_DIR}}/monograph/install - echo ${{install_dir}} - now=`date +%F_%H_%M_%S` - log_file={}_${{now}}.log - mkdir_log_dir="mkdir -p ${{install_dir}}/logs/" - eval ${{mkdir_log_dir}} - start_cmd="${{install_dir}}/bin/mysqld --defaults-file={} > ${{install_dir}}/logs/${{log_file}} 2>&1 &" - echo ${{start_cmd}} - eval ${{start_cmd}} - "#, - file_name.replace(".cnf", ""), - cnf - ); - let cmd = CmdDef { - name: "bash".to_string(), - args: Some(vec!["-c".to_string(), start_script]), - show_progress_type: None, - payload: None, - }; - let status = context.cmd_run(cmd.clone(), |stdout, _| { - println!("{stdout}"); - }); - vec_rs.push((cmd, status)); - } - } - MySQLOpCode::Stop => { - let sys = sysinfo::System::new_all(); - for process in monnograph_process_list.data.clone().unwrap() { - let sys_process = sys.process(Pid::from_u32(process.pid)); - let mut kill_cmd_status = CmdStatus::default(); - if let Some(pro) = sys_process { - let kill_success = pro.kill(); - kill_cmd_status.success = kill_success; - println!("{process:?} stop {kill_success}"); - } else { - let output_msg = - format!("{process:?} not exit. Maybe the process has exited"); - kill_cmd_status.output = Some(output_msg.clone()); - println!("{output_msg}"); - } - vec_rs.push(( - CmdDef { - name: "kill".to_string(), - args: Some(vec![process.pid.to_string()]), - show_progress_type: None, - payload: None, - }, - kill_cmd_status, - )) - } - } - } - vec_rs - } -} diff --git a/src/devtools/src/cmd/download_third_party.rs b/src/devtools/src/cmd/download_third_party.rs deleted file mode 100644 index b40a2bd4..00000000 --- a/src/devtools/src/cmd/download_third_party.rs +++ /dev/null @@ -1,189 +0,0 @@ -use crate::cmd::base::{CmdDef, CmdStatus}; -use crate::cmd::cmd_utils::elapsed_progress_bar; - -use crate::cmd::cmd_const::{CASSANDRA_TAR_FILE_NAME, PROTOBUF_TAR_FILE_NAME}; -use crate::config::MONOGRAPH_WORKSPACE_DIR; -use crate::extract_config_value; -use futures::stream::StreamExt; -use futures_util::future::join_all; -use indicatif::MultiProgress; -use std::fs::File; -use std::io::Write; -use std::path::Path; - -#[macro_export] -macro_rules! download_task { - ($multi_progress:expr, $extract_closure:expr) => {{ - let extract_tuple = $extract_closure(); - let pb_m = $multi_progress.clone(); - let task_join = tokio::task::spawn(async move { - let task_rs = DownloadThirdParty::download_async( - pb_m, - extract_tuple.0, - format!("{}", extract_tuple.1), - format!("{}/{}", extract_tuple.2, "/monograph/third_party"), - ) - .await; - if task_rs.is_err() { - println!("{:?}", task_rs); - } - }); - task_join - }}; -} - -pub enum DownloadTarget { - All, - Protobuf, - Cassandra, -} - -#[allow(dead_code)] -pub struct DownloadThirdParty { - download_target: DownloadTarget, -} - -impl Default for DownloadThirdParty { - fn default() -> Self { - DownloadThirdParty::new(DownloadTarget::All) - } -} - -impl DownloadThirdParty { - pub fn new(target: DownloadTarget) -> Self { - Self { - download_target: target, - } - } - - async fn download_async( - multi_progress: MultiProgress, - resource_url: String, - download_file_name: String, - download_dest_path: String, - ) -> anyhow::Result<()> { - let rsp_rs = reqwest::get(resource_url.clone()).await; - if rsp_rs.is_err() { - return Err(anyhow::Error::from(rsp_rs.err().unwrap())); - } - let rsp = rsp_rs.unwrap(); - let download_file_tmp_path = - Path::new(download_dest_path.as_str()).join(download_file_name.clone()); - let download_file_rs = File::create(download_file_tmp_path.clone()); - - if download_file_rs.is_err() { - return Err(anyhow::Error::from(download_file_rs.err().unwrap())); - } - - let total_size = rsp - .content_length() - .ok_or(format!( - "Failed to get content length from '{}'", - resource_url.clone() - )) - .unwrap(); - - let pb = multi_progress.add(elapsed_progress_bar( - Some(total_size), - Some(download_file_name.clone()), - )); - - let mut download_stream = rsp.bytes_stream(); - let mut download_file = download_file_rs.unwrap(); - let mut downloaded = 0_u64; - while let Some(stream_chunk) = download_stream.next().await { - if stream_chunk.is_err() { - return Err(anyhow::Error::from(stream_chunk.err().unwrap())); - } - let chunk_bytes = stream_chunk.unwrap(); - let write_chunks = download_file.write_all(&chunk_bytes); - if write_chunks.is_err() { - return Err(anyhow::Error::from(write_chunks.err().unwrap())); - } - let new_progress = std::cmp::min(downloaded + (chunk_bytes.len() as u64), total_size); - downloaded = new_progress; - pb.set_position(downloaded); - } - pb.finish_with_message(format!("{} download compete", download_file_name.clone())); - Ok(()) - } - - pub async fn exec(&self) -> Vec<(CmdDef, CmdStatus<()>)> { - let multi_progress = MultiProgress::new(); - let workspace = std::env::var(MONOGRAPH_WORKSPACE_DIR) - .unwrap_or_else(|_| panic!("MONOGRAPH_WORKSPACE_DIR not set")); - - let join_all_vec = match self.download_target { - DownloadTarget::All => { - let protobuf_download_join = download_task!(multi_progress, || { - let common = extract_config_value!("common", Common, "".to_string()); - ( - common.clone().compile.download.protobuf.url, - PROTOBUF_TAR_FILE_NAME, - workspace.clone(), - ) - }); - let cassandra_download_join = download_task!(multi_progress, || { - let cassandra = extract_config_value!("cassandra", Storage, "".to_string()); - ( - cassandra.clone().download.url, - CASSANDRA_TAR_FILE_NAME, - workspace.clone(), - ) - }); - vec![protobuf_download_join, cassandra_download_join] - } - DownloadTarget::Cassandra => { - let cassandra_join = download_task!(multi_progress, || { - let cassandra = extract_config_value!("cassandra", Storage, "".to_string()); - ( - cassandra.clone().download.url, - CASSANDRA_TAR_FILE_NAME, - workspace.clone(), - ) - }); - vec![cassandra_join] - } - DownloadTarget::Protobuf => { - let protobuf_download_fn = || { - let common = extract_config_value!("common", Common, "".to_string()); - ( - common.clone().compile.download.protobuf.url, - PROTOBUF_TAR_FILE_NAME, - workspace.clone(), - ) - }; - let protobuf_download_join = download_task!(multi_progress, protobuf_download_fn); - vec![protobuf_download_join] - } - }; - - let download_join_all = join_all(join_all_vec).await; - multi_progress.clear().unwrap(); - let status = if download_join_all.is_empty() { - println!("WARN: Join download cli is empty."); - CmdStatus { - success: false, - output: Some("Download cli may be failed".to_string()), - data: None, - } - } else { - println!("Download third_party complete"); - CmdStatus { - success: true, - output: None, - data: None, - } - }; - - vec![( - CmdDef { - name: "Download Protobuf and Cassandra".to_string(), - args: None, - show_progress_type: None, - payload: None, - }, - status, - )] - } -} diff --git a/src/devtools/src/cmd/exec_init_sql_script.rs b/src/devtools/src/cmd/exec_init_sql_script.rs deleted file mode 100644 index 55ee62b5..00000000 --- a/src/devtools/src/cmd/exec_init_sql_script.rs +++ /dev/null @@ -1,72 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::mysql_ctl_util::get_mysql_prepare_cmd; -use crate::config::MONOGRAPH_WATER_CONFIG_DIR; -use std::fmt::Debug; -use std::io::Write; -use std::path::Path; - -pub struct ExecSqlScript; - -impl CmdV2 for ExecSqlScript { - type Executable = CmdDef; - type StatsData = (); - - fn definition(&self) -> CmdDef { - let config_path_rs = std::env::var(MONOGRAPH_WATER_CONFIG_DIR); - if config_path_rs.is_err() { - panic!("ENV MONOGRAPH_WATER_CONFIG_DIR not exists."); - } - let config_path = config_path_rs.unwrap(); - let script_path = format!("{config_path}/mysql/init.sql"); - let script_rs = std::fs::read_to_string(Path::new(script_path.as_str())); - if script_rs.is_err() { - println!("{}", script_rs.err().unwrap()); - panic!("Load init.sql script Error"); - } - let script = script_rs.unwrap(); - let sql_vec = script.split(';'); - let mut args = vec![]; - for sql in sql_vec { - args.push(sql.to_string()); - } - CmdDef { - name: "exec_init_sql_script".to_string(), - args: Some(args), - show_progress_type: None, - payload: None, - } - } - - fn exec( - &self, - context: &mut CmdContext, - ) -> Vec<(CmdDef, CmdStatus)> - where - Self::StatsData: Clone + Debug, - { - let sql_cmd = self.definition(); - for sql in sql_cmd.args.unwrap() { - println!(r#"Exec SQL {}"#, sql.clone()); - let exec_sql_cmd = get_mysql_prepare_cmd( - "root".to_string(), - None, - None, - vec!["-e".to_string(), sql.to_string()], - ); - let status: CmdStatus<()> = context.cmd_run(exec_sql_cmd.clone(), |stdout, _| { - println!("{stdout}"); - }); - if !status.success { - return vec![(self.definition(), status)]; - } - } - vec![( - self.definition(), - CmdStatus { - success: true, - output: None, - data: None, - }, - )] - } -} diff --git a/src/devtools/src/cmd/gen_mysql_cnf.rs b/src/devtools/src/cmd/gen_mysql_cnf.rs deleted file mode 100644 index ec98dc54..00000000 --- a/src/devtools/src/cmd/gen_mysql_cnf.rs +++ /dev/null @@ -1,135 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::config::workspace_sub_dir; -use crate::extract_config_value; -use std::io::Write; -use std::path::Path; - -const MYSQL_INSTANCE_COUNT: usize = 3; -const MARIADB_SECTION: &str = "mariadb"; - -pub struct GenMySQLConf; - -impl CmdV2 for GenMySQLConf { - type Executable = CmdDef; - type StatsData = (); - - fn definition(&self) -> CmdDef { - CmdDef { - name: "GenMySQLConf".to_string(), - args: None, - show_progress_type: None, - payload: None, - } - } - - fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - let mut mysql_cnf = extract_config_value!("mysql", MySQL, "".to_string()).clone(); - - let local_ip = mysql_cnf.get(MARIADB_SECTION, "eloq_local_ip"); - if local_ip.is_none() { - let err_msg = "not found config key monograph_local_ip"; - context.logging(err_msg.to_string()); - return self.error_status(err_msg); - } - - println!("eloq_local_ip = {local_ip:?}"); - let local_ip_rs = local_ip - .unwrap() - .split(':') - .next_back() - .unwrap() - .parse::(); - if local_ip_rs.is_err() { - let err_msg = "eloq_local_ip value illegal. The format must be IP:PORT"; - context.logging(err_msg.to_string()); - return self.error_status(err_msg); - } - - let local_ip_port = local_ip_rs.unwrap(); - let monograph_ip_list = (0..MYSQL_INSTANCE_COUNT) - .collect::>() - .iter() - .map(|i| { - let my_port = local_ip_port + (i * 10); - format!("127.0.0.1:{my_port}") - }) - .collect::>() - .join(","); - - let workspace_sub_dir = workspace_sub_dir(None); - let etc_dir = workspace_sub_dir.get("etc").unwrap().clone(); - let data_dir = workspace_sub_dir.get("data").unwrap(); - let install_dir = workspace_sub_dir.get("install").unwrap(); - - let service_port = mysql_cnf.get("mariadb", "port").unwrap(); - let mysql_port: usize = service_port.parse().unwrap(); - - for idx in 0..MYSQL_INSTANCE_COUNT { - mysql_cnf.set( - MARIADB_SECTION, - "socket", - Some(format!("/tmp/mysqld{}.sock", mysql_port + idx)), - ); - mysql_cnf.set( - MARIADB_SECTION, - "port", - Some((mysql_port + idx).to_string()), - ); - - mysql_cnf.set( - MARIADB_SECTION, - "datadir", - Some(format!("{}/data_{}", data_dir.clone(), (idx + 1))), - ); - mysql_cnf.set( - MARIADB_SECTION, - "lc_messages_dir", - Some(format!("{}/share", install_dir.clone())), - ); - - mysql_cnf.set( - MARIADB_SECTION, - "eloq_local_ip", - Some(format!("127.0.0.1:{}", local_ip_port + (idx * 10))), - ); - - mysql_cnf.set( - MARIADB_SECTION, - "eloq_ip_list", - Some(monograph_ip_list.clone()), - ); - let cnf_location = - format!("{}/{}-{}.cnf", etc_dir, "my-conf", mysql_port + idx,).clone(); - println!("GenMySQLCnf at {cnf_location}"); - - let write_rs = mysql_cnf.write(Path::new(cnf_location.as_str())); - if write_rs.is_err() { - let err_obj = write_rs.err().unwrap(); - let err_msg = err_obj.to_string(); - context.logging(err_msg.clone()); - return self.error_status(err_msg.as_str()); - } - } - vec![( - self.definition(), - CmdStatus { - success: true, - output: None, - data: None, - }, - )] - } -} - -impl GenMySQLConf { - fn error_status(&self, err_msg: &str) -> Vec<(CmdDef, CmdStatus<()>)> { - vec![( - self.definition(), - CmdStatus { - success: false, - output: Some(err_msg.to_string()), - data: None, - }, - )] - } -} diff --git a/src/devtools/src/cmd/git_clone_source.rs b/src/devtools/src/cmd/git_clone_source.rs deleted file mode 100644 index 0d3485b7..00000000 --- a/src/devtools/src/cmd/git_clone_source.rs +++ /dev/null @@ -1,80 +0,0 @@ -use crate::cmd::base::{CmdDef, CmdStatus}; -use crate::cmd::cmd_utils::cmd_process; -use crate::{extract_config_value, git_clone}; -use futures_util::future::join_all; -use std::sync::Arc; -use tokio::sync::Semaphore; - -// if the network situation is good, this restriction is not necessary. -static GIT_CLONE_SEMAPHORE: usize = 3; - -pub enum GitRepository { - MonographDB, - BuildAndRunDeps, - All, -} - -pub struct GitCloneSource { - git_repository: GitRepository, -} - -impl Default for GitCloneSource { - fn default() -> Self { - GitCloneSource::new(GitRepository::All) - } -} - -impl GitCloneSource { - pub fn new(git_repository: GitRepository) -> Self { - Self { git_repository } - } - - pub async fn exec(&self) -> Vec<(CmdDef, CmdStatus<()>)> { - let common = extract_config_value!("common", Common, "".to_string()); - let mut git_clone_status = vec![]; - let git = common.clone().compile.git; - let git_clone_cmd_vec = match self.git_repository { - GitRepository::All => { - git_clone!( - git, - brpc, - braft, - catch2, - rocksdb, - tx_service, - log_service, - monograph, - aws, - cass, - mariadb - ) - } - GitRepository::BuildAndRunDeps => { - git_clone!(git, brpc, braft, rocksdb, aws) - } - GitRepository::MonographDB => { - git_clone!(git, tx_service, log_service, monograph, cass, mariadb) - } - }; - let mut join_all_task_vec = Vec::new(); - let semaphore = Arc::new(Semaphore::new(GIT_CLONE_SEMAPHORE)); - for git_clone_cmd in git_clone_cmd_vec.clone() { - println!("{git_clone_cmd}"); - let permit = semaphore.clone().acquire_owned().await.unwrap(); - let task_handler = tokio::task::spawn(async move { - let cmd_status = cmd_process(git_clone_cmd.clone(), |stdout| { - println!("{stdout}"); - }); - drop(permit); - (git_clone_cmd, cmd_status) - }); - join_all_task_vec.push(task_handler); - } - let git_clone_all_rs = join_all(join_all_task_vec).await; - println!("{git_clone_all_rs:?}"); - for rs in git_clone_all_rs { - git_clone_status.push(rs.unwrap()); - } - git_clone_status - } -} diff --git a/src/devtools/src/cmd/init_db.rs b/src/devtools/src/cmd/init_db.rs deleted file mode 100644 index 044b190f..00000000 --- a/src/devtools/src/cmd/init_db.rs +++ /dev/null @@ -1,53 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::cmd_macro::{CopySchemData, InitMySQLInstance, MkDataDir, StoragePrepare}; -use crate::cmd::cmd_utils::{cmd_status_ok, wait_storage_status_running}; -use std::io::Write; -use std::time::Duration; - -pub struct InitDB; - -impl InitDB { - pub fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - let set_storage_env_status = StoragePrepare {}.exec(context); - if !cmd_status_ok(&set_storage_env_status) { - return set_storage_env_status; - } - println!("storage prepare success"); - let is_un_status = wait_storage_status_running(Duration::from_millis(500)); - if !is_un_status { - println!("cassandra is still unavailable. pleas check"); - return vec![( - CmdDef { - name: "init_db".to_string(), - args: None, - show_progress_type: None, - payload: None, - }, - CmdStatus::default(), - )]; - } - let init_db_instance = InitMySQLInstance {}; - let db_instance_status = init_db_instance.exec(context); - if !cmd_status_ok(&db_instance_status) { - return db_instance_status; - } - println!("MySQL DB Initialize success"); - let mk_data_dir_status = MkDataDir {}.exec(context); - if !cmd_status_ok(&mk_data_dir_status) { - return mk_data_dir_status; - } - println!("mk data dir success"); - let copy_schema_data = CopySchemData {}.exec(context); - if !cmd_status_ok(©_schema_data) { - return copy_schema_data; - } - println!("copy data dir success"); - [ - &set_storage_env_status[..], - &db_instance_status[..], - &mk_data_dir_status[..], - ©_schema_data[..], - ] - .concat() - } -} diff --git a/src/devtools/src/cmd/install_deps.rs b/src/devtools/src/cmd/install_deps.rs deleted file mode 100644 index 21780f62..00000000 --- a/src/devtools/src/cmd/install_deps.rs +++ /dev/null @@ -1,67 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdEnum, CmdStatus, CmdV2, PipeDef, Platform}; -use crate::cmd::cmd_macro::CheckDeps; -use crate::cmd::cmd_utils::get_platform_info; -use std::io::Write; - -pub struct InstallDeps; - -impl InstallDeps { - pub fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - let check_deps = CheckDeps {}; - let check_dep_rs = check_deps.exec(context); - let mut install_dep_pipe = Vec::new(); - let platform = get_platform_info(None); - let user_info = platform.clone().user; - println!("install_dep exec current user {user_info:?}"); - let use_sudo = !user_info.is_root && user_info.has_sudo; - for (cmd, status) in &check_dep_rs { - if !status.success { - let args = cmd.clone().args.unwrap(); - let dep_name = args.get(1).unwrap(); - let install_dep = - install_deps_cmd(dep_name.to_string(), platform.clone(), use_sudo); - println!("Package {dep_name} not install {install_dep}"); - install_dep_pipe.push(install_dep); - } - } - if install_dep_pipe.is_empty() { - println!("Success, All dependencies are installed."); - vec![] - } else { - context.run_and_record_context(CmdEnum::PipeExec(PipeDef { - cmd_vec: install_dep_pipe, - })) - } - } -} - -fn install_deps_cmd(dep: String, platform: Platform, use_sudo: bool) -> CmdDef { - match platform.os_type.as_str() { - "darwin" => CmdDef { - name: "brew".to_string(), - args: Some(vec!["install".to_string(), dep]), - show_progress_type: None, - payload: None, - }, - "ubuntu" => { - let def_cmd_args = vec!["install".to_string(), "-y".to_string(), dep]; - let cmd = if use_sudo { - ( - "/usr/bin/sudo".to_string(), - [&vec!["apt-get".to_string()][..], &def_cmd_args[..]].concat(), - ) - } else { - ("apt-get".to_string(), def_cmd_args) - }; - CmdDef { - name: cmd.0, - args: Some(cmd.1), - show_progress_type: Some("pipe".to_string()), - payload: None, - } - } - _ => { - panic!("not support platform"); - } - } -} diff --git a/src/devtools/src/cmd/install_dev_deps.rs b/src/devtools/src/cmd/install_dev_deps.rs deleted file mode 100644 index d0962454..00000000 --- a/src/devtools/src/cmd/install_dev_deps.rs +++ /dev/null @@ -1,38 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::cmd_macro::ExtractProtobufFile; -use crate::cmd::cmd_utils::cmd_status_ok; -use crate::cmd::download_third_party::{DownloadTarget, DownloadThirdParty}; -use crate::cmd::git_clone_source::{GitCloneSource, GitRepository}; -use std::io::Write; - -pub struct InstallDevDeps; - -impl InstallDevDeps { - pub async fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - let download_protobuf = DownloadThirdParty::new(DownloadTarget::Protobuf); - - let download_protobuf_status = download_protobuf.exec().await; - if !cmd_status_ok(&download_protobuf_status) { - download_protobuf_status - } else { - println!("download protobuf success."); - let extract_protobuf = ExtractProtobufFile {}; - let extract_protobuf_status = extract_protobuf.exec(context); - if !cmd_status_ok(&extract_protobuf_status) { - return extract_protobuf_status; - } - let git_clone_source = GitCloneSource::new(GitRepository::BuildAndRunDeps); - let git_clone_status = git_clone_source.exec().await; - if !cmd_status_ok(&git_clone_status) { - return git_clone_status; - } - println!("git clone build and runtime dependencies success."); - [ - &download_protobuf_status[..], - &extract_protobuf_status[..], - &git_clone_status[..], - ] - .concat() - } - } -} diff --git a/src/devtools/src/cmd/mod.rs b/src/devtools/src/cmd/mod.rs deleted file mode 100644 index 11459ecc..00000000 --- a/src/devtools/src/cmd/mod.rs +++ /dev/null @@ -1,18 +0,0 @@ -pub mod base; -pub mod check_mysql_status; -pub mod check_user_exists; -pub mod cmd_const; -pub mod cmd_macro; -pub mod cmd_runner; -pub mod cmd_utils; -pub mod ctl_mysql_process; -pub mod download_third_party; -pub mod exec_init_sql_script; -pub mod gen_mysql_cnf; -pub mod git_clone_source; -pub mod init_db; -pub mod install_deps; -mod install_dev_deps; -pub mod mysql_ctl_util; -pub mod playground; -pub mod setup_workspace; diff --git a/src/devtools/src/cmd/mysql_ctl_util.rs b/src/devtools/src/cmd/mysql_ctl_util.rs deleted file mode 100644 index 3444bd3f..00000000 --- a/src/devtools/src/cmd/mysql_ctl_util.rs +++ /dev/null @@ -1,96 +0,0 @@ -use crate::cmd::base::CmdDef; -use crate::cmd::cmd_utils::get_platform_info; -use crate::config::workspace_sub_dir; -use anyhow::anyhow; -use std::path::Path; - -pub(crate) fn connect_mysqld_from_cli( - user: String, - pwd: Option, - cnf: String, -) -> Vec { - let sub_dirs = workspace_sub_dir(None); - let install_dir = sub_dirs.get("install").unwrap().clone(); - let sock_file = pick_up_mysql_sock(cnf); - let set_pwd = if let Some(password) = pwd { - format!("--password='{password}'") - } else { - "--password=''".to_string() - }; - vec![ - format!("{install_dir}/bin/mysql"), - "-u".to_string(), - user, - "-p".to_string(), - "mysql".to_string(), - set_pwd, - "-S".to_string(), - sock_file.unwrap(), - ] -} - -pub(crate) fn get_mysql_prepare_cmd( - user: String, - pwd: Option, - config: Option, - cmd_args: Vec, -) -> CmdDef { - let user_info = get_platform_info(None).clone().user; - if !user_info.has_sudo && !user_info.is_root { - println!("Creating a user requires Sudo privileges. Please switch users to execute it."); - return CmdDef::default(); - } - let mysql_conf = list_mysql_cnf(config); - if mysql_conf.is_empty() { - println!("not found mysql config in $MONOGRAPH_WORKSPACE_DIR/etc"); - CmdDef::default() - } else { - let conn_mysql = - connect_mysqld_from_cli(user, pwd, mysql_conf.first().unwrap().to_string()); - CmdDef { - name: "/usr/bin/sudo".to_string(), - args: Some([&conn_mysql[..], &cmd_args[..]].concat()), - show_progress_type: None, - payload: None, - } - } -} - -pub(crate) fn pick_up_mysql_sock(config_file: String) -> anyhow::Result { - let mut mysql_ini = configparser::ini::Ini::new(); - let load_config_rs = mysql_ini.load(config_file.as_str()); - if load_config_rs.is_err() { - println!("load config_file error. Please check whether the {config_file} exists",); - Err(anyhow!(load_config_rs.err().unwrap())) - } else { - Ok(mysql_ini.get("mariadb", "socket").unwrap()) - } -} - -pub(crate) fn list_mysql_cnf(config: Option) -> Vec { - let sub_dirs = workspace_sub_dir(config); - let etc_config = sub_dirs.get("etc").unwrap(); - let dir_entry_set = std::fs::read_dir(Path::new(etc_config)); - if dir_entry_set.is_err() { - println!( - "etc directory does not exist. Perhaps you can execute the setup_workspace command" - ); - return vec![]; - } - let mut my_cnf_vec = Vec::new(); - for dir_entry in dir_entry_set.unwrap() { - let entry = dir_entry.unwrap(); - let file_path = entry.path(); - if !file_path.is_file() { - continue; - } - let extension = file_path.extension(); - if let Some(extension_name) = extension { - let file_name_str = extension_name.to_str().unwrap(); - if file_name_str.eq("cnf") { - my_cnf_vec.push(file_path.as_path().to_str().unwrap().to_string()); - } - } - } - my_cnf_vec -} diff --git a/src/devtools/src/cmd/playground.rs b/src/devtools/src/cmd/playground.rs deleted file mode 100644 index 00b5fd47..00000000 --- a/src/devtools/src/cmd/playground.rs +++ /dev/null @@ -1,65 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::check_user_exists::CheckDBUser; -use crate::cmd::cmd_macro::CreateDBUser; -use crate::cmd::cmd_utils::cmd_status_ok; -use crate::cmd::ctl_mysql_process::{CtlMySQLProcess, MySQLOpCode}; -use crate::cmd::exec_init_sql_script::ExecSqlScript; -use std::io::Write; - -/// If needed, start the MonographDB service, -/// create the user and the create the tables, and insert. -pub struct Playground; - -impl CmdV2 for Playground { - type Executable = CmdDef; - type StatsData = (); - - fn definition(&self) -> CmdDef { - CmdDef { - name: "playground".to_string(), - args: None, - show_progress_type: None, - payload: None, - } - } - - fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - let start_mysql = CtlMySQLProcess { - op_code: MySQLOpCode::Start, - }; - let start_service_if_need = start_mysql.exec(context); - if !cmd_status_ok(&start_service_if_need) { - return start_service_if_need; - } - let check_db_user: Vec<(CmdDef, CmdStatus)> = CheckDBUser {}.exec(context); - if !cmd_status_ok(&check_db_user) { - println!("Check database user [mono] failed."); - return vec![(self.definition(), CmdStatus::default())]; - } - let (_, db_user_exists) = check_db_user.first().unwrap().clone(); - println!("User momo exists = {:?}", db_user_exists.data); - if !db_user_exists.data.unwrap() { - let create_user_rs = CreateDBUser {}.exec(context); - if !cmd_status_ok(&create_user_rs) { - println!("Create database user failed. "); - return vec![(self.definition(), CmdStatus::default())]; - } - println!("create mono success."); - } else { - let exec_sql_script = ExecSqlScript {}; - let run_sql_status = exec_sql_script.exec(context); - if !cmd_status_ok(&run_sql_status) { - println!("exec script failed"); - return vec![(self.definition(), CmdStatus::default())]; - } - } - vec![( - self.definition(), - CmdStatus { - success: true, - output: None, - data: None, - }, - )] - } -} diff --git a/src/devtools/src/cmd/setup_workspace.rs b/src/devtools/src/cmd/setup_workspace.rs deleted file mode 100644 index e6a20c5d..00000000 --- a/src/devtools/src/cmd/setup_workspace.rs +++ /dev/null @@ -1,57 +0,0 @@ -use crate::cmd::base::{CmdContext, CmdDef, CmdStatus, CmdV2}; -use crate::cmd::cmd_macro::{ExtractTarFile, MkdirWorkspace}; -use crate::cmd::cmd_utils::{cmd_status_ok, workspace_is_empty}; -use crate::cmd::download_third_party::DownloadThirdParty; -use crate::cmd::git_clone_source::GitCloneSource; -use std::io::Write; - -pub struct SetupWorkspace {} - -impl SetupWorkspace { - // TODO use macro impl - pub async fn exec(&self, context: &mut CmdContext) -> Vec<(CmdDef, CmdStatus<()>)> { - if !workspace_is_empty(None) { - println!("current workspace dir is not empty"); - return vec![( - CmdDef::default(), - CmdStatus { - success: false, - output: Some("workspace dir is not empty.please clear it".to_string()), - data: None, - }, - )]; - } - let mkdir_workspace = MkdirWorkspace {}; - let download_third_party = DownloadThirdParty::default(); - let git_clone_source = GitCloneSource::default(); - let extract_tar = ExtractTarFile {}; - let mk_workspace = mkdir_workspace.exec(context); - if !cmd_status_ok(&mk_workspace) { - mk_workspace - } else { - println!("mkdir workspace success."); - let download_status = download_third_party.exec().await; - if !cmd_status_ok(&download_status) { - return download_status; - } - println!("download third party resource success."); - let extract_status = extract_tar.exec(context); - if !cmd_status_ok(&extract_status) { - return extract_status; - } - println!("extract tar file success."); - let git_clone_status = git_clone_source.exec().await; - if !cmd_status_ok(&git_clone_status) { - return git_clone_status; - } - println!("git clone third party source code success."); - [ - &mk_workspace[..], - &download_status[..], - &extract_status[..], - &git_clone_status[..], - ] - .concat() - } - } -} diff --git a/src/devtools/src/config/common.rs b/src/devtools/src/config/common.rs deleted file mode 100644 index 7be1b487..00000000 --- a/src/devtools/src/config/common.rs +++ /dev/null @@ -1,81 +0,0 @@ -use once_cell::sync::Lazy; -use serde_derive::Deserialize; - -pub static MONOGRAPH_GIT_REPOS: Lazy> = Lazy::new(|| { - vec![ - "rocksdb".to_string(), - "log_service".to_string(), - "tx_service".to_string(), - "monograph".to_string(), - "cass".to_string(), - "mariadb".to_string(), - ] -}); - -#[derive(Clone, Debug, Deserialize)] -pub struct Common { - pub workspace: String, - pub initialize_script: String, - pub compile: Compile, - pub monograph: Monograph, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct Compile { - pub download: Download, - pub git: Git, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct Monograph { - pub storage: String, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct Git { - pub brpc: GitArgs, - pub braft: GitArgs, - pub catch2: GitArgs, - pub aws: GitArgs, - pub log_service: GitArgs, - pub tx_service: GitArgs, - pub monograph: GitArgs, - pub cass: GitArgs, - pub mariadb: GitArgs, - pub rocksdb: GitArgs, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct GitArgs { - pub git: String, - pub branch: Option, - pub build: Option, - pub options: Option>, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct Download { - pub protobuf: DownloadArgs, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct DownloadArgs { - pub url: String, - pub build: Option, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct Cassandra { - pub download: CassandraDownload, - pub command: CassandraCommand, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct CassandraDownload { - pub url: String, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct CassandraCommand { - pub start_script: String, -} diff --git a/src/devtools/src/config/config_macro.rs b/src/devtools/src/config/config_macro.rs deleted file mode 100644 index 1f385289..00000000 --- a/src/devtools/src/config/config_macro.rs +++ /dev/null @@ -1,126 +0,0 @@ -#[macro_export] -macro_rules! extract_config_value { - ($config_obj_key:expr, $config_obj:ident, $input_config_path:expr) => {{ - use $crate::config::load_config; - use $crate::config::ConfigObject; - use $crate::config::MONOGRAPH_WATER_CONFIG_DIR; - let mut input_path = $input_config_path; - if input_path.is_empty() { - input_path = std::env::var(MONOGRAPH_WATER_CONFIG_DIR).unwrap_or_else(|_| { - panic!("Maybe it's a bug.The path to the config file must exist") - }); - } - let config_mapping = load_config(input_path.as_str()); - let config_obj = config_mapping.get($config_obj_key).unwrap(); - let rtn_value = match config_obj { - ConfigObject::$config_obj(data) => data, - _ => unreachable!(), - }; - rtn_value - }}; -} - -#[macro_export] -macro_rules! build_script { - ($compile_obj:ident, $config_path:expr $(,$repo:ident)*) => {{ - use $crate::cmd::base::{CmdDef, PipeDef}; - let mut cmd_vec: Vec = Vec::new(); - let common = extract_config_value!("common", Common, $config_path).clone(); - $( - let build_script = common.compile.$compile_obj.$repo.build.unwrap_or_else(|| "echo 'no build script'".to_string()); - let cmd = CmdDef { - name: "bash".to_string(), - args: Some(vec!["-c".to_string(), format!(r"{}", build_script)]), - show_progress_type: None, - payload: None - }; - cmd_vec.push(cmd); - )* - PipeDef { cmd_vec } - }}; -} - -#[macro_export] -macro_rules! load_toml_config { - ($config_path:expr, $config_type:ty) => {{ - use std::path::Path; - let config_binary = std::fs::read(Path::new($config_path)) - .unwrap_or_else(|_| panic!("can't read common.toml from path = {}", $config_path)); - let obj: $config_type = toml::from_slice(&config_binary).unwrap(); - obj - }}; -} - -#[macro_export] -macro_rules! git_clone { - ($git_obj:expr $(,$git_attr:ident)*) => {{ - use $crate::cmd::base::CmdDef; - use $crate::config::workspace_sub_dir; - use $crate::config::common::MONOGRAPH_GIT_REPOS; - let mut cmd_desc_vec: Vec = vec![]; - let workspace_sub_dirs = workspace_sub_dir(None); - $( - let mut cmd_desc = CmdDef::default(); - cmd_desc.name = "git".to_string(); - let mut git_clone_args = vec!["clone".to_string()]; - if let Some(git_option) = $git_obj.$git_attr.options { - git_clone_args.extend(git_option); - } - let git_repo = std::stringify!($git_attr).to_string(); - - let dest_dir = if MONOGRAPH_GIT_REPOS.contains(&git_repo) { - workspace_sub_dirs.get("source").unwrap() - } else { - workspace_sub_dirs.get("third_party").unwrap() - }; - let dest_name = format!("{}/{}", dest_dir, std::stringify!($git_attr).to_string()); - if let Some(branch_name) = $git_obj.$git_attr.branch { - git_clone_args.extend(vec!["-b".to_string(), branch_name, $git_obj.$git_attr.git, dest_name]); - } else { - git_clone_args.extend(vec![$git_obj.$git_attr.git, dest_name]); - } - cmd_desc.args = Some(git_clone_args); - cmd_desc_vec.push(cmd_desc); - )* - cmd_desc_vec - }}; -} - -#[cfg(test)] -mod tests { - use crate::config::common::{Git, GitArgs}; - use crate::config::MONOGRAPH_WATER_CONFIG_DIR; - use std::env; - - #[test] - pub fn test_git_clone_macro() { - let test_git_attr = GitArgs { - git: "https://github.com/apache/incubator-brpc.git".to_string(), - branch: Some("v2.x".to_string()), - build: None, - options: None, - }; - let git = Git { - brpc: test_git_attr.clone(), - braft: test_git_attr.clone(), - catch2: test_git_attr.clone(), - aws: test_git_attr.clone(), - log_service: test_git_attr.clone(), - tx_service: test_git_attr.clone(), - monograph: test_git_attr.clone(), - cass: test_git_attr.clone(), - mariadb: test_git_attr.clone(), - rocksdb: test_git_attr, - }; - let git_string = stringify!(Git); - let root = env!("CARGO_MANIFEST_DIR"); - let config_path = format!("{}/{}", root, "config"); - env::set_var(MONOGRAPH_WATER_CONFIG_DIR, config_path); - let common = extract_config_value!("common", Common, "".to_string()); - env::set_var(MONOGRAPH_WATER_CONFIG_DIR, common.clone().workspace); - println!("git_string {}", git_string.to_string().to_lowercase()); - let git_cmd = git_clone!(git, brpc, braft); - println!("Cmd {git_cmd:?}"); - assert_eq!(2, git_cmd.len()) - } -} diff --git a/src/devtools/src/config/mod.rs b/src/devtools/src/config/mod.rs deleted file mode 100644 index 2b913a8d..00000000 --- a/src/devtools/src/config/mod.rs +++ /dev/null @@ -1,134 +0,0 @@ -use crate::config::common::{Cassandra, Common}; -use configparser::ini::Ini; -use once_cell::sync::{Lazy, OnceCell}; -use std::collections::HashMap; - -pub mod common; -#[macro_use] -pub mod config_macro; - -pub static MONOGRAPH_WATER_CONFIG_DIR: &str = "MONO_WATER_CONF_DIR"; -pub static MONOGRAPH_WORKSPACE_DIR: &str = "MONOGRAPH_WORKSPACE_DIR"; - -pub static WORKSPACE_LAYOUT: Lazy> = Lazy::new(|| { - let mut workspace_layout_map = HashMap::new(); - workspace_layout_map.insert("data".to_string(), "/monograph/datafarm".to_string()); - workspace_layout_map.insert("etc".to_string(), "/monograph/etc".to_string()); - workspace_layout_map.insert("install".to_string(), "/monograph/install".to_string()); - workspace_layout_map.insert("source".to_string(), "/monograph/source".to_string()); - workspace_layout_map.insert( - "third_party".to_string(), - "/monograph/third_party".to_string(), - ); - workspace_layout_map -}); - -pub enum ConfigObject { - Common(Box), - Storage(Cassandra), - MySQL(Ini), -} - -pub fn workspace_sub_dir(path: Option) -> HashMap { - let workspace = if let Some(config_path) = path { - extract_config_value!("common", Common, config_path) - .clone() - .workspace - } else { - extract_config_value!("common", Common, "".to_string()) - .clone() - .workspace - }; - WORKSPACE_LAYOUT - .iter() - .map(|entry| { - ( - entry.0.clone(), - format!("{}/{}", workspace, entry.1.clone()), - ) - }) - .collect::>() -} - -pub fn load_config(config_dir: &str) -> &'static HashMap { - static INSTANCE: OnceCell> = OnceCell::new(); - INSTANCE.get_or_init(|| { - let mut config_mapping = HashMap::new(); - - let common_object = load_toml_config!( - format!("{}/{}", config_dir, "/common.toml").as_str(), - Common - ); - // set workspace dir - std::env::set_var(MONOGRAPH_WORKSPACE_DIR, common_object.clone().workspace); - if common_object.monograph.storage.eq("cassandra") { - let cassandra = load_toml_config!( - format!("{}/{}", config_dir, "/cassandra.toml").as_str(), - Cassandra - ); - config_mapping.insert("cassandra".to_string(), ConfigObject::Storage(cassandra)); - } - - config_mapping.insert( - "common".to_string(), - ConfigObject::Common(Box::new(common_object)), - ); - let mut mysql_ini = Ini::new(); - mysql_ini - .load(format!("{}/{}", config_dir, "/mysql/mysql_template.cnf").as_str()) - .unwrap(); - config_mapping.insert("mysql".to_string(), ConfigObject::MySQL(mysql_ini)); - config_mapping - }) -} - -#[cfg(test)] -mod tests { - use crate::config::common::Common; - use crate::config::workspace_sub_dir; - - pub fn config_file(file: &str) -> String { - let mut base_path = env!("CARGO_MANIFEST_DIR").to_owned(); - base_path.push_str(file); - base_path - } - - #[test] - pub fn test_load_common_config() { - let common_path = config_file("/config/common.toml"); - let common = load_toml_config!(common_path.as_str(), Common); - println!("Common {common:?}") - } - - #[test] - pub fn test_extract_config_value() { - let common_path = config_file("/config"); - let common_config = extract_config_value!("common", Common, common_path.clone()); - println!("{common_path:?} -> {common_config:?}"); - } - - #[test] - pub fn test_build_script() { - let config_path = config_file("/config"); - let protobuf_build_cmd = build_script!(download, config_path.clone(), protobuf); - let thirty_party_git_build = build_script!(git, config_path, brpc, braft, catch2, aws); - println!("{protobuf_build_cmd:?}"); - println!("{thirty_party_git_build:?}"); - assert_eq!(protobuf_build_cmd.cmd_vec.len(), 1); - assert_eq!(thirty_party_git_build.cmd_vec.len(), 4); - } - - #[test] - pub fn test_gen_multi_mysql_config() { - let config_path = config_file("/config"); - let mut mysql_cnf = extract_config_value!("mysql", MySQL, config_path.clone()).clone(); - - let workspace_sub_dir = workspace_sub_dir(Some(config_path)); - let data_dir = workspace_sub_dir.get("data").unwrap().clone(); - //let std::fs::remove_file(dest_path); - mysql_cnf.set("mariadb", "datadir", Some(data_dir.clone())); - let datadir_value = mysql_cnf.get("mariadb", "datadir"); - assert!(datadir_value.is_some()); - assert_eq!(datadir_value.unwrap(), data_dir); - } -} diff --git a/src/devtools/src/lib.rs b/src/devtools/src/lib.rs deleted file mode 100644 index 488ea28f..00000000 --- a/src/devtools/src/lib.rs +++ /dev/null @@ -1,5 +0,0 @@ -extern crate core; - -pub mod cmd; -pub mod config; -pub mod term; diff --git a/src/devtools/src/main.rs b/src/devtools/src/main.rs deleted file mode 100644 index bbb4b50d..00000000 --- a/src/devtools/src/main.rs +++ /dev/null @@ -1,48 +0,0 @@ -use clap::Parser; -use devtools::config::{MONOGRAPH_WATER_CONFIG_DIR, MONOGRAPH_WORKSPACE_DIR}; -use devtools::extract_config_value; -use devtools::term::CmdCli; - -const BANNER: &str = r#" - __ __ _ __ __ _ _ - | \/ | ___ _ __ ___ __ _ _ __ __ _ _ __ | |__ \ \ / /_ _(_) |_ ___ _ __ - | |\/| |/ _ \| '_ \ / _ \ / _` | '__/ _` | '_ \| '_ \ \ \ /\ / / _` | | __/ _ \ '__| - | | | | (_) | | | | (_) | (_| | | | (_| | |_) | | | | \ V V / (_| | | || __/ | - |_| |_|\___/|_| |_|\___/ \__, |_| \__,_| .__/|_| |_| \_/\_/ \__,_|_|\__\___|_| - |___/ |_| -"#; - -#[derive(Parser, Debug)] -#[clap(author, version, about, long_about = None)] -struct CmdCliOptions { - /// config file location - #[clap(short = 'c', long, value_parser)] - config: String, - #[clap(short = 'l', long, value_parser)] - logfile: Option, -} - -#[tokio::main] -async fn main() -> anyhow::Result<()> { - println!("{BANNER}"); - println!(); - println!("!!! Welcome Monograph Waiter!!!"); - println!("!!!「Monograph Waiter」 is the productivity tool for developers."); - println!("!!! Type help to list all commands. Use 'exit' to quit the command line."); - println!(); - let cmd_cli_options: CmdCliOptions = CmdCliOptions::parse(); - std::env::set_var(MONOGRAPH_WATER_CONFIG_DIR, cmd_cli_options.config.clone()); - std::env::set_var( - MONOGRAPH_WORKSPACE_DIR, - extract_config_value!("common", Common, cmd_cli_options.config.to_string()) - .clone() - .workspace, - ); - println!( - "MONOGRAPH_WATER_CONFIG_DIR={:?}\nMONOGRAPH_WORKSPACE_DIR={:?}", - std::env::var(MONOGRAPH_WATER_CONFIG_DIR).unwrap(), - std::env::var(MONOGRAPH_WORKSPACE_DIR).unwrap() - ); - CmdCli.start().await; - Ok(()) -} diff --git a/src/devtools/src/term.rs b/src/devtools/src/term.rs deleted file mode 100644 index 42934cfa..00000000 --- a/src/devtools/src/term.rs +++ /dev/null @@ -1,114 +0,0 @@ -use crate::cmd::cmd_const::SUPPORT_CMD_LIST; -use crate::cmd::cmd_runner::CmdRunner; -use crate::cmd::cmd_utils::{all_support_cmd_string, cmd_status_ok, default_log_handler}; -use dialoguer::theme::ColorfulTheme; -use dialoguer::{Completion, History, Input}; -use std::collections::VecDeque; -use std::process; - -const MAX_INPUT_HISTORY: usize = 1000; -const PROMPT_STR: &str = "mono_devtools>"; - -pub struct CmdCli; - -impl CmdCli { - pub async fn start(&self) { - let mut history = InputHistory::default(); - let completion = InputCompletion::default(); - let logger = default_log_handler().unwrap(); - let runner = CmdRunner::new(&logger); - loop { - if let Ok(cmd) = Input::::with_theme(&ColorfulTheme::default()) - .with_prompt(PROMPT_STR.to_string()) - .history_with(&mut history) - .completion_with(&completion) - .interact_text() - { - if cmd == "help" { - println!("all command list \n{}", all_support_cmd_string()); - continue; - } - if cmd == "exit" || cmd == "quit" { - process::exit(0); - } - if !SUPPORT_CMD_LIST.contains(&cmd.as_str()) { - println!( - "Warn: not support command {}.For now support command list: \n{}", - cmd, - all_support_cmd_string() - ) - } else { - let cmd_status = runner.run(cmd.to_string()).await; - println!(); - if cmd_status_ok(&cmd_status) { - println!("Cmd ✅ {cmd} Success."); - } else { - let failure_status = cmd_status - .iter() - .filter(|(_, status)| !status.success) - .collect::>(); - println!("{failure_status:#?} ❗ {cmd} Failure!!!"); - } - println!(); - } - } - } - } -} - -struct InputCompletion { - all_cmd_list: Vec, -} - -impl Completion for InputCompletion { - fn get(&self, input: &str) -> Option { - let matches = self - .all_cmd_list - .iter() - .filter(|option| option.starts_with(input)) - .collect::>(); - - if matches.len() == 1 { - Some(matches[0].to_string()) - } else { - None - } - } -} - -impl Default for InputCompletion { - fn default() -> Self { - Self { - all_cmd_list: SUPPORT_CMD_LIST.iter().map(|cmd| cmd.to_string()).collect(), - } - } -} - -struct InputHistory { - max: usize, - history: VecDeque, -} - -impl Default for InputHistory { - fn default() -> Self { - InputHistory { - max: MAX_INPUT_HISTORY, - history: VecDeque::default(), - } - } -} - -impl History for InputHistory { - fn read(&self, pos: usize) -> Option { - self.history.get(pos).cloned() - } - - fn write(&mut self, input_val: &T) { - if SUPPORT_CMD_LIST.contains(&input_val.to_string().as_str()) { - if self.history.len() == self.max { - self.history.pop_back(); - } - self.history.push_front(input_val.to_string()); - } - } -} diff --git a/src/rest_api/Cargo.toml b/src/rest_api/Cargo.toml deleted file mode 100644 index 89ff7552..00000000 --- a/src/rest_api/Cargo.toml +++ /dev/null @@ -1,38 +0,0 @@ -[package] -name = "rest_api" -version.workspace = true -edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -actix-server = "2" -actix-web = "4" -anyhow = "1.0" -clap = { version = "4", features = ["derive"] } -cluster_mgr = { path = "../cluster_mgr" } -crossbeam-channel = "0.5" -derive_more = "0.99" -itertools = "0.10.5" -reqwest = { version = "0.11", features = ["json"] } -serde = { version = "1", features = ["derive"] } -serde_json = "1" -tokio = { version = "1", features = ["full"] } -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = [ - "alloc", - "ansi", - "env-filter", - "fmt", - "matchers", - "once_cell", - "parking_lot", - "regex", - "registry", - "sharded-slab", - "smallvec", - "std", - "thread_local", - "time", - "tracing", - "tracing-log", -] } diff --git a/src/rest_api/src/global_handler.rs b/src/rest_api/src/global_handler.rs deleted file mode 100644 index 108c77a3..00000000 --- a/src/rest_api/src/global_handler.rs +++ /dev/null @@ -1,77 +0,0 @@ -use crate::{listen_exit_signal, RequestPayload}; -use cluster_mgr::cli::{cmd_base::CmdExecutor, task::group::Config}; -use std::sync::Arc; -use tracing::{error, info}; - -#[derive(Clone)] -pub struct GlobalCommandHandler { - cmd_executor: Arc, - tx: crossbeam_channel::Sender, - rx: crossbeam_channel::Receiver, -} - -impl GlobalCommandHandler { - pub async fn new(cmd_executor: CmdExecutor) -> Self { - let (tx, rx) = crossbeam_channel::unbounded(); - let handler = GlobalCommandHandler { - cmd_executor: Arc::new(cmd_executor), - tx, - rx, - }; - let handler_arc = Arc::new(handler.clone()); - let tx = handler.tx.clone(); - tokio::spawn(async move { - listen_exit_signal(tx, |tx| async move { - info!("GlobalCommandHandler will exit."); - tx.send(RequestPayload { - command: None, - config: None, - }) - .unwrap(); - }) - .await; - }); - tokio::spawn(async move { - let _ = handler_arc.handle().await; - }); - handler - } - - pub fn get_command_executor(&self) -> &CmdExecutor { - &self.cmd_executor - } - - pub fn submit(&self, payload: RequestPayload) { - self.tx.send(payload).unwrap(); - } - - pub async fn handle(&self) -> anyhow::Result<()> { - let cmd_executor = Box::leak(Box::new(self.cmd_executor.clone())); - while let Ok(payload) = self.rx.recv() { - let cmd_opt = payload.command; - if cmd_opt.is_none() { - break; - } - let cmd = cmd_opt.unwrap(); - let cmd_str = cmd.as_ref().to_owned(); - info!("Global handler process command={cmd_str}"); - match cmd.as_ref() { - "deploy" | "run-deps" | "launch" => { - let config = payload.config; - if let Err(err) = cmd_executor - .run(cmd, Some(Config::Cluster(config.unwrap())), false, false) - .await - { - error!("command {cmd_str} failed: {err}"); - } - } - _ => { - if let Err(err) = cmd_executor.run(cmd, None, false, false).await { - error!("command {cmd_str} failed: {err}"); - } - } - } - } - Ok(()) - } -} diff --git a/src/rest_api/src/handler.rs b/src/rest_api/src/handler.rs deleted file mode 100644 index fdf36cb4..00000000 --- a/src/rest_api/src/handler.rs +++ /dev/null @@ -1,274 +0,0 @@ -use crate::global_handler::GlobalCommandHandler; -use crate::{MonographConnInfo, RequestPayload, ResponseData, WebHandleError}; -use actix_web::{get, post, web, HttpResponse, Responder}; -use anyhow::anyhow; -use cluster_mgr::cli::task::group::Config; -use cluster_mgr::cli::task::task_base::TaskId; -use cluster_mgr::cli::{MonitorCommand, SubCommand}; -use cluster_mgr::config::config_base::{DeployConfig, DEPLOYMENT_CHECK_SUCCESS_TASK}; -use serde_json::{json, Value}; -use std::collections::HashMap; - -const SUPPORT_CTL_CMD: &[&str; 7] = &[ - "start", - "stop", - "install", - "start_log", - "stop_log", - "start_monitor", - "stop_monitor", -]; -const SUPPORT_CTL_STATUS_CMD: &[&str; 11] = &[ - "start", - "stop", - "install", - "status", - "deploy", - "run-deps", - "start_monitor", - "stop_monitor", - "start_log", - "stop_log", - "launch", -]; - -#[get("/check_health")] -pub async fn check_health() -> impl Responder { - HttpResponse::Ok().content_type("text/plain").body("ok") -} - -fn validate_command(command: &str, support_cmd: &[&str]) -> Result<(), WebHandleError> { - let cmd_str = command.to_lowercase(); - if cmd_str.is_empty() || !support_cmd.contains(&cmd_str.as_str()) { - let support_cmd_list = support_cmd.join(","); - let err_msg = format!( - "un support command = {cmd_str}, for now support command list {support_cmd_list}" - ); - Err(WebHandleError { - err: anyhow!(err_msg), - }) - } else { - Ok(()) - } -} - -fn build_command_from_str(cmd_str: &str, cluster: Option) -> SubCommand { - match cmd_str { - "install" => SubCommand::Install { - cluster: cluster.unwrap(), - }, - "start" => SubCommand::Start { - cluster: cluster.unwrap(), - nodes: Vec::new(), - }, - "stop" => SubCommand::Stop { - cluster: cluster.unwrap(), - tx: Some(true), - log: true, - store: false, - monitor: false, - force: false, - all: false, - password: None, - nodes: Vec::new(), - }, - "deploy" => SubCommand::Deploy { - topology_file: "_NONE".to_string(), - }, - "status" => SubCommand::Status { - cluster: cluster.unwrap(), - user: None, - password: None, - wait: None, - detail: false, - }, - "run-deps" => SubCommand::RunDeps { - topology_file: "_NONE".to_string(), - }, - "start_monitor" => SubCommand::Monitor { - cluster: Some(cluster.clone().unwrap()), - command: MonitorCommand::Start { - cluster: Some(cluster.unwrap()), - components: Vec::new(), - }, - }, - "stop_monitor" => SubCommand::Monitor { - cluster: Some(cluster.clone().unwrap()), - command: MonitorCommand::Stop { - cluster: Some(cluster.unwrap()), - components: Vec::new(), - }, - }, - "start_log" => SubCommand::LogService { - cluster: cluster.unwrap(), - command: "start".to_string(), - }, - "stop_log" => SubCommand::LogService { - cluster: cluster.unwrap(), - command: "stop".to_string(), - }, - "launch" => SubCommand::Launch { - topology_file: "_NONE".to_owned(), - skip_deps: false, - }, - _ => unreachable!(), - } -} - -pub fn ctrl_cluster( - cmd: &str, - global_handler: web::Data, - post_deployment: web::Json, -) { - let cmd_without_topology_file = build_command_from_str(cmd, None); - global_handler.submit(RequestPayload { - command: Some(cmd_without_topology_file), - config: Some(post_deployment.0), - }); -} - -#[post("/launch")] -pub async fn launch_cluster( - global_handler: web::Data, - post_deployment: web::Json, -) -> impl Responder { - ctrl_cluster("launch", global_handler, post_deployment); - HttpResponse::Ok().finish() -} - -#[post("/deploy")] -pub async fn deploy_cluster( - global_handler: web::Data, - post_deployment: web::Json, -) -> impl Responder { - ctrl_cluster("deploy", global_handler, post_deployment); - HttpResponse::Ok().finish() -} - -#[post("/install_run_deps")] -pub async fn install_run_deps( - global_handler: web::Data, - post_deployment: web::Json, -) -> impl Responder { - ctrl_cluster("run-deps", global_handler, post_deployment); - HttpResponse::Ok().finish() -} - -#[post("/ctl_cmd/{cluster}/{command}")] -pub async fn ctl_cluster( - global_handler: web::Data, - param: web::Path<(String, String)>, -) -> Result { - let (cluster, command) = param.into_inner(); - validate_command(command.as_str(), SUPPORT_CTL_CMD)?; - let ctl_command = build_command_from_str(command.as_str(), Some(cluster)); - global_handler.submit(RequestPayload { - command: Some(ctl_command), - config: None, - }); - Ok(HttpResponse::Ok().finish()) -} - -#[get("/ctl_cmd_status/{cluster}/{command}")] -pub async fn check_cmd_status( - global_handler: web::Data, - param: web::Path<(String, String)>, -) -> Result { - let (cluster, command) = param.into_inner(); - validate_command(command.as_str(), SUPPORT_CTL_STATUS_CMD)?; - - let cmd_executor = global_handler.get_command_executor(); - let deployment_config_opt = cmd_executor - .state_mgr() - .load_deployment_from_state(cluster.as_str()) - .await?; - // cmd_executor.load_deployment_from_state(cluster_str).await?; - if let Some(mut deployment_config) = deployment_config_opt { - deployment_config.conf_opts = Some(HashMap::from([( - DEPLOYMENT_CHECK_SUCCESS_TASK.to_string(), - false, - )])); - let cmd_args = build_command_from_str(command.as_str(), Some(cluster.clone())); - let task_context = cmd_executor - .task_mgr() - .task_context(cmd_args, &Config::Cluster(deployment_config)) - .await?; - - let task_ids = task_context.list_task_ids(); - let cmd_vec = vec![task_context.task_group]; - let completed_task_vec = cmd_executor - .state_mgr() - .load_task_status_from_state(cluster, None, Some(cmd_vec)) - .await?; - let mut success = Vec::new(); - let mut failure = Vec::new(); - - completed_task_vec.iter().for_each(|task_status| { - let task_id = TaskId::from_json_string(task_status.clone().task); - let update_timestamp = task_status - .update_timestamp - .format("%Y-%m-%d %H:%M:%S") - .to_string(); - let task_id_with_time = json!({ - "cmd": task_id.cmd, - "task": task_id.task, - "host": task_id.host, - "cmd_datetime":update_timestamp, - }); - if task_status.task_status == 0 { - success.push(task_id_with_time); - } else { - failure.push(task_id_with_time); - } - }); - // info!("/status/cluster/command all_task_id = {:#?}", task_ids); - let status = if !failure.is_empty() { - "failure" - } else if completed_task_vec.len() == task_ids.len() || task_ids.is_empty() { - "success" - } else if completed_task_vec.is_empty() { - "none" - } else { - "progress" - }; - let rsp_data = json!({ "status": status, "success": success, "failure": failure}); - Ok(HttpResponse::Ok() - .content_type("application/json") - .json(ResponseData { - code: 200, - msg: None, - data: Some(rsp_data), - })) - } else { - Ok(HttpResponse::Ok() - .content_type("application/json") - .json(ResponseData { - code: 200, - msg: None, - data: Some( - json!({ "status": "none", "success": Value::Null, "failure": Value::Null}), - ), - })) - } -} - -#[post("/cluster_status/{cluster}")] -pub async fn mono_service_status( - global_handler: web::Data, - param_cluster: web::Path, - conn_info: web::Json, -) -> Result { - let mono_conn_info = conn_info.0; - let status_cmd = SubCommand::Status { - cluster: param_cluster.to_string(), - user: Some(mono_conn_info.user), - password: Some(mono_conn_info.password), - wait: Some(20), - detail: false, - }; - global_handler.submit(RequestPayload { - command: Some(status_cmd), - config: None, - }); - Ok(HttpResponse::Ok().finish()) -} diff --git a/src/rest_api/src/lib.rs b/src/rest_api/src/lib.rs deleted file mode 100644 index d121c985..00000000 --- a/src/rest_api/src/lib.rs +++ /dev/null @@ -1,91 +0,0 @@ -// #![feature(async_closure)] -// #![feature(once_cell)] - -use actix_web::error; -use anyhow::Error; -use clap::Parser; -use serde::{Deserialize, Serialize}; -use std::fmt::{Display, Formatter}; -use std::path::PathBuf; - -use cluster_mgr::cli::SubCommand; -use cluster_mgr::config::config_base::DeployConfig; -use derive_more::Error; -use error::ResponseError; -use serde_json::Value; -use tokio::signal::unix::{signal, SignalKind}; -use tracing::info; - -mod global_handler; -pub mod handler; -pub mod server; - -#[derive(Clone, Debug, Serialize, Deserialize)] -pub struct MonographConnInfo { - pub user: String, - pub password: String, -} - -#[derive(Clone, Debug)] -pub struct RequestPayload { - pub command: Option, - pub config: Option, -} - -#[derive(Debug, Error)] -pub struct WebHandleError { - err: anyhow::Error, -} - -impl Display for WebHandleError { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - write!(f, "handler error: {}", self.err) - } -} - -impl ResponseError for WebHandleError {} - -impl From for WebHandleError { - fn from(value: Error) -> Self { - WebHandleError { err: value } - } -} - -#[derive(Deserialize, Serialize)] -pub struct ResponseData { - code: usize, - msg: Option, - data: Option, -} - -#[derive(Parser, Default, Debug)] -#[command(author, version = "0.0.0", about = "EloqData cluster manager REST API")] -#[command(next_line_help = true)] -pub struct ServerCommandArgs { - #[arg(long, value_name = "HOME_DIR")] - pub home: Option, - #[arg(short, long, value_name = "addr")] - pub addr: Option, - #[arg(short, long, value_name = "port")] - pub port: Option, -} - -pub(crate) async fn listen_exit_signal(t: T, call_back: F) -where - T: Send + 'static, - F: Fn(T) -> Fut + Send + Sync + 'static, - Fut: std::future::Future + Send + 'static, -{ - let mut interrupt = signal(SignalKind::interrupt()).unwrap(); - let mut terminate = signal(SignalKind::terminate()).unwrap(); - tokio::select! { - _ = interrupt.recv() => { - info!("Recv interrupt."); - call_back(t).await; - } - _ = terminate.recv() => { - info!("Recv terminate."); - call_back(t).await; - } - } -} diff --git a/src/rest_api/src/main.rs b/src/rest_api/src/main.rs deleted file mode 100644 index c7639a6e..00000000 --- a/src/rest_api/src/main.rs +++ /dev/null @@ -1,22 +0,0 @@ -use clap::Parser; -use cluster_mgr::cli::cmd_base::NOT_PRINT_TASK_RESULT; -use rest_api::server::CliMgrHttpServer; -use rest_api::ServerCommandArgs; -use tracing::{info, Level}; - -#[tokio::main] -async fn main() -> anyhow::Result<()> { - tracing_subscriber::fmt().with_max_level(Level::INFO).init(); - let server_cmd_args = ServerCommandArgs::parse(); - info!("MonoClusterREST command args = {:?}", server_cmd_args); - std::env::set_var(NOT_PRINT_TASK_RESULT, "true"); - let srv_static = Box::leak(Box::new(CliMgrHttpServer {})); - srv_static - .start( - server_cmd_args.addr, - server_cmd_args.port, - server_cmd_args.home, - ) - .await?; - Ok(()) -} diff --git a/src/rest_api/src/server.rs b/src/rest_api/src/server.rs deleted file mode 100644 index 03af6543..00000000 --- a/src/rest_api/src/server.rs +++ /dev/null @@ -1,80 +0,0 @@ -use crate::global_handler::GlobalCommandHandler; -use crate::handler::{ - check_cmd_status, check_health, ctl_cluster, deploy_cluster, install_run_deps, launch_cluster, - mono_service_status, -}; -use crate::listen_exit_signal; -use actix_server::Server; -use actix_web::{middleware, web, App, HttpServer}; -use cluster_mgr::cli::cmd_base::CmdExecutor; -use std::path::PathBuf; -use tracing::info; - -macro_rules! server_listen_addr { - ($addr_or_port:expr, $default:expr) => {{ - if let Some(value) = $addr_or_port { - value - } else { - $default - } - }}; -} - -pub struct CliMgrHttpServer {} - -unsafe impl Send for CliMgrHttpServer {} - -impl CliMgrHttpServer { - pub async fn start( - &'static self, - addr: Option, - port: Option, - home: Option, - ) -> anyhow::Result<()> { - let server = CliMgrHttpServer::new_http_server(addr, port, home).await?; - let web_handler = server.handle(); - info!("Starting CliMgrHttpServer."); - let shutdown_join = tokio::spawn(async move { - listen_exit_signal(web_handler, |web_handler| async move { - info!("Stopping CliMgrHttpServer web_handler offload."); - web_handler.stop(true).await; - }) - .await - }); - tokio::spawn(async move { server.await.unwrap() }).await?; - shutdown_join.await?; - Ok(()) - } - - async fn new_http_server( - addr: Option, - port: Option, - home: Option, - ) -> anyhow::Result { - let listen_addr = server_listen_addr!(addr, "127.0.0.1".to_string()); - let listen_port = server_listen_addr!(port, 8090); - let home = CmdExecutor::home_init(home).expect("home dir init failed"); - let handler = GlobalCommandHandler::new(CmdExecutor::new(home)).await; - let global_handler = web::Data::new(handler); - let server = HttpServer::new(move || { - App::new() - .wrap(middleware::Logger::default()) - .app_data(global_handler.clone()) - .service(check_health) - .service(check_cmd_status) - .service(deploy_cluster) - .service(ctl_cluster) - .service(mono_service_status) - .service(install_run_deps) - .service(launch_cluster) - .service(web::resource("/").route( - web::get().to(|| async { "Hey man. I'm MonographDB cluster RESTful Service." }), - )) - }) - .shutdown_timeout(20) - .disable_signals() - .bind((listen_addr.as_str(), listen_port))? - .run(); - Ok(server) - } -} From 8639e2305d81578a9195ce4031d9c10cdc5cd8b2 Mon Sep 17 00:00:00 2001 From: starrysky Date: Wed, 10 Jun 2026 11:56:49 +0800 Subject: [PATCH 2/2] fix: resolve clippy warnings from removing proxy/rest_api/devtools --- src/cluster_mgr/src/cli/cmd_base.rs | 4 +-- .../cli/task/eloq_store_data_clean_task.rs | 4 +-- .../src/cli/task/group/backup_group.rs | 9 +----- .../src/cli/task/group/bootstrap_group.rs | 9 +----- .../src/cli/task/group/check_group.rs | 5 +--- .../src/cli/task/group/custom_cmd_group.rs | 9 +----- .../cli/task/group/db_cluster_ctrl_group.rs | 9 +----- .../src/cli/task/group/deployment_group.rs | 9 +----- .../src/cli/task/group/failover_group.rs | 5 +--- .../src/cli/task/group/install_dep_pkg.rs | 9 +----- .../src/cli/task/group/launch_group.rs | 9 +----- .../src/cli/task/group/log_srv_ctl_group.rs | 10 ++----- .../src/cli/task/group/monitor_ctl_group.rs | 10 ++----- .../src/cli/task/group/remove_group.rs | 30 +++++++------------ .../src/cli/task/group/scale_group.rs | 5 +--- .../src/cli/task/group/scale_log_group.rs | 6 ++-- .../src/cli/task/group/update_config_group.rs | 10 ++----- .../src/cli/task/rolling_upgrade/steps.rs | 4 +-- .../task/upload/data_dir_upload_builder.rs | 5 +--- .../cli/task/upload/eloq_upload_builder.rs | 5 +--- .../cli/task/upload/monitor_upload_builder.rs | 5 +--- .../cli/task/upload/tx_conf_upload_builder.rs | 19 +++--------- .../cli/task/upload/upload_task_builder.rs | 5 +--- 23 files changed, 39 insertions(+), 156 deletions(-) diff --git a/src/cluster_mgr/src/cli/cmd_base.rs b/src/cluster_mgr/src/cli/cmd_base.rs index 591dc5e4..97f1fdec 100644 --- a/src/cluster_mgr/src/cli/cmd_base.rs +++ b/src/cluster_mgr/src/cli/cmd_base.rs @@ -1169,9 +1169,7 @@ impl CmdExecutor { quiet: bool, verbose: bool, ) -> Result<()> { - let cfg = match config.clone() { - Config::Cluster(cfg) => cfg, - }; + let Config::Cluster(cfg) = config.clone(); let download_only = match &cmd { SubCommand::Update { download_only, .. } => *download_only, diff --git a/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs b/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs index 649aee55..71e0a67c 100644 --- a/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs +++ b/src/cluster_mgr/src/cli/task/eloq_store_data_clean_task.rs @@ -91,9 +91,7 @@ impl EloqStoreDataCleanTask { ) -> IndexMap { let mut task_map = IndexMap::new(); - let deploy_config = match config { - Config::Cluster(cfg) => cfg, - }; + let Config::Cluster(deploy_config) = config; // Check if EloqStore Cloud mode is enabled let Some(storage_service) = deploy_config.deployment.storage_service.as_ref() else { diff --git a/src/cluster_mgr/src/cli/task/group/backup_group.rs b/src/cluster_mgr/src/cli/task/group/backup_group.rs index 24876d19..8bd8fe0d 100644 --- a/src/cluster_mgr/src/cli/task/group/backup_group.rs +++ b/src/cluster_mgr/src/cli/task/group/backup_group.rs @@ -70,14 +70,7 @@ impl TaskGroup for BackupTaskGroup { cmd: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for InstallDBTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let mut executable = IndexMap::new(); let mut barrier = vec![]; diff --git a/src/cluster_mgr/src/cli/task/group/bootstrap_group.rs b/src/cluster_mgr/src/cli/task/group/bootstrap_group.rs index ac5c9ac8..cc8e95cd 100644 --- a/src/cluster_mgr/src/cli/task/group/bootstrap_group.rs +++ b/src/cluster_mgr/src/cli/task/group/bootstrap_group.rs @@ -13,14 +13,7 @@ impl TaskGroup for InstallDBTaskGroup { cmd_args: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for InstallDBTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let mut barrier = vec![]; let mut executable = IndexMap::new(); diff --git a/src/cluster_mgr/src/cli/task/group/check_group.rs b/src/cluster_mgr/src/cli/task/group/check_group.rs index a7b03668..2fb7dbcb 100644 --- a/src/cluster_mgr/src/cli/task/group/check_group.rs +++ b/src/cluster_mgr/src/cli/task/group/check_group.rs @@ -32,10 +32,7 @@ impl TaskGroup for CheckTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => return Err(anyhow::anyhow!("Expected ClusterConfig for CheckTaskGroup")), - }; + let Config::Cluster(cluster_config) = config; let mut executable = IndexMap::new(); let input = HashMap::new(); diff --git a/src/cluster_mgr/src/cli/task/group/custom_cmd_group.rs b/src/cluster_mgr/src/cli/task/group/custom_cmd_group.rs index 8a83eb39..353e06d5 100644 --- a/src/cluster_mgr/src/cli/task/group/custom_cmd_group.rs +++ b/src/cluster_mgr/src/cli/task/group/custom_cmd_group.rs @@ -10,14 +10,7 @@ impl TaskGroup for CustomCmdTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - match config { - Config::Cluster(..) => {} - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for CustomCmdTaskGroup" - )) - } - }; + let Config::Cluster(_cluster_config) = config; let cmd_ref = cmd_arg.as_ref().to_string(); let user_command = match cmd_arg.clone() { diff --git a/src/cluster_mgr/src/cli/task/group/db_cluster_ctrl_group.rs b/src/cluster_mgr/src/cli/task/group/db_cluster_ctrl_group.rs index 1375655a..ae898616 100644 --- a/src/cluster_mgr/src/cli/task/group/db_cluster_ctrl_group.rs +++ b/src/cluster_mgr/src/cli/task/group/db_cluster_ctrl_group.rs @@ -23,14 +23,7 @@ use tracing::{info, warn}; #[async_trait::async_trait] impl TaskGroup for CtrlDBTaskGroup { async fn tasks(&self, cmd: SubCommand, config: &Config) -> Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for CtrlDBTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let cmd_str = cmd.as_ref().to_owned(); let (barrier, executable) = match cmd.clone() { diff --git a/src/cluster_mgr/src/cli/task/group/deployment_group.rs b/src/cluster_mgr/src/cli/task/group/deployment_group.rs index 894a7c1e..2721eb90 100644 --- a/src/cluster_mgr/src/cli/task/group/deployment_group.rs +++ b/src/cluster_mgr/src/cli/task/group/deployment_group.rs @@ -35,14 +35,7 @@ impl TaskGroup for DeploymentTaskGroup { cmd_args: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for DeploymentTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let cmd_ref = cmd_args.as_ref().to_string(); let cluster = &cluster_config.deployment.cluster_name; diff --git a/src/cluster_mgr/src/cli/task/group/failover_group.rs b/src/cluster_mgr/src/cli/task/group/failover_group.rs index a0e2118d..a786b96a 100644 --- a/src/cluster_mgr/src/cli/task/group/failover_group.rs +++ b/src/cluster_mgr/src/cli/task/group/failover_group.rs @@ -158,10 +158,7 @@ impl super::TaskGroup for FailoverTaskGroup { return Err(anyhow!("Expected Failover command")); } - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => return Err(anyhow!("Expected Cluster config for Failover command")), - }; + let Config::Cluster(cluster_config) = config; info!("Setting up failover task group"); diff --git a/src/cluster_mgr/src/cli/task/group/install_dep_pkg.rs b/src/cluster_mgr/src/cli/task/group/install_dep_pkg.rs index a360c2e7..70abdd63 100644 --- a/src/cluster_mgr/src/cli/task/group/install_dep_pkg.rs +++ b/src/cluster_mgr/src/cli/task/group/install_dep_pkg.rs @@ -10,14 +10,7 @@ impl TaskGroup for InstallDepPkgTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for InstallDepPkgTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let install_runtime_deps = DepPkgTask::from_config(cluster_config)?; Ok(TaskExecutionContext { diff --git a/src/cluster_mgr/src/cli/task/group/launch_group.rs b/src/cluster_mgr/src/cli/task/group/launch_group.rs index 9b376ab2..ef6e398a 100644 --- a/src/cluster_mgr/src/cli/task/group/launch_group.rs +++ b/src/cluster_mgr/src/cli/task/group/launch_group.rs @@ -27,14 +27,7 @@ impl TaskGroup for LaunchTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for LaunchTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let mut executable = IndexMap::new(); let mut barrier = vec![]; diff --git a/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs b/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs index dc79976f..13e9854b 100644 --- a/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs +++ b/src/cluster_mgr/src/cli/task/group/log_srv_ctl_group.rs @@ -12,20 +12,14 @@ impl TaskGroup for LogServiceCtlTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for LogServiceCtlTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let log_ctl_cmd_name = match cmd_arg.clone() { SubCommand::LogService { cluster: _, command: log_ctl_cmd, } => log_ctl_cmd, + _ => unreachable!("Expected LogService command"), }; let is_start_cmd = log_ctl_cmd_name.to_lowercase().eq("start") || log_ctl_cmd_name.to_lowercase().eq("status"); diff --git a/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs b/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs index 14dbee1d..7eaf95ba 100644 --- a/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs +++ b/src/cluster_mgr/src/cli/task/group/monitor_ctl_group.rs @@ -26,14 +26,7 @@ impl TaskGroup for MonitorCtlTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for MonitorCtlTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; if cluster_config.deployment.monitor.is_none() { return Ok(TaskExecutionContext { @@ -44,6 +37,7 @@ impl TaskGroup for MonitorCtlTaskGroup { } let monitor_ctl_cmd = match &cmd_arg { SubCommand::Monitor { command, .. } => command, + _ => unreachable!("Expected Monitor command"), }; let mut executable = IndexMap::new(); let mut barrier = vec![]; diff --git a/src/cluster_mgr/src/cli/task/group/remove_group.rs b/src/cluster_mgr/src/cli/task/group/remove_group.rs index 4df0223c..db44d6e5 100644 --- a/src/cluster_mgr/src/cli/task/group/remove_group.rs +++ b/src/cluster_mgr/src/cli/task/group/remove_group.rs @@ -16,14 +16,7 @@ impl TaskGroup for RemoveTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for RemoveTaskGroup" - )) - } - }; + let Config::Cluster(cluster_config) = config; let (cluster, force_remove) = match cmd_arg.clone() { SubCommand::Remove { cluster, force } => (cluster.clone(), force), @@ -103,20 +96,17 @@ impl TaskGroup for RemoveTaskGroup { } // remove keyspace in external dynamo if let Some(store) = &cluster_config.deployment.storage_service { - match store.provider().unwrap() { - crate::config::StorageProvider::EloqDSS => { - // Handle DataStoreService storage provider cleanup - if let Some(dss) = &store.eloqdss { - use crate::config::storage_service_config::DataStoreServiceBackend; - match dss.backend_config() { - DataStoreServiceBackend::EloqStore(_eloq_store_config) => { - // EloqStore backend: no rclone cleanup needed - } // Future backends can be handled here, e.g.: - // DataStoreServiceBackend::BigTable(_) => { ... } - } + if let crate::config::StorageProvider::EloqDSS = store.provider().unwrap() { + // Handle DataStoreService storage provider cleanup + if let Some(dss) = &store.eloqdss { + use crate::config::storage_service_config::DataStoreServiceBackend; + match dss.backend_config() { + DataStoreServiceBackend::EloqStore(_eloq_store_config) => { + // EloqStore backend: no rclone cleanup needed + } // Future backends can be handled here, e.g.: + // DataStoreServiceBackend::BigTable(_) => { ... } } } - _ => {} } } diff --git a/src/cluster_mgr/src/cli/task/group/scale_group.rs b/src/cluster_mgr/src/cli/task/group/scale_group.rs index 36cd7d40..e789be1b 100644 --- a/src/cluster_mgr/src/cli/task/group/scale_group.rs +++ b/src/cluster_mgr/src/cli/task/group/scale_group.rs @@ -42,10 +42,7 @@ impl super::TaskGroup for ScaleTaskGroup { } // Get deployment config - let deploy_config = match config { - Config::Cluster(cfg) => cfg, - _ => return Err(anyhow!("Expected Cluster config for Scale command")), - }; + let Config::Cluster(deploy_config) = config; let mut barrier = Vec::new(); let mut executable = IndexMap::new(); diff --git a/src/cluster_mgr/src/cli/task/group/scale_log_group.rs b/src/cluster_mgr/src/cli/task/group/scale_log_group.rs index a606defd..0375348a 100644 --- a/src/cluster_mgr/src/cli/task/group/scale_log_group.rs +++ b/src/cluster_mgr/src/cli/task/group/scale_log_group.rs @@ -44,10 +44,8 @@ impl TaskGroup for ScaleLogTaskGroup { } = cmd_arg.clone() { // Extract DeployConfig - let deploy_cfg = match config { - Config::Cluster(c) => c.clone(), - _ => return Err(anyhow!("Expected cluster config for ScaleLog")), - }; + let Config::Cluster(c) = config; + let deploy_cfg = c.clone(); if add_nodes.is_empty() && remove_nodes.is_empty() { return Err(anyhow!( diff --git a/src/cluster_mgr/src/cli/task/group/update_config_group.rs b/src/cluster_mgr/src/cli/task/group/update_config_group.rs index d6999056..e84836c2 100644 --- a/src/cluster_mgr/src/cli/task/group/update_config_group.rs +++ b/src/cluster_mgr/src/cli/task/group/update_config_group.rs @@ -21,14 +21,7 @@ impl TaskGroup for UpdateConfigTaskGroup { cmd_arg: SubCommand, config: &Config, ) -> anyhow::Result { - let deploy_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - return Err(anyhow::anyhow!( - "Expected ClusterConfig for UpdateConfigTaskGroup" - )) - } - }; + let Config::Cluster(deploy_config) = config; let (need_restart, fields, tx_node_id, password) = match &cmd_arg { SubCommand::UpdateConf { @@ -38,6 +31,7 @@ impl TaskGroup for UpdateConfigTaskGroup { password, .. } => (*restart, fields.clone(), *tx_node_id, password), + _ => unreachable!("Expected UpdateConf command"), }; // Build config update tasks diff --git a/src/cluster_mgr/src/cli/task/rolling_upgrade/steps.rs b/src/cluster_mgr/src/cli/task/rolling_upgrade/steps.rs index 4db3d141..889c0524 100644 --- a/src/cluster_mgr/src/cli/task/rolling_upgrade/steps.rs +++ b/src/cluster_mgr/src/cli/task/rolling_upgrade/steps.rs @@ -53,9 +53,7 @@ impl UpgradeContext { /// Create an `UpgradeContext` from the CLI args and cluster config. /// Panics if `config` is not `Config::Cluster` — callers must guarantee this. pub(crate) fn new(cmd_arg: &SubCommand, config: Config) -> Self { - let Config::Cluster(ref deploy) = config else { - panic!("UpgradeContext requires Config::Cluster"); - }; + let Config::Cluster(ref deploy) = config; let deploy = deploy.clone(); let (redis_password, force) = match cmd_arg { SubCommand::Update { diff --git a/src/cluster_mgr/src/cli/task/upload/data_dir_upload_builder.rs b/src/cluster_mgr/src/cli/task/upload/data_dir_upload_builder.rs index b69ead33..8cb80d87 100644 --- a/src/cluster_mgr/src/cli/task/upload/data_dir_upload_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/data_dir_upload_builder.rs @@ -12,10 +12,7 @@ pub struct DataDirUploadBuilder; impl UploadTaskBuilder for DataDirUploadBuilder { /// Upload the EloqDB data_dir to the remote host. fn build(&self, config: &Config) -> IndexMap { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => panic!("Expected ClusterConfig for TxConfUpload"), - }; + let Config::Cluster(cluster_config) = config; let deployment_ref = &cluster_config.deployment; let local = get_source_host(None); diff --git a/src/cluster_mgr/src/cli/task/upload/eloq_upload_builder.rs b/src/cluster_mgr/src/cli/task/upload/eloq_upload_builder.rs index ea5b6faa..4a0b72b1 100644 --- a/src/cluster_mgr/src/cli/task/upload/eloq_upload_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/eloq_upload_builder.rs @@ -205,10 +205,7 @@ impl UploadTaskBuilder for EloqUploadBuilder { /// Upload installation package, EloqDB configuration file, /// EloqDB install script, install config to remote host. fn build(&self, config: &Config) -> IndexMap { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => panic!("Expected ClusterConfig for TxConfUpload"), - }; + let Config::Cluster(cluster_config) = config; // copy EloqKv.ini from ~/.eloqctl/config to ~/.eloqctl/upload/{cluster_name} let config_template_source = diff --git a/src/cluster_mgr/src/cli/task/upload/monitor_upload_builder.rs b/src/cluster_mgr/src/cli/task/upload/monitor_upload_builder.rs index 3f1ecf44..e2db6b64 100644 --- a/src/cluster_mgr/src/cli/task/upload/monitor_upload_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/monitor_upload_builder.rs @@ -305,10 +305,7 @@ impl UploadTaskBuilder for MonitorInfraConfUploadBuilder { impl MonitorInfraConfUploadBuilder { pub fn build_for_cmd(config: &Config, cmd: &str) -> IndexMap { let builder = MonitorInfraConfUploadBuilder; - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => panic!("Expected ClusterConfig for MonitorInfraConfUploadBuilder"), - }; + let Config::Cluster(cluster_config) = config; let monitor_opt = cluster_config.deployment.monitor.as_ref(); let source_host = get_source_host(None); diff --git a/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs b/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs index 993524cf..ae6c0321 100644 --- a/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/tx_conf_upload_builder.rs @@ -48,10 +48,7 @@ fn task_file_id(source_path: &str) -> String { impl UploadTaskBuilder for TxConfUpload { fn build(&self, config: &Config) -> IndexMap { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => panic!("Expected ClusterConfig for TxConfUpload"), - }; + let Config::Cluster(cluster_config) = config; info!("Checking for host-specific configuration files in ~/.eloqctl/upload/{}/ for update-conf command", cluster_config.deployment.cluster_name); @@ -330,10 +327,7 @@ impl TxConfUpload { nodes_list: &Vec, is_candidate: &Option>, ) -> IndexMap { - let cluster_config = match config { - Config::Cluster(cfg) => cfg, - _ => panic!("Expected ClusterConfig for TxConfUpload"), - }; + let Config::Cluster(cluster_config) = config; info!( "Building upload tasks for scale operation {:?} with nodes: {:?}", @@ -550,6 +544,7 @@ impl TxConfUpload { // Get the candidate status for this node from the is_candidate parameter let node_is_candidate = match is_candidate { Some(candidate_list) => candidate_list[i], + None => unreachable!(), }; // Choose the right config file type based on is_candidate @@ -607,13 +602,7 @@ impl TxConfUpload { info!("No cluster configuration available in the receiver yet"); } - let deploy_config = match config { - Config::Cluster(cfg) => cfg, - _ => { - warn!("Expected ClusterConfig for cluster config upload"); - return IndexMap::new(); - } - }; + let Config::Cluster(deploy_config) = config; // Check if nodes_list is empty if nodes_list.is_empty() { diff --git a/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs b/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs index 0a1802e3..480d474a 100644 --- a/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs +++ b/src/cluster_mgr/src/cli/task/upload/upload_task_builder.rs @@ -130,10 +130,7 @@ pub fn upload_tasks( UploadTaskBuilderType::TxConf => TxConfUpload {}.build(conf), UploadTaskBuilderType::ScaleTxConf => unreachable!(), UploadTaskBuilderType::EloqImage => { - let cluster_config = match conf { - Config::Cluster(cfg) => cfg, - _ => panic!("Expected ClusterConfig for TxConfUpload"), - }; + let Config::Cluster(cluster_config) = conf; EloqUpload::build_tasks( conf, "update",