Merge branch 'master' into expirement/page_count

vinted · Sep 11, 2024 · 6bcf95f · 6bcf95f
2 parents 87496ec + a628313
commit 6bcf95f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/bomtools/merge.go b/pkg/bomtools/merge.go
@@ -248,7 +248,10 @@ func MergeSBOMs(mergedSbomParam MergeSBOMParam) (*cdx.BOM, error) {
 		if b.Components != nil {
 			components := *b.Components
 			for i := range components {
-				allComponents = append(allComponents, &components[i])
+				// Seems that sometimes the name can return empty
+				if components[i].Name != "" {
+					allComponents = append(allComponents, &components[i])
+				}
 			}
 		}
 	}

diff --git a/pkg/collectors/jvm_test.go b/pkg/collectors/jvm_test.go
@@ -59,11 +59,11 @@ func TestJVMCollector(t *testing.T) {
 		const bomRoot = "/tmp/some-random-dir"
 		executor := new(mockShellExecutor)
 
-		firstBOMComponents := []cdx.Component{{PackageURL: "pkg:gem/[email protected]"}}
+		firstBOMComponents := []cdx.Component{{PackageURL: "pkg:gem/[email protected]", Name: "addressable"}}
 		firstBOM := new(cdx.BOM)
 		firstBOM.Components = &firstBOMComponents
 
-		secondBOMComponents := []cdx.Component{{PackageURL: "pkg:gem/[email protected]"}}
+		secondBOMComponents := []cdx.Component{{PackageURL: "pkg:gem/[email protected]", Name: "addressable"}}
 		secondBOM := new(cdx.BOM)
 		secondBOM.Components = &secondBOMComponents