oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-05 00:46:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

plumb context through catalogers (#2528)

Browse Source 
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman
2024-01-22 15:54:51 -05:00
committed by GitHub
parent c5d15d1d6c
commit cdad5e767a
78 changed files with 226 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syft/pkg/cataloger/binary/cataloger.go
+2 -1
View File
@@ -4,6 +4,7 @@ Package binary provides a concrete Cataloger implementations for surfacing possi
package binary
import (
"context"
"encoding/json"
"github.com/anchore/syft/internal/log"
@@ -55,7 +56,7 @@ func (c Cataloger) Name() string {
// Catalog is given an object to resolve file references and content, this function returns any discovered Packages
// after analyzing the catalog source.
func (c Cataloger) Catalog(resolver file.Resolver) ([]pkg.Package, []artifact.Relationship, error) {
func (c Cataloger) Catalog(_ context.Context, resolver file.Resolver) ([]pkg.Package, []artifact.Relationship, error) {
var packages []pkg.Package
var relationships []artifact.Relationship
syft/pkg/cataloger/binary/cataloger_test.go
+5 -5
View File
@@ -902,7 +902,7 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
resolver, err := src.FileResolver(source.SquashedScope)
require.NoError(t, err)
packages, _, err := c.Catalog(resolver)
packages, _, err := c.Catalog(context.Background(), resolver)
require.NoError(t, err)
require.Len(t, packages, 1, "mismatched package count")
@@ -942,7 +942,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases_Image(t *testing.T) {
resolver, err := src.FileResolver(source.SquashedScope)
require.NoError(t, err)
packages, _, err := c.Catalog(resolver)
packages, _, err := c.Catalog(context.Background(), resolver)
require.NoError(t, err)
for _, p := range packages {
@@ -972,7 +972,7 @@ func TestClassifierCataloger_DefaultClassifiers_NegativeCases(t *testing.T) {
resolver, err := src.FileResolver(source.SquashedScope)
assert.NoError(t, err)
actualResults, _, err := c.Catalog(resolver)
actualResults, _, err := c.Catalog(context.Background(), resolver)
assert.NoError(t, err)
assert.Equal(t, 0, len(actualResults))
}
@@ -1086,7 +1086,7 @@ func Test_Cataloger_CustomClassifiers(t *testing.T) {
resolver, err := src.FileResolver(source.SquashedScope)
require.NoError(t, err)
packages, _, err := c.Catalog(resolver)
packages, _, err := c.Catalog(context.Background(), resolver)
require.NoError(t, err)
if test.expected == nil {
@@ -1252,7 +1252,7 @@ func Test_Cataloger_ResilientToErrors(t *testing.T) {
c := NewCataloger(DefaultCatalogerConfig())
resolver := &panicyResolver{}
_, _, err := c.Catalog(resolver)
_, _, err := c.Catalog(context.Background(), resolver)
assert.NoError(t, err)
assert.True(t, resolver.searchCalled)
}