refactor: use clap::Parser for readability (#1088)

als fix Kafka `SslProtocol` parsing

---------

Co-authored-by: Nikhil Sinha <[email protected]>

Author: Devdutt Shenoi

src/about.rs

@@ -136,7 +136,7 @@ fn print_latest_release(latest_release: update::LatestRelease) {
 pub async fn print(config: &Config, meta: &StorageMetadata) {
     // print current version
     let current = current();
-    let latest_release = if config.parseable.check_update {
+    let latest_release = if config.options.check_update {
         update::get_latest(&meta.deployment_id).await.ok()
     } else {
         None

src/alerts/mod.rs

@@ -103,8 +103,8 @@ impl Alert {
     ) -> Context {
         let deployment_instance = format!(
             "{}://{}",
-            CONFIG.parseable.get_scheme(),
-            CONFIG.parseable.address
+            CONFIG.options.get_scheme(),
+            CONFIG.options.address
         );
         let deployment_id = storage::StorageMetadata::global().deployment_id;
         let deployment_mode = storage::StorageMetadata::global().mode.to_string();

src/analytics.rs

@@ -112,7 +112,7 @@ impl Report {
             memory_total_bytes: mem_total,
             platform: platform().to_string(),
             storage_mode: CONFIG.get_storage_mode_string().to_string(),
-            server_mode: CONFIG.parseable.mode,
+            server_mode: CONFIG.options.mode,
             version: current().released_version.to_string(),
             commit_hash: current().commit_hash,
             active_ingestors: ingestor_metrics.0,
@@ -219,7 +219,7 @@ async fn fetch_ingestors_metrics(
     let mut vec = vec![];
     let mut active_ingestors = 0u64;
     let mut offline_ingestors = 0u64;
-    if CONFIG.parseable.mode == Mode::Query {
+    if CONFIG.options.mode == Mode::Query {
         // send analytics for ingest servers
 
         // ingestor infos should be valid here, if not some thing is wrong

src/audit.rs

@@ -47,12 +47,7 @@ impl AuditLogger {
         // Try to construct the log endpoint URL by joining the base URL
         // with the ingest path, This can fail if the URL is not valid,
         // when the base URL is not set or the ingest path is not valid
-        let log_endpoint = match CONFIG
-            .parseable
-            .audit_logger
-            .as_ref()?
-            .join("/api/v1/ingest")
-        {
+        let log_endpoint = match CONFIG.options.audit_logger.as_ref()?.join("/api/v1/ingest") {
             Ok(url) => url,
             Err(err) => {
                 eprintln!("Couldn't setup audit logger: {err}");
@@ -71,8 +66,8 @@ impl AuditLogger {
             .header("x-p-stream", "audit_log");
 
         // Use basic auth if credentials are configured
-        if let Some(username) = CONFIG.parseable.audit_username.as_ref() {
-            req = req.basic_auth(username, CONFIG.parseable.audit_password.as_ref())
+        if let Some(username) = CONFIG.options.audit_username.as_ref() {
+            req = req.basic_auth(username, CONFIG.options.audit_password.as_ref())
         }
 
         match req.send().await {

src/banner.rs

@@ -25,7 +25,7 @@ use crate::{option::Config, storage::StorageMetadata};
 
 pub async fn print(config: &Config, meta: &StorageMetadata) {
     print_ascii_art();
-    let scheme = config.parseable.get_scheme();
+    let scheme = config.options.get_scheme();
     status_info(config, &scheme, meta.deployment_id);
     storage_info(config).await;
     about::print(config, meta).await;
@@ -50,10 +50,10 @@ fn status_info(config: &Config, scheme: &str, id: Uid) {
     let address = format!(
         "\"{}://{}\" ({}), \":{}\" (livetail), \":{}\" (flight protocol)",
         scheme,
-        config.parseable.address,
+        config.options.address,
         scheme.to_ascii_uppercase(),
-        config.parseable.grpc_port,
-        config.parseable.flight_port
+        config.options.grpc_port,
+        config.options.flight_port
     );
 
     let mut credentials =
@@ -63,7 +63,7 @@ fn status_info(config: &Config, scheme: &str, id: Uid) {
         credentials = "\"Using default creds admin, admin. Please set credentials with P_USERNAME and P_PASSWORD.\"".red().to_string();
     }
 
-    let llm_status = match &config.parseable.open_ai_key {
+    let llm_status = match &config.options.open_ai_key {
         Some(_) => "OpenAI Configured".green(),
         None => "Not Configured".grey(),
     };
@@ -107,7 +107,7 @@ async fn storage_info(config: &Config) {
         config.staging_dir().to_string_lossy(),
     );
 
-    if let Some(path) = &config.parseable.hot_tier_storage_path {
+    if let Some(path) = &config.options.hot_tier_storage_path {
         eprintln!(
             "\
         {:8}Hot Tier:           \"Enabled, Path: {}\"",

src/catalog/mod.rs

@@ -335,7 +335,7 @@ pub async fn remove_manifest_from_snapshot(
         STREAM_INFO.set_first_event_at(stream_name, None)?;
         storage.put_snapshot(stream_name, meta.snapshot).await?;
     }
-    match CONFIG.parseable.mode {
+    match CONFIG.options.mode {
         Mode::All | Mode::Ingest => {
             Ok(get_first_event(storage.clone(), stream_name, Vec::new()).await?)
         }
@@ -349,7 +349,7 @@ pub async fn get_first_event(
     dates: Vec<String>,
 ) -> Result<Option<String>, ObjectStorageError> {
     let mut first_event_at: String = String::default();
-    match CONFIG.parseable.mode {
+    match CONFIG.options.mode {
         Mode::All | Mode::Ingest => {
             // get current snapshot
             let stream_first_event = STREAM_INFO.get_first_event(stream_name)?;