fix(config): add gateway subdomain configuration for database connect… (#77)

Co-authored-by: Robert Yan <mstr.raphael@gmail.com>

Author: Evrard-Nil

crates/config/src/lib.rs

@@ -12,6 +12,7 @@ pub struct DatabaseConfig {
     pub tls_enabled: bool,
     pub tls_ca_cert_path: Option<String>,
     pub primary_app_id: String,
+    pub gateway_subdomain: String,
     pub refresh_interval: u64,
     pub mock: bool,
 }
@@ -45,6 +46,7 @@ impl Default for DatabaseConfig {
                 .unwrap_or(false),
             tls_ca_cert_path: std::env::var("DATABASE_TLS_CA_CERT_PATH").ok(),
             primary_app_id: std::env::var("DATABASE_PRIMARY_APP_ID").unwrap_or_default(),
+            gateway_subdomain: std::env::var("GATEWAY_SUBDOMAIN").unwrap_or_default(),
             refresh_interval: std::env::var("DATABASE_REFRESH_INTERVAL")
                 .ok()
                 .and_then(|v| v.parse().ok())

crates/database/src/lib.rs

@@ -83,6 +83,7 @@ impl Database {
         // Create Patroni discovery
         let discovery = Arc::new(PatroniDiscovery::new(
             config.primary_app_id.clone(),
+            config.gateway_subdomain.clone(),
             config.refresh_interval,
         ));
 

crates/database/src/patroni_discovery.rs

@@ -37,18 +37,24 @@ pub struct ClusterState {
 pub struct PatroniDiscovery {
     client: Client,
     postgres_app_id: String,
+    gateway_subdomain: String,
     cluster_state: Arc<RwLock<Option<ClusterState>>>,
     refresh_interval: Duration,
 }
 
 impl PatroniDiscovery {
-    pub fn new(postgres_app_id: String, refresh_interval_secs: u64) -> Self {
+    pub fn new(
+        postgres_app_id: String,
+        gateway_subdomain: String,
+        refresh_interval_secs: u64,
+    ) -> Self {
         Self {
             client: Client::builder()
                 .timeout(Duration::from_secs(10))
                 .build()
                 .expect("Failed to create HTTP client"),
             postgres_app_id,
+            gateway_subdomain,
             cluster_state: Arc::new(RwLock::new(None)),
             refresh_interval: Duration::from_secs(refresh_interval_secs),
         }
@@ -61,14 +67,14 @@ impl PatroniDiscovery {
             self.postgres_app_id
         );
 
-        let url = "http://dstack-service/cluster";
+        let url = format!(
+            "https://{}-8008.{}/cluster",
+            self.postgres_app_id, self.gateway_subdomain
+        );
+
         let response = self
             .client
             .get(url)
-            .header("x-dstack-target-app", &self.postgres_app_id)
-            .header("x-dstack-target-port", "8008")
-            .header("x-dstack-target-use-tls", "false")
-            .header("Host", "vpc-server")
             .send()
             .await
             .map_err(|e| anyhow!("Failed to connect to Patroni API: {e}"))?;
@@ -282,7 +288,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_get_least_lag_replica() {
-        let discovery = PatroniDiscovery::new("test-app".to_string(), 30);
+        let discovery =
+            PatroniDiscovery::new("test-app".to_string(), "dstack.internal".to_string(), 30);
 
         let replica1 = create_test_member("replica1", "replica", Some(100));
         let replica2 = create_test_member("replica2", "replica", Some(10));
@@ -312,7 +319,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_get_replicas_by_lag() {
-        let discovery = PatroniDiscovery::new("test-app".to_string(), 30);
+        let discovery =
+            PatroniDiscovery::new("test-app".to_string(), "dstack.internal".to_string(), 30);
 
         let replica1 = create_test_member("replica1", "replica", Some(100));
         let replica2 = create_test_member("replica2", "replica", Some(10));
@@ -331,7 +339,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_round_robin_selection() {
-        let discovery = PatroniDiscovery::new("test-app".to_string(), 30);
+        let discovery =
+            PatroniDiscovery::new("test-app".to_string(), "dstack.internal".to_string(), 30);
 
         let replica1 = create_test_member("replica1", "replica", None);
         let replica2 = create_test_member("replica2", "replica", None);

crates/database/src/pool.rs

@@ -102,6 +102,7 @@ mod tests {
         let config = config::DatabaseConfig {
             host: Some("localhost".to_string()),
             port: 5432,
+            gateway_subdomain: "dstack.internal".to_string(),
             database: "test_db".to_string(),
             username: "postgres".to_string(),
             password: "postgres".to_string(),
@@ -121,6 +122,7 @@ mod tests {
         let config = config::DatabaseConfig {
             host: Some("remote.example.com".to_string()),
             port: 5432,
+            gateway_subdomain: "dstack.internal".to_string(),
             database: "prod_db".to_string(),
             username: "user".to_string(),
             password: "pass".to_string(),
@@ -142,6 +144,7 @@ mod tests {
             host: Some("localhost".to_string()),
             port: 5432,
             database: "cloud_api".to_string(),
+            gateway_subdomain: "dstack.internal".to_string(),
             username: "postgres".to_string(),
             password: "postgres".to_string(),
             max_connections: 5,
@@ -160,6 +163,7 @@ mod tests {
         let remote_config = config::DatabaseConfig {
             host: Some("prod-db.example.com".to_string()),
             port: 5432,
+            gateway_subdomain: "dstack.internal".to_string(),
             database: "cloud_api_prod".to_string(),
             username: "app_user".to_string(),
             password: "secure_password".to_string(),

env.example

@@ -67,3 +67,6 @@ CORS_ALLOWED_ORIGINS=http://localhost:3000
 # NEAR Authentication (NEP-413)
 # Expected recipient for signed messages (defaults to private.near.ai)
 NEAR_EXPECTED_RECIPIENT=private.near.ai
+
+# Dstack Gateway Subdomain
+GATEWAY_SUBDOMAIN=cvm1.near.ai