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

fix: removed unwrap from template to handle with proper error message

Browse source
This commit is contained in:
Gerald Pinder 2024-01-04 00:07:55 -05:00
parent 7ae8dcd273
commit ebd399e960
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/template.rs
View file

@ -252,10 +252,10 @@ fn print_containerfile(containerfile: &str) -> String {
file
}
fn get_module_from_file(file: &str) -> ModuleExt {
fn get_module_from_file(file: &str) -> String {
trace!("get_module_from_file({file})");
serde_yaml::from_str(
serde_yaml::from_str::<ModuleExt>(
fs::read_to_string(format!("config/{file}").as_str())
.unwrap_or_else(|e| {
error!("Failed to read module {file}: {e}");
@ -264,7 +264,12 @@ fn get_module_from_file(file: &str) -> ModuleExt {
.as_str(),
)
.unwrap_or_else(|e| {
error!("Failed to parse {file}: {e}");
error!("Failed to parse module {file}: {e}");
process::exit(1);
})
.render()
.unwrap_or_else(|e| {
error!("Failed to render module {file}: {e}");
process::exit(1);
})
}

2
templates/Containerfile.module
View file

@ -10,7 +10,7 @@
RUN chmod +x /tmp/modules/{{ type }}/{{ type }}.sh && source /tmp/exports.sh && /tmp/modules/{{ type }}/{{ type }}.sh '{{ self::print_module_context(module) }}'
{%- endif %}
{%- else if let Some(from_file) = module.from_file %}
{{ self::get_module_from_file(from_file).render().unwrap() }}
{{ self::get_module_from_file(from_file) }}
{%- endif %}
{%- endfor %}