artemist/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

Merge pull request #40 from DeterminateSystems/hoverbear/ds-430-plan-ux-refinement

Browse source 
Refine plan subcommand UX
This commit is contained in:
Ana Hobden 2022-11-09 08:47:05 -08:00 committed by GitHub
parent 6678b1cdee 00ffe96aae
commit b123bbf285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cli/subcommand/plan.rs
View file

@ -9,19 +9,19 @@ use crate::cli::CommandExecute;
/// Plan an install that can be repeated on an identical host later /// Plan an install that can be repeated on an identical host later
#[derive(Debug, Parser)] #[derive(Debug, Parser)]
#[command(multicall = true)] #[command(args_conflicts_with_subcommands = true, arg_required_else_help = true)]
pub struct Plan { pub struct Plan {
#[clap(subcommand)] #[clap(subcommand)]
pub planner: Option<BuiltinPlanner>, pub planner: Option<BuiltinPlanner>,
#[clap(env = "HARMONIC_PLAN")] #[clap(env = "HARMONIC_PLAN")]
pub plan: PathBuf, pub output: PathBuf,
} }
#[async_trait::async_trait] #[async_trait::async_trait]
impl CommandExecute for Plan { impl CommandExecute for Plan {
#[tracing::instrument(skip_all, fields())] #[tracing::instrument(skip_all, fields())]
async fn execute(self) -> eyre::Result<ExitCode> { async fn execute(self) -> eyre::Result<ExitCode> {
let Self { planner, plan } = self; let Self { planner, output } = self;
let planner = match planner { let planner = match planner {
Some(planner) => planner, Some(planner) => planner,
@ -33,7 +33,7 @@ impl CommandExecute for Plan {
let install_plan = planner.plan().await.map_err(|e| eyre::eyre!(e))?; let install_plan = planner.plan().await.map_err(|e| eyre::eyre!(e))?;
let json = serde_json::to_string_pretty(&install_plan)?; let json = serde_json::to_string_pretty(&install_plan)?;
tokio::fs::write(plan, json) tokio::fs::write(output, json)
.await .await
.wrap_err("Writing plan")?; .wrap_err("Writing plan")?;