Better config

Dockerfile

@@ -1,5 +1,5 @@
 # Build container
-FROM debian:buster AS builder
+FROM debian:bookworm AS builder
 
 RUN apt-get update && apt-get install -y curl libssl-dev libpq-dev build-essential pkg-config
 
@@ -12,7 +12,7 @@ ADD . ./
 RUN cargo build --release
 
 # Deploy container
-FROM debian:buster
+FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y libssl-dev libpq-dev ca-certificates
 

docker-compose.yml

@@ -26,7 +26,11 @@ services:
       - RUST_LOG=info
       - KEPLER_ADDRESS=0.0.0.0
       - KEPLER_PORT=8000
-      - DATABASE_URL=postgres://kepler:kepler@db/kepler
+      - DB_HOST=db
+      - DB_PORT=5432
+      - DB_USER=kepler
+      - DB_PASSWORD=kepler
+      - DB_DATABASE=kepler
     ports:
       - "8000:8000"
 

kepler/Cargo.toml

@@ -9,7 +9,7 @@ license.workspace = true
 [dependencies]
 domain-db = { path = "../domain-db" }
 
-clap = {version = "4.3.15", features = ["derive"]}
+clap = { version = "4.3.15", features = ["derive"] }
 env_logger = "0.10.0"
 log = "0.4.19"
 serde = { version = "1.0.171", features = ["derive"] }
@@ -23,3 +23,5 @@ tracing-subscriber = { version = "0.3.17 ", features = ["env-filter"] }
 tracing-actix-web = "0.7.5"
 anyhow = "1.0.72"
 serde_json = "1.0.103"
+config = { version = "0.13.3", default-features = false }
+dotenvy = "0.15.7"

kepler/src/api/mod.rs → kepler/src/api.rs

@@ -17,7 +17,7 @@ mod telemetry;
 pub use telemetry::init_logger;
 
 pub struct ApiConfig {
-    pub host: String,
+    pub address: String,
     pub port: u16,
     pub repository: PostgresRepository,
 }
@@ -44,7 +44,7 @@ pub fn run(api_config: ApiConfig) -> Result<Server, anyhow::Error> {
             .wrap(Cors::permissive())
             .wrap(tracing_actix_web::TracingLogger::default())
     })
-    .bind((api_config.host, api_config.port))?
+    .bind((api_config.address, api_config.port))?
     .run();
     Ok(server)
 }

kepler/src/configuration.rs

@@ -0,0 +1,45 @@
+use config::{Config, Environment};
+use serde::Deserialize;
+
+#[derive(Deserialize, Clone, Debug)]
+pub struct ApiSettings {
+    pub address: String,
+    pub port: u16,
+}
+
+impl ApiSettings {
+    pub fn try_from_env() -> Result<Self, config::ConfigError> {
+        Config::builder()
+            .set_default("address", "0.0.0.0")?
+            .set_default("port", 8000)?
+            .add_source(Environment::with_prefix("KEPLER").prefix_separator("_"))
+            .build()?
+            .try_deserialize::<Self>()
+    }
+}
+
+#[derive(Deserialize, Clone, Debug)]
+pub struct DatabaseSettings {
+    host: String,
+    port: u16,
+    user: String,
+    password: String,
+    database: String,
+}
+
+impl DatabaseSettings {
+    pub fn try_from_env() -> Result<Self, config::ConfigError> {
+        Config::builder()
+            .set_default("port", 5432)?
+            .add_source(Environment::with_prefix("DB").prefix_separator("_"))
+            .build()?
+            .try_deserialize::<Self>()
+    }
+
+    pub fn connection_string(&self) -> String {
+        format!(
+            "postgres://{}:{}@{}:{}/{}",
+            self.user, self.password, self.host, self.port, self.database
+        )
+    }
+}

kepler/src/main.rs

@@ -1,20 +1,28 @@
 use anyhow::{bail, Context, Result};
 use clap::{Parser, Subcommand};
 use domain_db::{cve_sources::nist, db};
+use dotenvy::dotenv;
 use env_logger::Env;
-use std::{env, fs, path::Path};
+use lazy_static::lazy_static;
+use std::{fs, path::Path};
 
-use kepler::api::{self, ApiConfig};
+mod api;
+mod configuration;
+
+use crate::api::ApiConfig;
+use crate::configuration::{ApiSettings, DatabaseSettings};
 
 #[actix_web::main]
 async fn main() -> Result<()> {
     let opts = Opts::parse();
 
+    dotenv().ok();
+
     // Repository
     let repository = {
-        let database_url = env::var("DATABASE_URL")
-            .context("DATABASE_URL environment variable has not specified.")?;
-        db::PostgresRepository::new(&database_url, "./migrations")
+        let db_settings = DatabaseSettings::try_from_env()?;
+
+        db::PostgresRepository::new(&db_settings.connection_string(), "./migrations")
             .context("Cannot connect to database")?
     };
 
@@ -70,22 +78,12 @@ async fn main() -> Result<()> {
             }
         },
         None => {
-            let host = env::var("KEPLER_ADDRESS")
-                .map_err(|_| "Invalid or missing custom address")
-                .unwrap_or_else(|err| {
-                    log::warn!("{}. Using default 0.0.0.0", err);
-                    "0.0.0.0".to_string()
-                });
-            let port = env::var("KEPLER_PORT")
-                .map_err(|_| "Invalid or missing custom port")
-                .and_then(|s| s.parse::<u16>().map_err(|_| "Failed to parse custom port"))
-                .unwrap_or_else(|err| {
-                    log::warn!("{}. Using default 8000", err);
-                    8000
-                });
+            let ApiSettings { address, port } = ApiSettings::try_from_env()?;
+
+            log::info!("Start listening on {}:{}...", address, port);
 
             let api_config = ApiConfig {
-                host,
+                address,
                 port,
                 repository,
             };
@@ -198,3 +196,16 @@ fn report_message(num_records: u32) -> String {
         format!("{num_records} new records created")
     }
 }
+
+fn version() -> &'static str {
+    #[cfg(debug_assertions)]
+    lazy_static! {
+        static ref VERSION: String = format!("{}+dev", env!("CARGO_PKG_VERSION"));
+    }
+
+    #[cfg(not(debug_assertions))]
+    lazy_static! {
+        static ref VERSION: String = env!("CARGO_PKG_VERSION").to_string();
+    }
+    &VERSION
+}