Merge pull request #209 from tenstorrent/manifest_checks

Manifest checks

Author: micprog

CHANGELOG.md

@@ -26,6 +26,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - `packages`: Add `--targets` flag to print targets used in the corresponding manifest.
 - Add `clean` command to clean all bender related dependencies.
 - `script`: Allow flist formats to use `only-sources`/`only-includes`/`only-defines` flags.
+- Add check to ensure files referenced in all manifests exist.
+- Add warnings for unknown fields in manifest.
 
 ### Changed
 - `update`: Clean up alignment of manual resolution output.

src/cli.rs

@@ -366,10 +366,11 @@ pub fn read_manifest(path: &Path) -> Result<Manifest> {
         .map_err(|cause| Error::chain(format!("Cannot open manifest {:?}.", path), cause))?;
     let partial: PartialManifest = serde_yaml::from_reader(file)
         .map_err(|cause| Error::chain(format!("Syntax error in manifest {:?}.", path), cause))?;
-    let manifest = partial
-        .validate()
-        .map_err(|cause| Error::chain(format!("Error in manifest {:?}.", path), cause))?;
-    manifest.prefix_paths(path.parent().unwrap())
+    partial
+        .prefix_paths(path.parent().unwrap())
+        .map_err(|cause| Error::chain(format!("Error in manifest prefixing {:?}.", path), cause))?
+        .validate("", false)
+        .map_err(|cause| Error::chain(format!("Error in manifest {:?}.", path), cause))
 }
 
 /// Load a configuration by traversing a directory hierarchy upwards.
@@ -446,7 +447,7 @@ fn load_config(from: &Path, warn_config_loaded: bool) -> Result<Config> {
 
     // Validate the configuration.
     let mut out = out
-        .validate()
+        .validate("", false)
         .map_err(|cause| Error::chain("Invalid configuration:", cause))?;
 
     out.overrides = out

src/cmd/clone.rs

@@ -94,6 +94,9 @@ pub fn run(sess: &Session, path: &Path, matches: &ArgMatches) -> Result<()> {
         debugln!("main: checkouts {:#?}", checkouts);
         for c in checkouts {
             if let Some(s) = c.to_str() {
+                if !Path::new(s).exists() {
+                    Err(Error::new(format!("`{dep}` path `{s}` does not exist")))?;
+                }
                 let command = SysCommand::new("cp")
                     .arg("-rf")
                     .arg(s)

src/cmd/script.rs

@@ -13,6 +13,7 @@ use indexmap::{IndexMap, IndexSet};
 use tera::{Context, Tera};
 use tokio::runtime::Runtime;
 
+use crate::config::Validate;
 use crate::error::*;
 use crate::sess::{Session, SessionIo};
 use crate::src::{SourceFile, SourceGroup};
@@ -292,8 +293,12 @@ pub fn run(sess: &Session, matches: &ArgMatches) -> Result<()> {
             });
     }
 
-    // Flatten the sources.
-    let srcs = srcs.flatten();
+    // Flatten and validate the sources.
+    let srcs = srcs
+        .flatten()
+        .into_iter()
+        .map(|f| f.validate("", false))
+        .collect::<Result<Vec<_>>>()?;
 
     // Validate format-specific options.
     if (matches.contains_id("vcom-arg") || matches.contains_id("vlog-arg"))