Skip to content

Commit

Permalink
Merge pull request #837 from jvanz/better-error-message
Browse files Browse the repository at this point in the history
fix: improve error handling in settings validation.
  • Loading branch information
jvanz authored Jun 20, 2024
2 parents 57d6217 + 4fbbf34 commit 09803a4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
10 changes: 9 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,15 @@ async fn main() -> Result<()> {
Some("run") => {
if let Some(matches) = matches.subcommand_matches("run") {
let pull_and_run_settings = parse_pull_and_run_settings(matches).await?;
run::pull_and_run(&pull_and_run_settings).await?;
run::pull_and_run(&pull_and_run_settings)
.await
.map_err(|e| {
anyhow!(
"Error running policy {}: {}",
pull_and_run_settings.uri,
e.to_string()
)
})?;
}
Ok(())
}
Expand Down
3 changes: 1 addition & 2 deletions src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,9 @@ pub(crate) async fn pull_and_run(cfg: &PullAndRunSettings) -> Result<()> {
// validate the settings given by the user
let settings_validation_response = policy_evaluator.validate_settings(&run_env.policy_settings);
if !settings_validation_response.valid {
println!("{}", serde_json::to_string(&settings_validation_response)?);
return Err(anyhow!(
"Provided settings are not valid: {:?}",
settings_validation_response.message
settings_validation_response.message.unwrap_or_default()
));
}

Expand Down

0 comments on commit 09803a4

Please sign in to comment.