chore: update etcd-client

Signed-off-by: Phoeniix Zhao <[email protected]>

Cargo.toml

@@ -22,7 +22,10 @@ resolver = "2"
 ignored = ["prost", "workspace-hack"]
 
 [patch.crates-io]
+# This branch update the tonic version for madsim. We should switch to the original etcd-client crate when new version release.
 madsim = { git = "https://github.com/Phoenix500526/madsim.git", branch = "update-tonic" }
 madsim-tonic = { git = "https://github.com/Phoenix500526/madsim.git", branch = "update-tonic" }
 madsim-tonic-build = { git = "https://github.com/Phoenix500526/madsim.git", branch = "update-tonic" }
 madsim-tokio = { git = "https://github.com/Phoenix500526/madsim.git", branch = "update-tonic" }
+# TODO: switch to the original etcd-client crate when new version is released(https://github.com/etcdv3/etcd-client/pull/75)
+etcd-client = { git = "https://github.com/Phoenix500526/etcd-client", branch = "update-tonic" }

crates/benchmark/Cargo.toml

@@ -16,8 +16,7 @@ repository = "https://github.com/xline-kv/Xline/tree/master/benchmark"
 anyhow = "1.0.82"
 clap = { version = "4", features = ["derive"] }
 clippy-utilities = "0.2.0"
-# TODO: switch to the original etcd-client crate when new version is released
-etcd-client = { git = "https://github.com/Phoenix500526/etcd-client", branch = "update-tonic", features = ["tls"] }
+etcd-client = { version = "0.12.5", features = ["tls"] }
 indicatif = "0.17.8"
 rand = "0.8.5"
 thiserror = "1.0.58"

crates/xline/Cargo.toml

@@ -78,8 +78,7 @@ xlineapi = { path = "../xlineapi" }
 tonic-build = { version = "0.4.3", package = "madsim-tonic-build" }
 
 [dev-dependencies]
-# TODO: switch to the original etcd-client crate when new version is released
-etcd-client = { git = "https://github.com/Phoenix500526/etcd-client", branch = "update-tonic", features = ["tls"] }
+etcd-client = { version = "0.12.5", features = ["tls"] }
 mockall = "0.12.1"
 rand = "0.8.5"
 strum = "0.26"

crates/xlinectl/Cargo.toml

@@ -18,7 +18,6 @@ serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.107"
 shlex = "1.3.0"
 tokio = "1"
-# tonic = "0.11.0"
 tonic = { version = "0.4.2", package = "madsim-tonic" }
 utils = { path = "../utils" }
 workspace-hack = { version = "0.1", path = "../../workspace-hack" }

crates/xlinectl/src/main.rs

@@ -164,10 +164,7 @@ use clap::{arg, value_parser, Command};
 use command::compaction;
 use ext_utils::config::ClientConfig;
 use tokio::fs;
-// #[cfg(not(madsim))]
 use tonic::transport::{Certificate, ClientTlsConfig};
-// #[cfg(madsim)]
-// use utils::ClientTlsConfig;
 use xline_client::{Client, ClientOptions};
 
 use crate::{