fix e2e_test token validate

Signed-off-by: junxiang Mu <1948535941@qq.com>

e2e_test/src/reliant/lock.rs

@@ -1,55 +1,18 @@
 #![cfg(test)]
 
-use std::{collections::HashMap, error::Error, sync::Arc, time::Duration, vec};
+use std::{error::Error, sync::Arc, time::Duration};
 
-use lazy_static::lazy_static;
 use lock::{
     drwmutex::Options,
     lock_args::LockArgs,
     namespace_lock::{new_nslock, NsLockMap},
     new_lock_api,
 };
-use protos::proto_gen::node_service::{node_service_client::NodeServiceClient, GenerallyLockRequest};
+use protos::{node_service_time_out_client, proto_gen::node_service::GenerallyLockRequest};
 use tokio::sync::RwLock;
-use tonic::{
-    metadata::MetadataValue,
-    service::interceptor::InterceptedService,
-    transport::{Channel, Endpoint},
-    Request, Status,
-};
+use tonic::Request;
 
-lazy_static! {
-    pub static ref GLOBAL_Conn_Map: RwLock<HashMap<String, Channel>> = RwLock::new(HashMap::new());
-}
-
-async fn get_client() -> Result<
-    NodeServiceClient<
-        InterceptedService<Channel, Box<dyn Fn(Request<()>) -> Result<Request<()>, Status> + Send + Sync + 'static>>,
-    >,
-    Box<dyn Error>,
-> {
-    let token: MetadataValue<_> = "rustfs rpc".parse()?;
-    let channel = match GLOBAL_Conn_Map.read().await.get("local") {
-        Some(channel) => channel.clone(),
-        None => {
-            println!("get channel start");
-            let connector = Endpoint::from_static("http://localhost:9000").connect_timeout(Duration::from_secs(60));
-            let channel = connector.connect().await?;
-            // let channel = Channel::from_static("http://localhost:9000").connect().await?;
-            channel
-        }
-    };
-    GLOBAL_Conn_Map.write().await.insert("local".to_owned(), channel.clone());
-
-    // let timeout_channel = Timeout::new(channel, Duration::from_secs(60));
-    Ok(NodeServiceClient::with_interceptor(
-        channel,
-        Box::new(move |mut req: Request<()>| {
-            req.metadata_mut().insert("authorization", token.clone());
-            Ok(req)
-        }),
-    ))
-}
+const CLUSTER_ADDR: &str = "http://localhost:9000";
 
 #[tokio::test]
 async fn test_lock_unlock_rpc() -> Result<(), Box<dyn Error>> {
@@ -62,7 +25,7 @@ async fn test_lock_unlock_rpc() -> Result<(), Box<dyn Error>> {
     };
     let args = serde_json::to_string(&args)?;
 
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     println!("got client");
     let request = Request::new(GenerallyLockRequest { args: args.clone() });
 

e2e_test/src/reliant/node_interact_test.rs

@@ -3,17 +3,13 @@
 use ecstore::disk::VolumeInfo;
 use protos::{
     models::{PingBody, PingBodyBuilder},
-    proto_gen::node_service::{
-        node_service_client::NodeServiceClient, ListVolumesRequest, MakeVolumeRequest, PingRequest, PingResponse, ReadAllRequest,
-    },
+    node_service_time_out_client,
+    proto_gen::node_service::{ListVolumesRequest, MakeVolumeRequest, PingRequest, PingResponse, ReadAllRequest},
 };
 use std::error::Error;
 use tonic::Request;
 
-async fn get_client() -> Result<NodeServiceClient<tonic::transport::Channel>, Box<dyn Error>> {
-    // Ok(NodeServiceClient::connect("http://220.181.1.138:9000").await?)
-    Ok(NodeServiceClient::connect("http://localhost:9000").await?)
-}
+const CLUSTER_ADDR: &str = "http://localhost:9000";
 
 #[tokio::test]
 async fn ping() -> Result<(), Box<dyn Error>> {
@@ -31,7 +27,7 @@ async fn ping() -> Result<(), Box<dyn Error>> {
     assert!(decoded_payload.is_ok());
 
     // 创建客户端
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
 
     // 构造 PingRequest
     let request = Request::new(PingRequest {
@@ -55,7 +51,7 @@ async fn ping() -> Result<(), Box<dyn Error>> {
 
 #[tokio::test]
 async fn make_volume() -> Result<(), Box<dyn Error>> {
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     let request = Request::new(MakeVolumeRequest {
         disk: "data".to_string(),
         volume: "dandan".to_string(),
@@ -72,7 +68,7 @@ async fn make_volume() -> Result<(), Box<dyn Error>> {
 
 #[tokio::test]
 async fn list_volumes() -> Result<(), Box<dyn Error>> {
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     let request = Request::new(ListVolumesRequest {
         disk: "data".to_string(),
     });
@@ -90,7 +86,7 @@ async fn list_volumes() -> Result<(), Box<dyn Error>> {
 
 #[tokio::test]
 async fn read_all() -> Result<(), Box<dyn Error>> {
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     let request = Request::new(ReadAllRequest {
         disk: "data".to_string(),
         volume: "ff".to_string(),