feat(market-server-rust)!: extend configuration

guilhem-sante · guilhem-sante · commit 51c3dc79fb42 · 2025-11-19T16:35:59.000+01:00
Extended the application configuration through a new Config structure. Database secrets can now be loaded from files. Also added a /health route for automated health check. Closes #45 Closes #51 BREAKING CHANGE: The DATABASE_URL arguments have been splitted into DB_USER, DB_PASSWORD, DB_HOST, DB_PORT, DB_NAME
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,8 +26,10 @@ services:
       context: ./servers/rust-server
       dockerfile: docker/Dockerfile
     environment:
-      FINWAR_MARKET_DATABASE_URL: postgresql://${POSTGRES_USER:-finwar}:${POSTGRES_PASSWORD:-password}@timescaledb:5432/${POSTGRES_DB:-finwar}
-      RUST_LOG: info
+      FINWAR_MARKET_DB_USER: ${POSTGRES_USER:-finwar}
+      FINWAR_MARKET_DB_PASSWORD: ${POSTGRES_PASSWORD:-password}
+      FINWAR_MARKET_DB_HOST: timescaledb
+      FINWAR_MARKET_DB_NAME: ${POSTGRES_DB:-finwar}
     command: migrate
     depends_on:
       timescaledb:
@@ -40,9 +42,11 @@ services:
     ports:
       - "4444:4444"
     environment:
-      FINWAR_MARKET_DATABASE_URL: postgresql://${POSTGRES_USER:-finwar}:${POSTGRES_PASSWORD:-password}@timescaledb:5432/${POSTGRES_DB:-finwar}
-      FINWAR_MARKET_TARGET_TICKER: NVDA
-      RUST_LOG: info
+      FINWAR_MARKET_DB_USER: ${POSTGRES_USER:-finwar}
+      FINWAR_MARKET_DB_PASSWORD: ${POSTGRES_PASSWORD:-password}
+      FINWAR_MARKET_DB_HOST: timescaledb
+      FINWAR_MARKET_DB_NAME: ${POSTGRES_DB:-finwar}
+      FINWAR_MARKET_TARGET_TICKER: AAPL
     command: serve
     depends_on:
       migration:
diff --git a/servers/rust-server/Cargo.lock b/servers/rust-server/Cargo.lock
diff --git a/servers/rust-server/README.md b/servers/rust-server/README.md
@@ -45,7 +45,7 @@ sea-orm-cli migrate reset
 
 ### Environment Setup
 
-- Set `DATABASE_URL=postgres://finwar:password@localhost/finwar` as an env variable or in a .env
+- Set `FINWAR_MARKET_DB_USER=finwar`, `FINWAR_MARKET_DB_PASSWORD=password`, and `FINWAR_MARKET_DB_NAME=finwar` as an env variable or in a .env
 - Default server runs on `0.0.0.0:4444`
 - Stock data loaded from `./local/data/Stocks/` directory
 
@@ -68,7 +68,7 @@ docker build -t finwar-rust-server -f ./docker/Dockerfile .
 **Run only the server container:**
 
 ```bash
-docker run -p 4444:4444 -e DATABASE_URL=postgresql://finwar:password@host.docker.internal:5432/finwar finwar-rust-server
+docker run -p 4444:4444 -e FINWAR_MARKET_DB_USER=finwar FINWAR_MARKET_DB_PASSWORD=password FINWAR_MARKET_DB_NAME=finwar finwar-rust-server
 ```
 
 **Or use docker-compose (recommended):**
diff --git a/servers/rust-server/src/cli.rs b/servers/rust-server/src/cli.rs
@@ -1,50 +1,97 @@
 use clap::{Parser, Subcommand};
-use migration::{Migrator, MigratorTrait};
+use std::path::PathBuf;
 
-/// Simple CLI for the market server. Defaults to `serve` when no subcommand
-/// is provided.
-#[derive(Debug, Parser)]
-#[command(author, version, about = "Finwar market server CLI")]
-pub struct Opts {
-    #[command(subcommand)]
-    pub command: Command,
+macro_rules! env_prefix {
+    ($name:expr) => {
+        concat!("FINWAR_MARKET_", $name)
+    };
 }
 
-#[derive(Debug, Subcommand)]
-pub enum Command {
-    /// Start the HTTP server (default)
-    Serve,
-    /// Run database migrations using the workspace `migration` member
-    Migrate,
+/// Simple CLI for the market server.
+#[derive(Debug, Parser, Clone)]
+#[command(author, version, about = "Finwar market server CLI")]
+pub struct Args {
+  /// Log level (trace, debug, info, warn, error)
+  #[arg(long, env = env_prefix!("LOG_LEVEL"), default_value = "info")]
+  pub log_level: String,
+
+  #[command(subcommand)]
+  pub command: Commands,
 }
 
-pub async fn run() -> Result<(), crate::error::Error> {
-    let opts = Opts::parse();
+#[derive(Subcommand, Debug, Clone)]
+pub enum Commands {
+    Serve {
+        /// Host to bind to
+        #[arg(long, env = env_prefix!("HOST"), default_value = "0.0.0.0")]
+        host: String,
+
+        /// Port to bind to
+        #[arg(short, long, env = env_prefix!("PORT"), default_value = "4444")]
+        port: u16,
+
+        /// Database user
+        #[arg(long, env = env_prefix!("DB_USER"), required_unless_present = "db_user_file")]
+        db_user: Option<String>,
+
+        /// Database user file path
+        #[arg(long, env = env_prefix!("DB_USER_FILE"), required_unless_present = "db_user")]
+        db_user_file: Option<PathBuf>,
+
+        /// Database password
+        #[arg(long, env = env_prefix!("DB_PASSWORD"), required_unless_present = "db_password_file")]
+        db_password: Option<String>,
+
+        /// Database password file path
+        #[arg(long, env = env_prefix!("DB_PASSWORD_FILE"), required_unless_present = "db_password")]
+        db_password_file: Option<PathBuf>,
+
+        /// Database host
+        #[arg(long, env = env_prefix!("DB_HOST"), default_value = "localhost")]
+        db_host: String,
+    
+        /// Database port
+        #[arg(long, env = env_prefix!("DB_PORT"), default_value = "5432")]
+        db_port: u16,
+
+        /// Database name
+        #[arg(long, env = env_prefix!("DB_NAME"), default_value = "postgres")]
+        db_name: String,
+
+        #[arg(long, env = env_prefix!("TARGET_SYMBOL"), default_value = "AAPL")]
+        target_symbol: String,
+
+        #[arg(long, env = env_prefix!("TICK_INTERVAL_SECONDS"), default_value = "60")]
+        tick_interval_seconds: u64
+    },
 
-    match opts.command {
-        Command::Serve => {
-            let database_url =
-                std::env::var("FINWAR_MARKET_DATABASE_URL")
-                    .expect("FINWAR_MARKET_DATABASE_URL must be set");
+    Migrate {
+        /// Database user
+        #[arg(long, env = env_prefix!("DB_USER"), required_unless_present = "db_user_file")]
+        db_user: Option<String>,
 
-            let db_connection = sea_orm::Database::connect(&database_url)
-                .await
-                .map_err(crate::error::Error::InitDb)?;
+        /// Database user file path
+        #[arg(long, env = env_prefix!("DB_USER_FILE"), required_unless_present = "db_user")]
+        db_user_file: Option<PathBuf>,
 
-            crate::run_server(db_connection).await
-        },
-        Command::Migrate => {
-            let database_url =
-                std::env::var("FINWAR_MARKET_DATABASE_URL")
-                    .expect("FINWAR_MARKET_DATABASE_URL must be set");
+        /// Database password
+        #[arg(long, env = env_prefix!("DB_PASSWORD"), required_unless_present = "db_password_file")]
+        db_password: Option<String>,
 
-            let db_connection = sea_orm::Database::connect(&database_url)
-                .await
-                .map_err(crate::error::Error::InitDb)?;
+        /// Database password file path
+        #[arg(long, env = env_prefix!("DB_PASSWORD_FILE"), required_unless_present = "db_password")]
+        db_password_file: Option<PathBuf>,
 
-            Migrator::up(&db_connection, None).await?;
+        /// Database host
+        #[arg(long, env = env_prefix!("DB_HOST"), default_value = "localhost")]
+        db_host: String,
+    
+        /// Database port
+        #[arg(long, env = env_prefix!("DB_PORT"), default_value = "5432")]
+        db_port: u16,
 
-            Ok(())
-        },
+        /// Database name
+        #[arg(long, env = env_prefix!("DB_NAME"), default_value = "postgres")]
+        db_name: String,
     }
 }
diff --git a/servers/rust-server/src/config.rs b/servers/rust-server/src/config.rs
@@ -0,0 +1,133 @@
+use crate::cli::{Args, Commands};
+use std::fs;
+
+#[derive(Debug, Clone)]
+pub struct Config {
+  pub server: ServerConfig,
+  pub database: DatabaseConfig,
+  pub log: LogConfig,
+  pub target_symbol: String,
+  pub tick_interval_seconds: u64,
+}
+
+#[derive(Debug, Clone)]
+pub struct ServerConfig {
+  pub host: String,
+  pub port: u16,
+}
+
+#[derive(Debug, Clone)]
+pub struct DatabaseConfig {
+  pub user: Sensitive<String>,
+  pub password: Sensitive<String>,
+  pub host: String,
+  pub port: u16,
+  pub name: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct LogConfig {
+  pub level: String,
+}
+
+// Wrapper type for sensitive data that masks itself when printed
+#[derive(Clone)]
+pub struct Sensitive<T>(T);
+
+impl<T> Sensitive<T> {
+  fn new(value: T) -> Self {
+    Sensitive(value)
+  }
+  
+  pub fn expose(&self) -> &T {
+    &self.0
+  }
+}
+
+impl<T> std::fmt::Debug for Sensitive<T> {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    write!(f, "***")
+  }
+}
+
+impl<T> std::fmt::Display for Sensitive<T> {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    write!(f, "***")
+  }
+}
+
+impl Config {
+  pub fn from_args(
+    args: Args,
+  ) -> Self {
+    match args.command {
+      Commands::Serve {
+        host,
+        port,
+        db_user,
+        db_user_file,
+        db_password,
+        db_password_file,
+        db_host,
+        db_port,
+        db_name,
+        target_symbol,
+        tick_interval_seconds,
+      } => {
+        Config {
+          server: ServerConfig { host, port },
+          database: DatabaseConfig {
+            user: Sensitive::new(db_user.unwrap_or_else(|| {
+                fs::read_to_string(db_user_file.expect("missing database user secret file path"))
+                .expect("failed to read database user secret file").trim_end().to_string()
+            })),
+            password: Sensitive::new(db_password.unwrap_or_else(|| {
+                fs::read_to_string(db_password_file.expect("missing database user secret file path"))
+                .expect("failed to read database password secret file").trim_end().to_string()
+            })),
+            host: db_host,
+            port: db_port,
+            name: db_name,
+          },
+          log: LogConfig {
+            level: args.log_level,
+          },
+          target_symbol: target_symbol,
+          tick_interval_seconds: tick_interval_seconds,
+        }
+      },
+      Commands::Migrate {
+        db_user,
+        db_user_file,
+        db_password,
+        db_password_file,
+        db_host,
+        db_port,
+        db_name,
+      } => {
+        Config {
+          server: ServerConfig { host: String::from(""), port: 0 },
+          database: DatabaseConfig {
+            user: Sensitive::new(db_user.unwrap_or_else(|| {
+                fs::read_to_string(db_user_file.expect("missing database user secret file path"))
+                .expect("failed to read database user secret file").trim_end().to_string()
+            })),
+            password: Sensitive::new(db_password.unwrap_or_else(|| {
+                fs::read_to_string(db_password_file.expect("missing database user secret file path"))
+                .expect("failed to read database password secret file").trim_end().to_string()
+            })),
+            host: db_host,
+            port: db_port,
+            name: db_name,
+          },
+          log: LogConfig {
+            level: args.log_level,
+          },
+          target_symbol: String::from(""),
+          tick_interval_seconds: 0,
+        }
+      }
+    }
+
+  }
+}
diff --git a/servers/rust-server/src/main.rs b/servers/rust-server/src/main.rs
