particle-os/particle-os-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Give better errors for read_to_string

Browse source
This commit is contained in:
Gerald Pinder 2024-04-16 17:34:04 -04:00
parent 7c4c6759ca
commit 4ef0bf9169
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
recipe/src/module_ext.rs
View file

@ -1,6 +1,6 @@
use std::{borrow::Cow, collections::HashSet, fs, path::Path};
use anyhow::Result;
use anyhow::{Context, Result};
use blue_build_utils::constants::{CONFIG_PATH, RECIPE_PATH};
use log::{trace, warn};
use serde::{Deserialize, Serialize};
@ -31,7 +31,8 @@ impl ModuleExt<'_> {
legacy_path.join(file_name)
};
let file = fs::read_to_string(file_path)?;
let file = fs::read_to_string(&file_path)
.context(format!("Failed to open {}", file_path.display()))?;
serde_yaml::from_str::<Self>(&file).map_or_else(
|_| -> Result<Self> {

11
recipe/src/recipe.rs
View file

@ -1,6 +1,6 @@
use std::{borrow::Cow, env, fs, path::Path};
use anyhow::Result;
use anyhow::{Context, Result};
use blue_build_utils::constants::{
CI_COMMIT_REF_NAME, CI_COMMIT_SHORT_SHA, CI_DEFAULT_BRANCH, CI_MERGE_REQUEST_IID,
CI_PIPELINE_SOURCE, GITHUB_EVENT_NAME, GITHUB_REF_NAME, GITHUB_SHA, PR_EVENT_NUMBER,
@ -123,17 +123,16 @@ impl<'a> Recipe<'a> {
/// #
/// # Errors
pub fn parse<P: AsRef<Path>>(path: &P) -> Result<Self> {
trace!("Recipe::parse({})", path.as_ref().display());
let file_path = if Path::new(path.as_ref()).is_absolute() {
path.as_ref().to_path_buf()
} else {
std::env::current_dir()?.join(path.as_ref())
};
let recipe_path = fs::canonicalize(file_path)?;
let recipe_path_string = recipe_path.display().to_string();
debug!("Recipe::parse_recipe({recipe_path_string})");
let file = fs::read_to_string(recipe_path)?;
let file = fs::read_to_string(&file_path)
.context(format!("Failed to read {}", file_path.display()))?;
debug!("Recipe contents: {file}");