Update config and add new routes

Author: matthewmturner

src/config.rs

@@ -135,6 +135,8 @@ pub struct HttpServerConfig {
     pub server_metrics_port: String,
     #[serde(default = "default_auth_config")]
     pub auth: AuthConfig,
+    #[serde(default = "default_timeout_seconds")]
+    pub timeout_seconds: u64,
 }
 
 #[cfg(feature = "http")]
@@ -145,6 +147,7 @@ impl Default for HttpServerConfig {
             connection_url: default_connection_url(),
             server_metrics_port: default_server_metrics_port(),
             auth: default_auth_config(),
+            timeout_seconds: default_timeout_seconds(),
         }
     }
 }
@@ -241,6 +244,11 @@ fn default_auth_config() -> AuthConfig {
     AuthConfig::default()
 }
 
+#[cfg(feature = "http")]
+fn default_timeout_seconds() -> u64 {
+    10
+}
+
 pub fn create_config(config_path: PathBuf) -> AppConfig {
     if config_path.exists() {
         debug!("Config exists");

src/server/http/mod.rs

@@ -69,14 +69,19 @@ pub struct HttpApp {
 
 impl HttpApp {
     /// create a new app for the flightsql server
-    pub async fn try_new(execution: AppExecution, addr: &str, metrics_addr: &str) -> Result<Self> {
+    pub async fn try_new(
+        execution: AppExecution,
+        config: AppConfig,
+        addr: &str,
+        metrics_addr: &str,
+    ) -> Result<Self> {
         info!("Listening to HTTP on {addr}");
         let listener = TcpListener::bind(addr).await.unwrap();
 
         // prepare the shutdown channel
         let state = execution.execution_ctx().clone();
 
-        let router = create_router(state);
+        let router = create_router(state, config.http_server);
 
         let metrics_addr: SocketAddr = metrics_addr.parse()?;
         try_start_metrics_server(metrics_addr)?;
@@ -114,6 +119,7 @@ pub async fn try_run(cli: DftArgs, config: AppConfig) -> Result<()> {
     let app_execution = AppExecution::new(execution_ctx);
     let app = HttpApp::try_new(
         app_execution,
+        config.clone(),
         &cli.host.unwrap_or(DEFAULT_SERVER_ADDRESS.to_string()),
         &config.http_server.server_metrics_port,
     )

src/server/http/router.rs

@@ -31,20 +31,22 @@ use log::error;
 use tokio_stream::StreamExt;
 use tower_http::{timeout::TimeoutLayer, trace::TraceLayer};
 
-const DEFAULT_TIMEOUT_SECONDS: u64 = 10;
+use crate::config::HttpServerConfig;
 
-pub fn create_router(execution: ExecutionContext) -> Router {
+pub fn create_router(execution: ExecutionContext, config: HttpServerConfig) -> Router {
     Router::new()
         .route(
             "/",
             get(|State(_): State<ExecutionContext>| async { "Hello, from DFT!" }),
         )
         .route("/sql", get(execute_sql))
+        .route("/catalog", get(execute_sql))
+        .route("/{catalog}/{schema}/{table}", get(execute_sql))
         .layer((
             TraceLayer::new_for_http(),
             // Graceful shutdown will wait for outstanding requests to complete. Add a timeout so
             // requests don't hang forever.
-            TimeoutLayer::new(Duration::from_secs(DEFAULT_TIMEOUT_SECONDS)),
+            TimeoutLayer::new(Duration::from_secs(config.timeout_seconds)),
         ))
         .with_state(execution)
 }