Mirrors/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft synced 2024-11-10 22:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: inconsistent removal of binaries by overlap (#2036)

Browse source 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
This commit is contained in:
Keith Zantow 2023-08-17 11:27:31 -04:00 committed by GitHub
parent 9467bd66c2
commit d1635971a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
syft/lib.go
View file

@ -92,8 +92,7 @@ func CatalogPackages(src source.Source, cfg cataloger.Config) (*pkg.Collection,
}
func removeRelationshipsByID(relationships []artifact.Relationship, id artifact.ID) []artifact.Relationship {
// https://github.com/golang/go/wiki/SliceTricks#filtering-without-allocating
filtered := relationships[:0]
var filtered []artifact.Relationship
for _, r := range relationships {
if r.To.ID() != id && r.From.ID() != id {
filtered = append(filtered, r)

42
syft/lib_test.go Normal file
View file

@ -0,0 +1,42 @@
package syft
import (
"testing"
"github.com/stretchr/testify/require"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/pkg"
)
func Test_removeRelationshipsByID(t *testing.T) {
p1 := pkg.Package{}
p1.OverrideID("1")
p2 := pkg.Package{}
p2.OverrideID("2")
p3 := pkg.Package{}
p3.OverrideID("3")
rel := func(pkgs ...pkg.Package) (out []artifact.Relationship) {
for _, p := range pkgs {
out = append(out, artifact.Relationship{
From: p,
To: p,
Type: artifact.OwnershipByFileOverlapRelationship,
})
}
return
}
relationships := rel(p1, p2, p3)
for _, r := range relationships {
if r.From.ID() == "1" || r.From.ID() == "2" {
relationships = removeRelationshipsByID(relationships, r.From.ID())
}
}
require.Equal(t, rel(p3), relationships)
}