github-starred/komodo
2
0
Fork 1
mirror of https://github.com/moghtech/komodo.git synced 2026-03-11 17:44:19 -05:00
Code Issues 258 Packages Projects Releases 10 Wiki Activity

more dynamic mongo info loading from config

Browse Source
This commit is contained in:
mbecker20
2023-07-08 05:54:12 +00:00
parent 553a2e3dad
commit 0e1026a100
2 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/config.rs
View File

@@ -112,14 +112,10 @@ pub struct OauthCredentials {
#[derive(Deserialize, Debug, Clone)]
pub struct MongoConfig {
#[serde(default)]
pub uri: String,
#[serde(default)]
pub address: String,
#[serde(default)]
pub username: String,
#[serde(default)]
pub password: String,
pub uri: Option<String>,
pub address: Option<String>,
pub username: Option<String>,
pub password: Option<String>,
#[serde(default = "default_core_mongo_app_name")]
pub app_name: String,
#[serde(default = "default_core_mongo_db_name")]

63
core/src/db.rs
View File

@@ -1,10 +1,10 @@
use monitor_types::entities::{
build::Build, builder::Builder, deployment::Deployment, repo::Repo, server::Server,
update::Update, user::User, tag::CustomTag,
tag::CustomTag, update::Update, user::User,
};
use mungos::{Collection, Indexed, Mungos};
use crate::config::CoreConfig;
use crate::config::{CoreConfig, MongoConfig};
pub struct DbClient {
pub users: Collection<User>,
@@ -18,21 +18,52 @@ pub struct DbClient {
}
impl DbClient {
pub async fn new(config: &CoreConfig) -> anyhow::Result<DbClient> {
let mungos = Mungos::builder()
.uri(&config.mongo.uri)
.app_name(&config.mongo.app_name)
.build()
.await?;
pub async fn new(
CoreConfig {
mongo:
MongoConfig {
uri,
address,
username,
password,
app_name,
db_name,
},
..
}: &CoreConfig,
) -> anyhow::Result<DbClient> {
let mut mungos = Mungos::builder().app_name(app_name);
match (uri, address, username, password) {
(Some(uri), _, _, _) => {
mungos = mungos.uri(uri);
}
(_, Some(address), Some(username), Some(password)) => {
mungos = mungos
.address(address)
.username(username)
.password(password);
}
(_, Some(address), _, _) => {
mungos = mungos.address(address);
}
_ => {
error!("config.mongo not configured correctly. must pass either config.mongo.uri, or config.mongo.address + config.mongo.username? + config.mongo.password?");
std::process::exit(1)
}
}
let mungos = mungos.build().await?;
let client = DbClient {
users: User::collection(&mungos, &config.mongo.db_name, true).await?,
servers: Server::collection(&mungos, &config.mongo.db_name, true).await?,
deployments: Deployment::collection(&mungos, &config.mongo.db_name, true).await?,
builds: Build::collection(&mungos, &config.mongo.db_name, true).await?,
builders: Builder::collection(&mungos, &config.mongo.db_name, true).await?,
repos: Repo::collection(&mungos, &config.mongo.db_name, true).await?,
tags: CustomTag::collection(&mungos, &config.mongo.db_name, true).await?,
updates: Update::collection(&mungos, &config.mongo.db_name, true).await?,
users: User::collection(&mungos, db_name, true).await?,
servers: Server::collection(&mungos, db_name, true).await?,
deployments: Deployment::collection(&mungos, db_name, true).await?,
builds: Build::collection(&mungos, db_name, true).await?,
builders: Builder::collection(&mungos, db_name, true).await?,
repos: Repo::collection(&mungos, db_name, true).await?,
tags: CustomTag::collection(&mungos, db_name, true).await?,
updates: Update::collection(&mungos, db_name, true).await?,
};
Ok(client)
}