Merge branch 'main' into feature/oidc-endpoint-passtrough

Author: lovasoa

src/app_config.rs

@@ -1,7 +1,7 @@
+use crate::cli::arguments::{parse_cli, Cli};
 use crate::webserver::content_security_policy::ContentSecurityPolicyTemplate;
 use crate::webserver::routing::RoutingConfig;
 use anyhow::Context;
-use crate::cli::arguments::{Cli, parse_cli};
 use config::Config;
 use openidconnect::IssuerUrl;
 use percent_encoding::AsciiSet;

src/cli/arguments.rs

@@ -1,6 +1,6 @@
+use super::commands::SubCommand;
 use clap::Parser;
 use std::path::PathBuf;
-use super::commands::SubCommand;
 
 #[derive(Parser)]
 #[clap(author, version, about, long_about = None)]

src/cli/commands.rs

@@ -1,6 +1,6 @@
+use chrono::Utc;
 use clap::Parser;
 use std::path::Path;
-use chrono::Utc;
 
 use crate::app_config::AppConfig;
 
@@ -21,10 +21,7 @@ impl SubCommand {
         match self {
             SubCommand::CreateMigration { migration_name } => {
                 // Pass configuration_directory from app_config
-                create_migration_file(
-                    migration_name,
-                    &app_config.configuration_directory,
-                ).await?;
+                create_migration_file(migration_name, &app_config.configuration_directory).await?;
                 Ok(())
             }
         }

src/lib.rs

@@ -71,6 +71,7 @@
 extern crate core;
 
 pub mod app_config;
+pub mod cli;
 pub mod dynamic_component;
 pub mod file_cache;
 pub mod filesystem;
@@ -79,7 +80,6 @@ pub mod template_helpers;
 pub mod templates;
 pub mod utils;
 pub mod webserver;
-pub mod cli;
 
 use crate::app_config::AppConfig;
 use crate::filesystem::FileSystem;