Remove NewBom and GenerateBomV2, GenerateBom does not return err anym…

…ore. Signed-off-by: Preslav <preslav@mondoo.com>
mondoohq · Feb 10, 2025 · bc0dd27 · bc0dd27
1 parent 6d1c54d
commit bc0dd27
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 28 deletions.
diff --git a/apps/cnquery/cmd/sbom.go b/apps/cnquery/cmd/sbom.go
@@ -95,10 +95,7 @@ var sbomCmdRun = func(cmd *cobra.Command, runtime *providers.Runtime, cliRes *pl
 		logger.DebugDumpJSON("mondoo-sbom-report", data)
 	}
 
-	boms, err := generator.NewBom(cnspecReport)
-	if err != nil {
-		log.Fatal().Err(err).Msg("failed to parse bom")
-	}
+	boms := generator.GenerateBom(cnspecReport)
 
 	var exporter sbom.FormatSpecificationHandler
 	output := viper.GetString("output")

diff --git a/sbom/cnquery_bom_test.go b/sbom/cnquery_bom_test.go
@@ -17,8 +17,7 @@ func TestSimpleBomOutput(t *testing.T) {
 	report, err := generator.LoadReport("./testdata/alpine.json")
 	require.NoError(t, err)
 
-	sboms, err := generator.GenerateBom(report)
-	require.NoError(t, err)
+	sboms := generator.GenerateBom(report)
 
 	// store bom in different formats
 	selectedBom := sboms[0]

diff --git a/sbom/cyclonedx_test.go b/sbom/cyclonedx_test.go
@@ -19,8 +19,7 @@ func TestCycloneDxOutput(t *testing.T) {
 	report, err := generator.LoadReport("./testdata/alpine.json")
 	require.NoError(t, err)
 
-	sboms, err := generator.GenerateBom(report)
-	require.NoError(t, err)
+	sboms := generator.GenerateBom(report)
 
 	// store bom in different formats
 	selectedBom := sboms[0]

diff --git a/sbom/generator/generator.go b/sbom/generator/generator.go
@@ -18,21 +18,10 @@ import (
 
 var LABEL_KERNEL_RUNNING = "mondoo.com/os/kernel-running"
 
-// NewBom creates a BOM from a cnquery report
-func NewBom(report *reporter.Report) ([]*sbom.Sbom, error) {
-	return GenerateBom(report)
-}
-
-func GenerateBomV2(r *reporter.Report) []*sbom.Sbom {
-	sboms, _ := GenerateBom(r)
-	return sboms
-}
-
 // GenerateBom generates a BOM from a cnquery json report collection
-// depercated: Use GenerateBomV2 instead
-func GenerateBom(r *reporter.Report) ([]*sbom.Sbom, error) {
+func GenerateBom(r *reporter.Report) []*sbom.Sbom {
 	if r == nil {
-		return nil, nil
+		return nil
 	}
 
 	generator := &sbom.Generator{
@@ -182,7 +171,7 @@ func GenerateBom(r *reporter.Report) ([]*sbom.Sbom, error) {
 		}
 		boms = append(boms, bom)
 	}
-	return boms, nil
+	return boms
 }
 
 // enrichPlatformIds adds the platform id based on cnquery ids

diff --git a/sbom/generator/sbom_test.go b/sbom/generator/sbom_test.go
@@ -17,8 +17,7 @@ func TestSbomGeneration(t *testing.T) {
 		report, err := LoadReport("../testdata/alpine.json")
 		require.NoError(t, err)
 
-		sboms, err := GenerateBom(report)
-		require.NoError(t, err)
+		sboms := GenerateBom(report)
 
 		// store bom in different formats
 		selectedBom := sboms[0]
@@ -58,8 +57,7 @@ func TestSbomGeneration(t *testing.T) {
 		report, err := LoadReport("testdata/alpine-failed-package.json")
 		require.NoError(t, err)
 
-		sboms, err := GenerateBom(report)
-		require.NoError(t, err)
+		sboms := GenerateBom(report)
 
 		// store bom in different formats
 		selectedBom := sboms[0]

diff --git a/sbom/spdx_test.go b/sbom/spdx_test.go
@@ -18,8 +18,7 @@ func TestSpdxOutput(t *testing.T) {
 	report, err := generator.LoadReport("./testdata/alpine.json")
 	require.NoError(t, err)
 
-	sboms, err := generator.GenerateBom(report)
-	require.NoError(t, err)
+	sboms := generator.GenerateBom(report)
 
 	// store bom in different formats
 	selectedBom := sboms[0]