From f73457b54b1d32ce5c15c87afcc51db2ed4a6ade Mon Sep 17 00:00:00 2001
From: Diego Imbert <diego@windmill.dev>
Date: Fri, 14 Nov 2025 11:41:22 +0100
Subject: [PATCH] avoid code duplication

---
 backend/Cargo.lock                   |  1 +
 backend/windmill-api/src/settings.rs | 80 ++++++++++------------------
 2 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 5ec4e577b8..6452d027a9 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -15269,6 +15269,7 @@ dependencies = [
  "pg_escape",
  "pin-project",
  "postgres-native-tls 0.5.0",
+ "postgres-native-tls 0.5.1",
  "prometheus",
  "quick_cache",
  "rand 0.9.0",
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index 4f762f19cd..4428dfc669 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -700,8 +700,7 @@ async fn setup_ducklake_catalog_db_inner(
         dbname = dbname,
         sslmode = ssl_mode
     );
-
-    if ssl_mode == "require" {
+    let (client, join_handle) = if ssl_mode == "require" {
         use native_tls::TlsConnector;
         use postgres_native_tls::MakeTlsConnector;
 
@@ -721,32 +720,7 @@ async fn setup_ducklake_catalog_db_inner(
         .map_err(|e| error::Error::ExecutionErr(format!("error: {}", e.to_string())))?;
 
         let join_handle = tokio::spawn(async move { connection.await });
-        logs.db_connect = "OK".to_string();
-
-        client
-            .batch_execute(&format!(
-                "GRANT CONNECT ON DATABASE \"{dbname}\" TO ducklake_user;
-                GRANT USAGE ON SCHEMA public TO ducklake_user;
-                GRANT CREATE ON SCHEMA public TO ducklake_user;
-                ALTER DEFAULT PRIVILEGES IN SCHEMA public
-                    GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO ducklake_user;"
-            ))
-            .await
-            .map_err(|e| {
-                error::Error::ExecutionErr(format!(
-                    "Failed to grant permissions to ducklake_user: {}",
-                    e.to_string(),
-                ))
-            })?;
-        logs.grant_permissions = "OK".to_string();
-
-        drop(client); // /!\ Drop before joining to avoid deadlock
-        join_handle
-            .await
-            .map_err(|e| error::Error::ExecutionErr(format!("join error: {}", e.to_string())))?
-            .map_err(|e| {
-                error::Error::ExecutionErr(format!("tokio_postgres error: {}", e.to_string()))
-            })?;
+        (client, join_handle)
     } else {
         let (client, connection) = tokio::time::timeout(
             std::time::Duration::from_secs(20),
@@ -757,33 +731,35 @@ async fn setup_ducklake_catalog_db_inner(
         .map_err(|e| error::Error::ExecutionErr(format!("error: {}", e.to_string())))?;
 
         let join_handle = tokio::spawn(async move { connection.await });
-        logs.db_connect = "OK".to_string();
+        (client, join_handle)
+    };
 
-        client
-            .batch_execute(&format!(
-                "GRANT CONNECT ON DATABASE \"{dbname}\" TO ducklake_user;
-                GRANT USAGE ON SCHEMA public TO ducklake_user;
-                GRANT CREATE ON SCHEMA public TO ducklake_user;
-                ALTER DEFAULT PRIVILEGES IN SCHEMA public
-                    GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO ducklake_user;"
+    logs.db_connect = "OK".to_string();
+
+    client
+        .batch_execute(&format!(
+            "GRANT CONNECT ON DATABASE \"{dbname}\" TO ducklake_user;
+             GRANT USAGE ON SCHEMA public TO ducklake_user;
+             GRANT CREATE ON SCHEMA public TO ducklake_user;
+             ALTER DEFAULT PRIVILEGES IN SCHEMA public
+                 GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO ducklake_user;"
+        ))
+        .await
+        .map_err(|e| {
+            error::Error::ExecutionErr(format!(
+                "Failed to grant permissions to ducklake_user: {}",
+                e.to_string(),
             ))
-            .await
-            .map_err(|e| {
-                error::Error::ExecutionErr(format!(
-                    "Failed to grant permissions to ducklake_user: {}",
-                    e.to_string(),
-                ))
-            })?;
-        logs.grant_permissions = "OK".to_string();
+        })?;
+    logs.grant_permissions = "OK".to_string();
 
-        drop(client); // /!\ Drop before joining to avoid deadlock
-        join_handle
-            .await
-            .map_err(|e| error::Error::ExecutionErr(format!("join error: {}", e.to_string())))?
-            .map_err(|e| {
-                error::Error::ExecutionErr(format!("tokio_postgres error: {}", e.to_string()))
-            })?;
-    }
+    drop(client); // /!\ Drop before joining to avoid deadlock
+    join_handle
+        .await
+        .map_err(|e| error::Error::ExecutionErr(format!("join error: {}", e.to_string())))?
+        .map_err(|e| {
+            error::Error::ExecutionErr(format!("tokio_postgres error: {}", e.to_string()))
+        })?;
 
     Ok(())
 }