forked from github-starred/komodo
* attach env_file to compose build and compose pull stages * fmt and bump rust version * bump dependencies * ignored for Sqlite message * fix Build secret args info * improve secret arguments info * improve environment, ports, volumes deserializers * rename `mongo` to `database` in config * support _FILE in secret env vars * improve setup - simpler compose * remove aws ecr container registry support, alpine dockerfiles * log periphery config * ssl_enabled mode * log http vs https * periphery client accept untrust ssl certs * fix nav issue from links * configurable ssl * KOMODO_ENSURE_SERVER -> KOMODO_FIRST_SERVER * mount proc and ssl volume * managed sync * validate files on host resource path * remove sync repo not configured guards * disable confirm dialog * fix sync hash / message Option * try dev dockerfile * refresh sync resources after commit * socket invalidate handling * delete dev dockerfile * Commit Changes * Add Info tab to syncs * fix new Info parsing issue with serde default * refresh stack cache on create / update * managed syncs can't sync themselves * managed syncs seems to work * bump thiserror * use alpine as main dockerfile * apt add --no-cache * disable user write perms, super admin perms to manage admins * manage admin user UI * implement disable non admin create frontend * disable create non admin * Copy button shown based on permission * warning message on managed sync * implement monaco editor * impl simple match tags config * resource sync support match tags * more match tag filtering * improve config with better saving diffs * export button use monaco * deser Conversions with wrapping strings * envs editing * don't delete variables / user groups if match tags defined * env from_str improve * improve dashboards * remove core ca stuff for now * move periphery ssl gen to dedicated file * default server address periphery:8120 * clean up ssl configs * server dashboard * nice test compose * add discord alerter * discord alerter * stack hideInfo logic * compose setup * alert table * improve config hover card style * update min editor height and stack config * Feat: Styling Updates (#94) * sidebar takes full screen height * add bg accent to navbar * add aschild prop to topbar alerts trigger * stylize resource rows * internally scrollable data tables * better hover color for outlined button * always show scrollbar to prevent layout shift * better hover color for navbar * rearrange buttons * fix table and resource row styles * cleanup scrollbar css * use page for dashboard instead of section * fix padding * resource sync refactor and env keep comments * frontend build * improve configs * config nice * Feat/UI (#95) * stylize resource rows * internally scrollable data tables * fix table and resource row styles * use page for dashboard instead of section * fix padding * add `ResourcePageHeader` to required components * add generic resource page header component * add resource page headers for all components * add resource notificaitons component * add `TextUpdateMenu2` for use in resource page * cleanup resource notificaitons * update resource page layout * ui edits * sync kind of work * clean up unused import * syncs seem to work * new sync pending * monaco diff hide unchanged regions * update styling all in config resource select links * confirm update default strings * move procedure Add Stage to left * update colors / styles * frontend build * backend for write file contents to host * compose reference ports comment out * server config * ensure parent directory created * fix frontend build * remove default stack run_directory * fix periphery compose deploy response set * update compose files * move server stats under tabs * fix deployment list item getting correct image when not deployed * stack updates cache after file write * edit files on host * clean up unused imports * top level config update assignment must be spread * update deps, move alert module * move stack module * move sync module * move to sync db_client usage after init * support generic OIDC provider * init builders / server templates specifying https * special cases for server / deployment state * improve alert details * add builder template `use_https` config * try downgrade aws sdk ec2 for x86 build * update debian dockerfiles to rm lists/* * optionally configure seperate KOMODO_OIDC_REDIRECT * add defaults to compose.env * keep tags / search right aligned when view only * clean up configs * remove unused migrator deps * update roadmap support generic OIDC * initialize sync use confirm button * key_value syntax highlighting * smaller debian dockerfiles * clean up deps.sh * debian dockerifle * New config layout (#96) * new config layout * fix image config layout and components config * fix dom nesting and cleanup components * fix label, make switches flex row * ensure smooth scroll on hash navigations * width 180 on config sidebar * slight edits to config * log whether https builder * DISABLED <switch> ENABLED * fix some more config * smaller checked component * server config looking good * auto initialize compose files when files on host * stack files on host good * stack config nice * remove old config * deployments looking good * build looking good * Repo good * nice config for builders * alerter good * server template config * syncs good * tweak stack config * use status badge for update tables * unified update page using router params * replace /updates with unified updates page * redirect all resource updates to unified update page * fix reset handling * unmount legacy page * try periphery rustls * rm unused import * fix broken deps * add unified alerts apge * mount new alerts, remove old alerts page * reroute resource alerts to unified alerts page * back to periphery openssl * ssl_enabled defaults to false for backward compat * reqwest need json feature * back to og yaml monaco * Uncomment config fields for clearer config * clean up compose env * implement pull or clone, avoid deleting repo directory * refactor mongo configuration params * all configs respect empty string null * add back status to header * build toml don't have version if not auto incrementing * fix comile * fix repo pull cd to correct dir * fix core pull_or_clone directory * improve statuses * remove ' ' from kv list parser * longer CSRF valid for, to give time to login / accept * don't compute diff / execute if there are any file_errors * PartialBuilderConfig enum user inner option * move errors to top * fix toml init serializer * server template and bulder manually add config.params line * better way to check builder / template params empty * improve build configs * merge links into network area deployment * default periphery config * improve SystemCommand editor * better Repo server / builder Info * improve Alerts / Updates with ResourceSelector * fix unused frontend * update ResourceSync description * toml use [resource.config] syntax * update toml syntax * update Build.image_registry schema * fix repo / stack resource link alias * reorder image registry * align toml / yaml parser style * some config updates --------- Co-authored-by: Karamvir Singh <67458484+karamvirsingh98@users.noreply.github.com> Co-authored-by: kv <karamvir.singh98@gmail.com>
222 lines
5.2 KiB
Rust
222 lines
5.2 KiB
Rust
use std::{collections::HashMap, path::Path};
|
|
|
|
use anyhow::Context;
|
|
use command::run_komodo_command;
|
|
use formatting::format_serror;
|
|
use komodo_client::entities::{
|
|
update::Log, CloneArgs, EnvironmentVar,
|
|
};
|
|
|
|
use crate::{get_commit_hash_log, GitRes};
|
|
|
|
/// This will pull in a way that handles edge cases
|
|
/// from possible state of the repo. For example, the user
|
|
/// can change branch after clone, or even the remote.
|
|
#[tracing::instrument(
|
|
level = "debug",
|
|
skip(
|
|
clone_args,
|
|
access_token,
|
|
environment,
|
|
secrets,
|
|
core_replacers
|
|
)
|
|
)]
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub async fn pull<T>(
|
|
clone_args: T,
|
|
repo_dir: &Path,
|
|
access_token: Option<String>,
|
|
environment: &[EnvironmentVar],
|
|
env_file_path: &str,
|
|
// if skip_secret_interp is none, make sure to pass None here
|
|
secrets: Option<&HashMap<String, String>>,
|
|
core_replacers: &[(String, String)],
|
|
) -> anyhow::Result<GitRes>
|
|
where
|
|
T: Into<CloneArgs> + std::fmt::Debug,
|
|
{
|
|
let args: CloneArgs = clone_args.into();
|
|
let path = args.path(repo_dir);
|
|
let path_display = path.display();
|
|
let repo_url =
|
|
args.remote_url(access_token.as_ref().map(String::as_str))?;
|
|
|
|
// Set remote url
|
|
let mut set_remote = run_komodo_command(
|
|
"set git remote",
|
|
format!(
|
|
"cd {path_display} && git remote set-url origin {repo_url}"
|
|
),
|
|
)
|
|
.await;
|
|
|
|
if !set_remote.success {
|
|
if let Some(token) = access_token {
|
|
set_remote.command =
|
|
set_remote.command.replace(&token, "<TOKEN>");
|
|
set_remote.stdout =
|
|
set_remote.stdout.replace(&token, "<TOKEN>");
|
|
set_remote.stderr =
|
|
set_remote.stderr.replace(&token, "<TOKEN>");
|
|
}
|
|
return Ok(GitRes {
|
|
logs: vec![set_remote],
|
|
hash: None,
|
|
message: None,
|
|
env_file_path: None,
|
|
});
|
|
}
|
|
|
|
let checkout = run_komodo_command(
|
|
"checkout branch",
|
|
format!("cd {path_display} && git checkout -f {}", args.branch),
|
|
)
|
|
.await;
|
|
|
|
if !checkout.success {
|
|
return Ok(GitRes {
|
|
logs: vec![checkout],
|
|
hash: None,
|
|
message: None,
|
|
env_file_path: None,
|
|
});
|
|
}
|
|
|
|
let command = format!(
|
|
"cd {path_display} && git pull --rebase --force origin {}",
|
|
args.branch
|
|
);
|
|
|
|
let pull_log = run_komodo_command("git pull", command).await;
|
|
|
|
let mut logs = vec![pull_log];
|
|
|
|
if !logs[0].success {
|
|
return Ok(GitRes {
|
|
logs,
|
|
hash: None,
|
|
message: None,
|
|
env_file_path: None,
|
|
});
|
|
}
|
|
|
|
if let Some(commit) = args.commit {
|
|
let reset_log = run_komodo_command(
|
|
"set commit",
|
|
format!("cd {path_display} && git reset --hard {commit}"),
|
|
)
|
|
.await;
|
|
logs.push(reset_log);
|
|
}
|
|
|
|
let (hash, message) = match get_commit_hash_log(&path).await {
|
|
Ok((log, hash, message)) => {
|
|
logs.push(log);
|
|
(Some(hash), Some(message))
|
|
}
|
|
Err(e) => {
|
|
logs.push(Log::simple(
|
|
"latest commit",
|
|
format_serror(
|
|
&e.context("failed to get latest commit").into(),
|
|
),
|
|
));
|
|
(None, None)
|
|
}
|
|
};
|
|
|
|
let Ok(env_file_path) = crate::environment::write_file(
|
|
environment,
|
|
env_file_path,
|
|
secrets,
|
|
&path,
|
|
&mut logs,
|
|
)
|
|
.await
|
|
else {
|
|
return Ok(GitRes {
|
|
logs,
|
|
hash,
|
|
message,
|
|
env_file_path: None,
|
|
});
|
|
};
|
|
|
|
if let Some(command) = args.on_pull {
|
|
if !command.path.is_empty() && !command.command.is_empty() {
|
|
let on_pull_path = path.join(&command.path);
|
|
if let Some(secrets) = secrets {
|
|
let (full_command, mut replacers) =
|
|
match svi::interpolate_variables(
|
|
&command.command,
|
|
secrets,
|
|
svi::Interpolator::DoubleBrackets,
|
|
true,
|
|
)
|
|
.context(
|
|
"failed to interpolate secrets into on_pull command",
|
|
) {
|
|
Ok(res) => res,
|
|
Err(e) => {
|
|
logs.push(Log::error(
|
|
"interpolate secrets - on_pull",
|
|
format_serror(&e.into()),
|
|
));
|
|
return Ok(GitRes {
|
|
logs,
|
|
hash,
|
|
message,
|
|
env_file_path: None,
|
|
});
|
|
}
|
|
};
|
|
replacers.extend(core_replacers.to_owned());
|
|
let mut on_pull_log = run_komodo_command(
|
|
"on pull",
|
|
format!("cd {} && {full_command}", on_pull_path.display()),
|
|
)
|
|
.await;
|
|
|
|
on_pull_log.command =
|
|
svi::replace_in_string(&on_pull_log.command, &replacers);
|
|
on_pull_log.stdout =
|
|
svi::replace_in_string(&on_pull_log.stdout, &replacers);
|
|
on_pull_log.stderr =
|
|
svi::replace_in_string(&on_pull_log.stderr, &replacers);
|
|
|
|
tracing::debug!(
|
|
"run repo on_pull command | command: {} | cwd: {:?}",
|
|
on_pull_log.command,
|
|
on_pull_path
|
|
);
|
|
|
|
logs.push(on_pull_log);
|
|
} else {
|
|
let on_pull_log = run_komodo_command(
|
|
"on pull",
|
|
format!(
|
|
"cd {} && {}",
|
|
on_pull_path.display(),
|
|
command.command
|
|
),
|
|
)
|
|
.await;
|
|
tracing::debug!(
|
|
"run repo on_pull command | command: {} | cwd: {:?}",
|
|
command.command,
|
|
on_pull_path
|
|
);
|
|
logs.push(on_pull_log);
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(GitRes {
|
|
logs,
|
|
hash,
|
|
message,
|
|
env_file_path,
|
|
})
|
|
}
|