Skip to content

Commit b400398

Browse files
committed
return error on no release found, exit main with error if error from run
1 parent 5ee5c35 commit b400398

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

rust/stackablectl/src/cmds/release.rs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ pub enum CmdError {
140140
#[snafu(display("failed to build release list"))]
141141
BuildList { source: list::Error },
142142

143+
#[snafu(display("no release '{release}'"))]
144+
NoSuchRelease { release: String },
145+
143146
#[snafu(display("failed to install release"))]
144147
ReleaseInstall { source: release::Error },
145148

@@ -301,7 +304,9 @@ async fn describe_cmd(
301304
OutputType::Json => serde_json::to_string(&release).context(SerializeJsonOutputSnafu),
302305
OutputType::Yaml => serde_yaml::to_string(&release).context(SerializeYamlOutputSnafu),
303306
},
304-
None => Ok("No such release".into()),
307+
None => Err(CmdError::NoSuchRelease {
308+
release: args.release.clone(),
309+
}),
305310
}
306311
}
307312

@@ -352,7 +357,9 @@ async fn install_cmd(
352357

353358
Ok(output.render())
354359
}
355-
None => Ok("No such release".into()),
360+
None => Err(CmdError::NoSuchRelease {
361+
release: args.release.clone(),
362+
}),
356363
}
357364
}
358365

@@ -433,7 +440,9 @@ async fn upgrade_cmd(
433440

434441
Ok(output.render())
435442
}
436-
None => Ok("No such release".into()),
443+
None => Err(CmdError::NoSuchRelease {
444+
release: args.release.clone(),
445+
}),
437446
}
438447
}
439448

@@ -459,6 +468,8 @@ async fn uninstall_cmd(
459468

460469
Ok(result.render())
461470
}
462-
None => Ok("No such release".into()),
471+
None => Err(CmdError::NoSuchRelease {
472+
release: args.release.clone(),
473+
}),
463474
}
464475
}

rust/stackablectl/src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ async fn main() -> Result<(), Error> {
6868
let mut output = app.error();
6969
output.with_error_report(err);
7070

71-
eprint!("{}", output.render())
71+
eprint!("{}", output.render());
72+
std::process::exit(1);
7273
}
7374
}
7475

0 commit comments

Comments
 (0)