robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00
Code Issues Projects Releases Wiki Activity

add exec root option

Browse source
This commit is contained in:
Robin Appelman 2025-09-16 16:03:30 +02:00
commit 6a3058888f
2 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/args.rs
View file

@ -25,6 +25,7 @@ pub enum HazeArgs {
filter: Option<String>,
service: Option<ExecService>,
command: Vec<String>,
root: bool,
},
Occ {
filter: Option<String>,
@ -180,11 +181,20 @@ impl HazeArgs {
_ => None,
};
let root = match args.peek() {
Some(arg) if arg.as_ref() == "root" => {
args.next();
true
}
_ => false,
};
let command = args.map(S::into).collect();
Ok(HazeArgs::Exec {
filter,
service,
command,
root,
})
}
HazeCommand::Occ => Ok(HazeArgs::Occ {
@ -508,6 +518,20 @@ fn test_arg_parse() {
filter: None,
service: None,
command: vec!["foo".to_string(), "bar".to_string()],
root: false,
}
);
assert_eq!(
HazeArgs::parse(
&config,
vec!["haze", "exec", "root", "foo", "bar"].into_iter()
)
.unwrap(),
HazeArgs::Exec {
filter: None,
service: None,
command: vec!["foo".to_string(), "bar".to_string()],
root: true,
}
);
assert_eq!(
@ -520,6 +544,7 @@ fn test_arg_parse() {
filter: Some("asdasd".to_string()),
service: None,
command: vec!["foo".to_string(), "bar".to_string()],
root: false,
}
);
assert_eq!(
@ -532,6 +557,7 @@ fn test_arg_parse() {
filter: Some("asdasd".to_string()),
service: Some(ExecService::Db),
command: vec!["foo".to_string(), "bar".to_string()],
root: false,
}
);
assert_eq!(

28
src/main.rs
View file

@ -4,7 +4,7 @@ use crate::args::{ExecService, HazeArgs};
use crate::cloud::{Cloud, CloudOptions};
use crate::config::HazeConfig;
use crate::database::DatabaseFamily;
use crate::exec::container_logs;
use crate::exec::{container_logs, exec, exec_tty};
use crate::git::checkout_all;
use crate::help::help;
use crate::image::update_image;
@ -117,22 +117,24 @@ async fn main() -> Result<ExitCode> {
filter,
service,
command,
root,
} => {
let cloud = Cloud::get_by_filter(&docker, filter, &config).await?;
match service {
None => {
cloud
.exec(
&docker,
if command.is_empty() {
vec!["bash".to_string()]
} else {
command
},
atty::is(atty::Stream::Stdout),
get_forward_env(),
)
.await?;
let command = if command.is_empty() {
vec!["bash".to_string()]
} else {
command
};
let env = get_forward_env();
let tty = atty::is(atty::Stream::Stdout);
let user = if root { "root" } else { "haze" };
if tty {
exec_tty(&docker, &cloud.id, user, command, env).await?;
} else {
exec(&docker, &cloud.id, user, command, env, Some(stdout())).await?;
}
}
Some(ExecService::Db) => {
cloud