Move host arg

Author: matthewmturner

src/args.rs

@@ -92,28 +92,25 @@ pub struct DftArgs {
     #[clap(short = 'n', help = "Set the number of benchmark iterations to run")]
     pub benchmark_iterations: Option<usize>,
 
-    #[cfg(any(feature = "flightsql", feature = "http"))]
-    #[clap(
-        long,
-        global = true,
-        help = "Set the host and port to be used for server"
-    )]
-    pub host: Option<String>,
-
     #[clap(
         long,
         short,
         help = "Path to save output to. Type is inferred from file suffix"
     )]
     pub output: Option<PathBuf>,
 
+    #[cfg(any(feature = "flightsql", feature = "http"))]
     #[command(subcommand)]
     pub command: Option<Command>,
 }
 
 impl DftArgs {
     pub fn config_path(&self) -> PathBuf {
-        if let Some(Command::ServeFlightSql { config: Some(cfg) }) = &self.command {
+        #[cfg(any(feature = "flightsql", feature = "http"))]
+        if let Some(Command::ServeFlightSql {
+            config: Some(cfg), ..
+        }) = &self.command
+        {
             return Path::new(cfg).to_path_buf();
         }
         if let Some(config) = self.config.as_ref() {
@@ -132,12 +129,24 @@ pub enum Command {
     ServeHttp {
         #[clap(short, long)]
         config: Option<String>,
+        #[clap(
+            long,
+            global = true,
+            help = "Set the host and port to be used for server"
+        )]
+        host: Option<String>,
     },
     /// Start a FlightSQL server
     #[command(name = "serve-flightsql")]
     ServeFlightSql {
         #[clap(short, long)]
         config: Option<String>,
+        #[clap(
+            long,
+            global = true,
+            help = "Set the host and port to be used for server"
+        )]
+        host: Option<String>,
     },
 }
 

src/cli/mod.rs

@@ -16,6 +16,7 @@
 // under the License.
 //! [`CliApp`]: Command Line User Interface
 
+use crate::args::Command;
 use crate::config::AppConfig;
 use crate::{args::DftArgs, execution::AppExecution};
 use color_eyre::eyre::eyre;
@@ -613,7 +614,15 @@ pub async fn try_run(cli: DftArgs, config: AppConfig) -> Result<()> {
                 auth,
             );
             let flightsql_ctx = FlightSQLContext::new(flightsql_cfg);
-            flightsql_ctx.create_client(cli.host.clone()).await?;
+            let url = if let Some(cmd) = cli.command.clone() {
+                match cmd {
+                    Command::ServeFlightSql { host, .. } => host,
+                    Command::ServeHttp { host, .. } => host,
+                }
+            } else {
+                None
+            };
+            flightsql_ctx.create_client(url).await?;
             app_execution.with_flightsql_ctx(flightsql_ctx);
         }
     }

src/server/flightsql/mod.rs

@@ -188,10 +188,18 @@ pub async fn try_run(cli: DftArgs, config: AppConfig) -> Result<()> {
         execution_ctx.execute_ddl().await;
     }
     let app_execution = AppExecution::new(execution_ctx);
+    let url = if let Some(cmd) = cli.command.clone() {
+        match cmd {
+            crate::args::Command::ServeFlightSql { host, .. } => host,
+            crate::args::Command::ServeHttp { host, .. } => host,
+        }
+    } else {
+        None
+    };
     let app = FlightSqlApp::try_new(
         app_execution,
         &config,
-        &cli.host.unwrap_or(DEFAULT_SERVER_ADDRESS.to_string()),
+        &url.unwrap_or(DEFAULT_SERVER_ADDRESS.to_string()),
         &config.flightsql_server.server_metrics_port,
     )
     .await?;

src/server/http/mod.rs

@@ -153,10 +153,18 @@ pub async fn try_run(cli: DftArgs, config: AppConfig) -> Result<()> {
         }
     }
     debug!("Created AppExecution: {app_execution:?}");
+    let url = if let Some(cmd) = cli.command.clone() {
+        match cmd {
+            crate::args::Command::ServeFlightSql { host, .. } => host,
+            crate::args::Command::ServeHttp { host, .. } => host,
+        }
+    } else {
+        None
+    };
     let app = HttpApp::try_new(
         app_execution,
         config.clone(),
-        &cli.host.unwrap_or(DEFAULT_SERVER_ADDRESS.to_string()),
+        &url.unwrap_or(DEFAULT_SERVER_ADDRESS.to_string()),
         &config.http_server.server_metrics_port,
     )
     .await?;

src/server/http/router.rs

@@ -286,7 +286,6 @@ mod test {
         config::ExecutionConfig, extensions::DftSessionStateBuilder, local::ExecutionContext,
     };
     use http::{Request, StatusCode};
-    use http_body_util::BodyExt;
 
     use crate::{
         config::HttpServerConfig, execution::AppExecution, server::http::router::create_router,

src/tui/handlers/mod.rs

@@ -24,6 +24,7 @@ use log::{error, info, trace};
 use ratatui::crossterm::event::{self, KeyCode, KeyEvent};
 use tui_logger::TuiWidgetEvent;
 
+use crate::args::Command;
 #[cfg(feature = "flightsql")]
 use crate::tui::state::tabs::flightsql::FlightSQLConnectionStatus;
 use crate::tui::state::tabs::history::Context;
@@ -245,7 +246,14 @@ pub fn app_event_handler(app: &mut App, event: AppEvent) -> Result<()> {
         AppEvent::FlightSQLEstablishConnection => {
             let execution = Arc::clone(&app.execution);
             let _event_tx = app.event_tx.clone();
-            let cli_url = app.args.host.clone();
+            let cli_url = if let Some(cmd) = app.args.command.clone() {
+                match cmd {
+                    Command::ServeFlightSql { host, .. } => host,
+                    Command::ServeHttp { host, .. } => host,
+                }
+            } else {
+                None
+            };
             tokio::spawn(async move {
                 if let Err(e) = execution.create_flightsql_client(cli_url).await {
                     error!("Error creating FlightSQL client: {:?}", e);