Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: inconsistent removal of binaries by file overlap #2036

Merged
merged 1 commit into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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)
}
Loading