Rename migrations

crates/defguard/src/main.rs

@@ -143,7 +143,7 @@ async fn main() -> Result<(), anyhow::Error> {
     }
 
     let has_auto_adopt_flags = config.adopt_edge.is_some() && config.adopt_gateway.is_some();
-    let mut wizard = Wizard::init(&pool, has_auto_adopt_flags, &config).await?;
+    let wizard = Wizard::init(&pool, has_auto_adopt_flags, &config).await?;
 
     Settings::initialize_runtime_defaults(&pool).await?;
     SERVER_CONFIG.set(config.clone()).ok();
@@ -182,9 +182,7 @@ async fn main() -> Result<(), anyhow::Error> {
         }
     }
 
-    wizard
-        .update_last_version_migrated_to(&pool, CARGO_VERSION)
-        .await?;
+    Wizard::update_last_version_migrated_to(&pool, CARGO_VERSION).await?;
 
     // Reload settings from database after setup completion to ensure any changes made during setup
     // are reflected in the in-memory settings.

crates/defguard_common/src/db/models/wizard.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
 use serde::{Deserialize, Serialize};
-use sqlx::{PgExecutor, Type, query, query_as};
+use sqlx::{PgExecutor, PgPool, Type, query, query_as};
 use tracing::{error, info};
 use url::Url;
 
@@ -214,15 +214,12 @@ impl Wizard {
         }
     }
 
-    pub async fn update_last_version_migrated_to<'e, E>(
-        &mut self,
-        executor: E,
+    pub async fn update_last_version_migrated_to(
+        pool: &PgPool,
         version: &str,
-    ) -> Result<(), sqlx::Error>
-    where
-        E: PgExecutor<'e>,
-    {
-        self.last_version_migrated_to = Some(version.to_string());
-        self.save(executor).await
+    ) -> Result<(), sqlx::Error> {
+        let mut wizard = Self::get(pool).await?;
+        wizard.last_version_migrated_to = Some(version.to_string());
+        wizard.save(pool).await
     }
 }

crates/defguard_core/src/handlers/gateway.rs

@@ -98,7 +98,7 @@ pub struct GatewayUpdateData {
         ("api_token" = [])
     )
 )]
-pub(crate) async fn gateway_list(
+pub async fn gateway_list(
     _role: AdminRole,
     session: SessionInfo,
     State(appstate): State<AppState>,

crates/defguard_core/src/letsencrypt.rs

@@ -333,8 +333,8 @@ mod tests {
     use std::{
         net::{IpAddr, Ipv4Addr, SocketAddr},
         pin::Pin,
-        sync::Arc,
-        sync::Once,
+        str::FromStr,
+        sync::{Arc, Once},
         time::Duration,
     };
 
@@ -351,7 +351,6 @@ mod tests {
         AcmeCertificate, AcmeIssueEvent, AcmeLogs, AcmeProgress, AcmeStep, proxy_server,
     };
     use sqlx::postgres::{PgConnectOptions, PgPoolOptions};
-    use std::str::FromStr;
     use tokio::{
         net::TcpListener,
         sync::{Mutex, mpsc},

crates/defguard_setup/src/migration.rs

@@ -26,6 +26,7 @@ use defguard_core::{
             webauthn_end, webauthn_finish, webauthn_init, webauthn_start,
         },
         component_setup::{setup_gateway_tls_stream, setup_proxy_tls_stream, stream_proxy_acme},
+        gateway::gateway_list,
         resource_display::get_locations_display,
         session_info::get_session_info,
         settings::{get_settings, get_settings_essentials, patch_settings},
@@ -133,6 +134,7 @@ pub fn build_migration_webapp(
                     "/network/{network_id}/gateways/setup",
                     get(setup_gateway_tls_stream),
                 )
+                .route("/gateway", get(gateway_list))
                 .nest(
                     "/migration",
                     Router::new()