From 41f4bd55e572e0cbbd5a35794f1b65ff53adf5fd Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul@quickwit.io>
Date: Tue, 14 Nov 2023 00:39:38 +0900
Subject: [PATCH] Removing search/ingest specific client building method.
 (#4125)

---
 quickwit/quickwit-cli/src/index.rs |  4 ++--
 quickwit/quickwit-cli/src/lib.rs   | 23 -----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/quickwit/quickwit-cli/src/index.rs b/quickwit/quickwit-cli/src/index.rs
index 809622a302b..8c002828982 100644
--- a/quickwit/quickwit-cli/src/index.rs
+++ b/quickwit/quickwit-cli/src/index.rs
@@ -800,7 +800,7 @@ pub async fn ingest_docs_cli(args: IngestDocsArgs) -> anyhow::Result<()> {
         progress_bar.set_message(format!("{throughput:.1} MiB/s"));
     };
 
-    let qw_client = args.client_args.ingest_client();
+    let qw_client = args.client_args.client();
     let ingest_source = match args.input_path_opt {
         Some(filepath) => IngestSource::File(filepath),
         None => IngestSource::Stdin,
@@ -862,7 +862,7 @@ pub async fn search_index(args: SearchIndexArgs) -> anyhow::Result<SearchRespons
         count_all: CountHits::CountAll,
         ..Default::default()
     };
-    let qw_client = args.client_args.search_client();
+    let qw_client = args.client_args.client();
     let search_response = qw_client.search(&args.index_id, search_request).await?;
     Ok(search_response)
 }
diff --git a/quickwit/quickwit-cli/src/lib.rs b/quickwit/quickwit-cli/src/lib.rs
index 9ed3377869c..aaad5246615 100644
--- a/quickwit/quickwit-cli/src/lib.rs
+++ b/quickwit/quickwit-cli/src/lib.rs
@@ -129,30 +129,7 @@ impl ClientArgs {
         }
         if let Some(timeout) = self.timeout {
             builder = builder.timeout(timeout);
-        }
-        if self.ingest_v2 {
-            builder = builder.enable_ingest_v2();
-        }
-        builder.build()
-    }
-
-    pub fn search_client(self) -> QuickwitClient {
-        let mut builder = QuickwitClientBuilder::new(self.cluster_endpoint);
-        if let Some(connect_timeout) = self.connect_timeout {
-            builder = builder.connect_timeout(connect_timeout);
-        }
-        if let Some(timeout) = self.timeout {
             builder = builder.search_timeout(timeout);
-        }
-        builder.build()
-    }
-
-    pub fn ingest_client(self) -> QuickwitClient {
-        let mut builder = QuickwitClientBuilder::new(self.cluster_endpoint);
-        if let Some(connect_timeout) = self.connect_timeout {
-            builder = builder.connect_timeout(connect_timeout);
-        }
-        if let Some(timeout) = self.timeout {
             builder = builder.ingest_timeout(timeout);
         }
         if let Some(commit_timeout) = self.commit_timeout {