de-dupe

Signed-off-by: Austin Abro <[email protected]>
zarf-dev · Sep 23, 2024 · 3d3930e · 3d3930e
1 parent add9085
commit 3d3930e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/internal/packager/sbom/catalog.go b/src/internal/packager/sbom/catalog.go
@@ -168,9 +168,7 @@ func (b *Builder) createImageSBOM(ctx context.Context, img v1.Image, src string)
 		Reference: refInfo.Reference,
 	})
 
-	cfg := syft.DefaultCreateSBOMConfig()
-	cfg.ToolName = "zarf"
-	cfg.ToolVersion = config.CLIVersion
+	cfg := getDefaultSyftConfig()
 	sbom, err := syft.CreateSBOM(ctx, syftSrc, cfg)
 	if err != nil {
 		return nil, err
@@ -213,10 +211,7 @@ func (b *Builder) createFileSBOM(ctx context.Context, componentSBOM layout.Compo
 			return nil, err
 		}
 
-		cfg := syft.DefaultCreateSBOMConfig()
-		cfg.ToolName = "zarf"
-		cfg.ToolVersion = config.CLIVersion
-
+		cfg := getDefaultSyftConfig()
 		sbom, err := syft.CreateSBOM(ctx, fileSrc, cfg)
 		if err != nil {
 			return nil, err
@@ -253,7 +248,8 @@ func (b *Builder) createFileSBOM(ctx context.Context, componentSBOM layout.Compo
 
 	artifact := sbom.SBOM{
 		Descriptor: sbom.Descriptor{
-			Name: "zarf",
+			Name:    "zarf",
+			Version: config.CLIVersion,
 		},
 		Source: parentSource.Describe(),
 		Artifacts: sbom.Artifacts{
@@ -292,3 +288,10 @@ func (b *Builder) createSBOMFile(filename string) (*os.File, error) {
 	path := filepath.Join(b.outputDir, b.getNormalizedFileName(filename))
 	return os.Create(path)
 }
+
+func getDefaultSyftConfig() *syft.CreateSBOMConfig {
+	cfg := syft.DefaultCreateSBOMConfig()
+	cfg.ToolName = "zarf"
+	cfg.ToolVersion = config.CLIVersion
+	return cfg
+}