config: simplify runtime environment model

apps/admin-api/src/main.rs

@@ -9,6 +9,7 @@ mod storage;
 use std::{env, net::SocketAddr, path::PathBuf};
 
 use crank_registry::PostgresRegistry;
+use sqlx::postgres::PgConnectOptions;
 use tokio::net::TcpListener;
 use tracing::info;
 
@@ -28,15 +29,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         )
         .init();
 
-    let database_url = env::var("CRANK_DATABASE_URL")?;
     let storage_root = PathBuf::from(
         env::var("CRANK_STORAGE_ROOT").unwrap_or_else(|_| "/var/lib/crank/storage".into()),
     );
     let bind_addr = env::var("CRANK_ADMIN_BIND").unwrap_or_else(|_| "0.0.0.0:3001".into());
-    let public_base_url =
-        env::var("CRANK_PUBLIC_BASE_URL").unwrap_or_else(|_| "http://localhost:3000".into());
+    let base_url = env::var("CRANK_BASE_URL").unwrap_or_else(|_| "http://localhost:3000".into());
     let socket_addr: SocketAddr = bind_addr.parse()?;
-    let registry = PostgresRegistry::connect(&database_url).await?;
+    let registry = PostgresRegistry::connect_with_options(database_options_from_env()?).await?;
     let auth_settings = AuthSettings {
         session_secret: env::var("CRANK_SESSION_SECRET")?,
         password_pepper: env::var("CRANK_PASSWORD_PEPPER")?,
@@ -44,7 +43,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             .ok()
             .and_then(|value| value.parse::<i64>().ok())
             .unwrap_or(24),
-        cookie_secure: public_base_url.starts_with("https://"),
+        cookie_secure: base_url.starts_with("https://"),
         bootstrap_admin: BootstrapAdminConfig {
             email: env::var("CRANK_BOOTSTRAP_ADMIN_EMAIL")?,
             password: env::var("CRANK_BOOTSTRAP_ADMIN_PASSWORD")?,
@@ -79,3 +78,25 @@ fn env_flag(name: &str) -> bool {
         Some("1" | "true" | "yes" | "on")
     )
 }
+
+fn database_options_from_env() -> Result<PgConnectOptions, Box<dyn std::error::Error>> {
+    if let Ok(database_url) = env::var("CRANK_DATABASE_URL") {
+        return Ok(database_url.parse::<PgConnectOptions>()?);
+    }
+
+    let host = env::var("POSTGRES_HOST").unwrap_or_else(|_| "postgres".into());
+    let port = env::var("POSTGRES_PORT")
+        .ok()
+        .and_then(|value| value.parse::<u16>().ok())
+        .unwrap_or(5432);
+    let database = env::var("POSTGRES_DB").unwrap_or_else(|_| "crank".into());
+    let username = env::var("POSTGRES_USER").unwrap_or_else(|_| "crank".into());
+    let password = env::var("POSTGRES_PASSWORD").unwrap_or_else(|_| "crank".into());
+
+    Ok(PgConnectOptions::new()
+        .host(&host)
+        .port(port)
+        .database(&database)
+        .username(&username)
+        .password(&password))
+}