refactor: remove mod.rs files

Signed-off-by: Flavio Castelli <[email protected]>
kubewarden · Nov 21, 2024 · 0f22089 · 0f22089
1 parent 3031d3b
commit 0f22089
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/src/errors.rs b/src/errors.rs
@@ -87,5 +87,5 @@ pub enum ImageValidationError {
     MalformedImageName(String),
 
     #[error("Failed to parse the SARIF report: {0}")]
-    SarifParseError(String),
+    SarifParse(String),
 }
diff --git a/src/sarif.rs b/src/sarif.rs
@@ -52,7 +52,7 @@ impl Report {
         always_allowed: &HashSet<String>,
     ) -> Result<Self, ImageValidationError> {
         if trivy_report.runs.len() != 1 {
-            return Err(ImageValidationError::SarifParseError(format!(
+            return Err(ImageValidationError::SarifParse(format!(
                 "wrong number of 'run' items inside of trivy report, expected 1 got {}",
                 trivy_report.runs.len()
             )));

diff --git a/src/sarif/trivy.rs b/src/sarif/trivy.rs
@@ -5,25 +5,24 @@ impl TryFrom<VulnerabilityReport> for Report {
     type Error = ImageValidationError;
 
     fn try_from(sbombastic_vulnerability_report: VulnerabilityReport) -> Result<Self, Self::Error> {
-        let spec =
-            sbombastic_vulnerability_report
-                .spec
-                .ok_or(ImageValidationError::SarifParseError(
-                    "missing VulnerabilityReportSpec".to_string(),
-                ))?;
+        let spec = sbombastic_vulnerability_report
+            .spec
+            .ok_or(ImageValidationError::SarifParse(
+                "missing VulnerabilityReportSpec".to_string(),
+            ))?;
 
         let report = serde_json::from_value::<Self>(spec.sarif)
-            .map_err(|e| ImageValidationError::SarifParseError(e.to_string()))?;
+            .map_err(|e| ImageValidationError::SarifParse(e.to_string()))?;
 
         if report.runs.len() != 1 {
-            return Err(ImageValidationError::SarifParseError(format!(
+            return Err(ImageValidationError::SarifParse(format!(
                 "wrong number of 'run' items inside of trivy report, expected 1 got {}",
                 report.runs.len()
             )));
         }
 
         if report.runs[0].tool.driver.name != "Trivy" {
-            return Err(ImageValidationError::SarifParseError(format!(
+            return Err(ImageValidationError::SarifParse(format!(
                 "wrong tool driver name inside of trivy report, expected 'Trivy' got '{}'",
                 report.runs[0].tool.driver.name
             )));

diff --git a/src/sbombastic/mod.rs → src/sbombastic.rs b/src/sbombastic/mod.rs → src/sbombastic.rs
diff --git a/src/sbombastic/storage/mod.rs → src/sbombastic/storage.rs b/src/sbombastic/storage/mod.rs → src/sbombastic/storage.rs
diff --git a/src/sbombastic/storage/v1alpha1/mod.rs → src/sbombastic/storage/v1alpha1.rs b/src/sbombastic/storage/v1alpha1/mod.rs → src/sbombastic/storage/v1alpha1.rs