From 5f33bd3e0e6f96e493fe39c03cebcff7416f4dbf Mon Sep 17 00:00:00 2001 From: carlosthe19916 <2582866+carlosthe19916@users.noreply.github.com> Date: Sat, 13 Jul 2024 08:58:37 -0500 Subject: [PATCH] Add credentials skeleton --- openubl/api/src/system/mod.rs | 2 +- openubl/cli/src/main.rs | 3 +-- openubl/server/src/lib.rs | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/openubl/api/src/system/mod.rs b/openubl/api/src/system/mod.rs index 0f520cc8..3c187655 100644 --- a/openubl/api/src/system/mod.rs +++ b/openubl/api/src/system/mod.rs @@ -1,7 +1,7 @@ use std::fmt::{Debug, Display, Formatter}; use std::sync::Arc; -use sea_orm::{ConnectionTrait, ConnectOptions, Database, DatabaseConnection, DbErr, Statement}; +use sea_orm::{ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbErr, Statement}; use migration::{Migrator, MigratorTrait}; diff --git a/openubl/cli/src/main.rs b/openubl/cli/src/main.rs index e4fe2b71..68050fc9 100644 --- a/openubl/cli/src/main.rs +++ b/openubl/cli/src/main.rs @@ -5,8 +5,7 @@ use std::time::Duration; use clap::Parser; use postgresql_embedded::PostgreSQL; -use tokio::task::{LocalSet, spawn_local}; - +use tokio::task::{spawn_local, LocalSet}; #[allow(clippy::large_enum_variant)] #[derive(clap::Subcommand, Debug)] diff --git a/openubl/server/src/lib.rs b/openubl/server/src/lib.rs index 84d98530..0d1925e3 100644 --- a/openubl/server/src/lib.rs +++ b/openubl/server/src/lib.rs @@ -3,8 +3,8 @@ use std::process::ExitCode; use std::sync::Arc; use actix_multipart::form::tempfile::TempFileConfig; -use actix_web::{App, HttpServer, web}; use actix_web::middleware::Logger; +use actix_web::{web, App, HttpServer}; use openubl_api::system::InnerSystem; use openubl_common::config::Database; @@ -29,7 +29,6 @@ pub struct ServerRun { // #[command(flatten)] // pub oidc: openubl_oidc::config::Oidc, - #[command(subcommand)] pub storage: openubl_storage::config::Storage, }