Skip to content

Commit

Permalink
fix: inconsistent removal of binaries by overlap (#2036)
Browse files Browse the repository at this point in the history
Signed-off-by: Keith Zantow <[email protected]>
  • Loading branch information
kzantow authored Aug 17, 2023
1 parent 9467bd6 commit d163597
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
3 changes: 1 addition & 2 deletions syft/lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
42 changes: 42 additions & 0 deletions syft/lib_test.go
Original file line number Diff line number Diff line change
@@ -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)
}

0 comments on commit d163597

Please sign in to comment.