fix: actually evaluate the fix flag

trustification · Sep 29, 2023 · e266541 · e266541
1 parent f3e60b2
commit e266541
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 24 deletions.
diff --git a/bombastic/walker/src/lib.rs b/bombastic/walker/src/lib.rs
@@ -125,6 +125,7 @@ impl Run {
                         keys,
                         provider,
                         validation_date,
+                        fix_licenses: self.fix_licenses,
                     });
 
                     if let Some(interval) = self.scan_interval {

diff --git a/bombastic/walker/src/processing.rs b/bombastic/walker/src/processing.rs
@@ -8,7 +8,12 @@ use serde_json::Value;
 use std::io::Write;
 use walker_common::compression::decompress_opt;
 
-pub struct ProcessVisitor<V>(pub V);
+pub struct ProcessVisitor<V> {
+    /// if processing is enabled
+    pub enabled: bool,
+    /// then next visitor to call
+    pub next: V,
+}
 
 #[async_trait(?Send)]
 impl<V> ValidatedVisitor for ProcessVisitor<V>
@@ -20,41 +25,48 @@ where
     type Context = V::Context;
 
     async fn visit_context(&self, context: &ValidationContext) -> Result<Self::Context, Self::Error> {
-        Ok(self.0.visit_context(context).await?)
+        Ok(self.next.visit_context(context).await?)
     }
 
     async fn visit_sbom(
         &self,
         context: &Self::Context,
         result: Result<ValidatedSbom, ValidationError>,
     ) -> Result<(), Self::Error> {
-        let sbom = match result {
-            Ok(doc) => {
-                log::info!("Processing: {}", doc.url.path());
-                doc
-            }
-            Err(err) => {
-                log::info!("Failed ({}): {}", err.url().path(), err);
-                return Ok(());
-            }
-        };
+        match self.enabled {
+            true => {
+                let sbom = match result {
+                    Ok(doc) => {
+                        log::info!("Processing: {}", doc.url.path());
+                        doc
+                    }
+                    Err(err) => {
+                        log::info!("Failed ({}): {}", err.url().path(), err);
+                        return Ok(());
+                    }
+                };
 
-        let (outcome, mut sbom) =
-            tokio::task::spawn_blocking(move || (process(sbom.data.clone(), sbom.url.path()), sbom)).await?;
+                let (outcome, mut sbom) =
+                    tokio::task::spawn_blocking(move || (process(sbom.data.clone(), sbom.url.path()), sbom)).await?;
 
-        match outcome {
-            Err(err) => log::warn!("Failed to processing, moving on: {err}"),
-            Ok(Some(data)) => {
-                log::info!("Got replacement, apply and store");
-                sbom.data = data;
+                match outcome {
+                    Err(err) => log::warn!("Failed to processing, moving on: {err}"),
+                    Ok(Some(data)) => {
+                        log::info!("Got replacement, apply and store");
+                        sbom.data = data;
+                    }
+                    Ok(None) => {
+                        // keep current
+                    }
+                }
+
+                self.next.visit_sbom(context, Ok(sbom)).await?;
             }
-            Ok(None) => {
-                // keep current
+            false => {
+                self.next.visit_sbom(context, result).await?;
             }
         }
 
-        self.0.visit_sbom(context, Ok(sbom)).await?;
-
         Ok(())
     }
 }

diff --git a/bombastic/walker/src/scanner.rs b/bombastic/walker/src/scanner.rs
@@ -22,6 +22,7 @@ pub struct Options {
     pub keys: Vec<Key>,
     pub provider: Arc<dyn TokenProvider>,
     pub validation_date: Option<SystemTime>,
+    pub fix_licenses: bool,
 }
 
 pub struct Scanner {
@@ -67,7 +68,10 @@ impl Scanner {
             sender,
         };
 
-        let process = ProcessVisitor(storage);
+        let process = ProcessVisitor {
+            enabled: self.options.fix_licenses,
+            next: storage,
+        };
 
         let validation = ValidationVisitor::new(process).with_options(ValidationOptions {
             validation_date: self.options.validation_date,