Fix getting database config from environment

db/src/config.rs

@@ -1,32 +1,15 @@
-use clap::Parser;
 use std::env;
 
-#[derive(Parser)]
-struct DatabaseConfig {
-    #[arg(env = "PGHOST")]
-    pg_host: String,
-    #[arg(env = "PGPORT")]
-    pg_port: u16,
-    #[arg(env = "PGUSER")]
-    pg_user: String,
-    #[arg(env = "PGPASSWORD", hide_env_values = true)]
-    pg_password: String,
-    #[arg(env = "PGDATABASE")]
-    pg_database: String,
-}
-
 pub fn database_url() -> String {
     // Legacy database URL, will be removed in a future version
     if let Ok(url) = env::var("DATABASE_URL") {
         return url;
     }
 
-    let DatabaseConfig {
-        pg_host,
-        pg_port,
-        pg_user,
-        pg_password,
-        pg_database,
-    } = DatabaseConfig::parse();
+    let pg_host = env::var("PGHOST").expect("No PGHOST defined");
+    let pg_port = env::var("PGPORT").expect("No PGPORT defined");
+    let pg_user = env::var("PGUSER").expect("No PGUSER defined");
+    let pg_password = env::var("PGPASSWORD").expect("No PGPASSWORD defined");
+    let pg_database = env::var("PGDATABASE").expect("No PGDATABASE defined");
     format!("postgres://{pg_user}:{pg_password}@{pg_host}:{pg_port}/{pg_database}")
 }

scripts/run-db.sh

@@ -9,7 +9,7 @@ export PGUSER="postgres"
 export PGPORT="5432"
 export PGDATABASE="test"
 export PGPASSWORD="postgres"
-export DATABASE_URL="postgres://${PGUSER}:${PGPASSWORD}@127.0.0.1:${PGPORT}/${PGDATABASE}"
+
 DB_CONTAINER="${PGDATABASE}-postgres"
 
 if ps -ef | grep kubectl | grep port-forward | grep "${PGPORT}" &> /dev/null