* add periphery.skip label, skip in StopAllContainers

* add core config sync directory

* deploy stack if changed

* fix stack env_file_path when git repo and using run_directory

* deploy stack if changed

* write sync contents

* commit to git based sync, managed git based sync

* can sync non UI defined resource syncs

* sync UI control

* clippy

* init new stack compose file in repo

* better error message when attached Server / Builder invalid

* specify multiple resource file paths (mixed files + folders)

* use react charts

* tweak stats charts

* add Containers page

* 1.15.6

* stack deploy check if deployes vs remote has changed

* improve ux with loading indicators

* sync diff accounts for deploy / after

* fix new chart time axes
This commit is contained in:
Maxwell Becker
2024-10-13 07:42:46 +03:00
committed by GitHub
parent e3d8e603ec
commit 44ab5eb804
109 changed files with 3641 additions and 1414 deletions

149
lib/git/src/commit.rs Normal file
View File

@@ -0,0 +1,149 @@
use std::path::Path;
use anyhow::Context;
use command::run_komodo_command;
use formatting::format_serror;
use komodo_client::entities::{all_logs_success, update::Log};
use tokio::fs;
use crate::{get_commit_hash_log, GitRes};
/// Write file, add, commit, force push.
/// Repo must be cloned.
pub async fn write_commit_file(
commit_msg: &str,
repo_dir: &Path,
// relative to repo root
file: &Path,
contents: &str,
) -> anyhow::Result<GitRes> {
let path = repo_dir.join(file);
if let Some(parent) = path.parent() {
let _ = fs::create_dir_all(&parent).await;
}
fs::write(&path, contents).await.with_context(|| {
format!("Failed to write contents to {path:?}")
})?;
let mut res = GitRes::default();
res.logs.push(Log::simple(
"Write file",
format!("File contents written to {path:?}"),
));
commit_file_inner(commit_msg, &mut res, repo_dir, file).await;
Ok(res)
}
/// Add file, commit, force push.
/// Repo must be cloned.
pub async fn commit_file(
commit_msg: &str,
repo_dir: &Path,
// relative to repo root
file: &Path,
) -> GitRes {
let mut res = GitRes::default();
commit_file_inner(commit_msg, &mut res, repo_dir, file).await;
res
}
pub async fn commit_file_inner(
commit_msg: &str,
res: &mut GitRes,
repo_dir: &Path,
// relative to repo root
file: &Path,
) {
let add_log = run_komodo_command(
"add files",
repo_dir,
format!("git add {}", file.display()),
)
.await;
res.logs.push(add_log);
if !all_logs_success(&res.logs) {
return;
}
let commit_log = run_komodo_command(
"commit",
repo_dir,
format!(
"git commit -m \"[Komodo] {commit_msg}: update {file:?}\""
),
)
.await;
res.logs.push(commit_log);
if !all_logs_success(&res.logs) {
return;
}
match get_commit_hash_log(repo_dir).await {
Ok((log, hash, message)) => {
res.logs.push(log);
res.hash = Some(hash);
res.message = Some(message);
}
Err(e) => {
res.logs.push(Log::error(
"get commit hash",
format_serror(&e.into()),
));
return;
}
};
let push_log =
run_komodo_command("push", repo_dir, "git push -f").await;
res.logs.push(push_log);
}
/// Add, commit, and force push.
/// Repo must be cloned.
pub async fn commit_all(repo_dir: &Path, message: &str) -> GitRes {
let mut res = GitRes::default();
let add_log =
run_komodo_command("add files", repo_dir, "git add -A").await;
res.logs.push(add_log);
if !all_logs_success(&res.logs) {
return res;
}
let commit_log = run_komodo_command(
"commit",
repo_dir,
format!("git commit -m \"[Komodo] {message}\""),
)
.await;
res.logs.push(commit_log);
if !all_logs_success(&res.logs) {
return res;
}
match get_commit_hash_log(repo_dir).await {
Ok((log, hash, message)) => {
res.logs.push(log);
res.hash = Some(hash);
res.message = Some(message);
}
Err(e) => {
res.logs.push(Log::error(
"get commit hash",
format_serror(&e.into()),
));
return res;
}
};
let push_log =
run_komodo_command("push", repo_dir, format!("git push -f"))
.await;
res.logs.push(push_log);
res
}