upstrema syft

scribe-security · May 1, 2023 · 548555a · 548555a
1 parent 653499f
commit 548555a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/syft/cli/packages/lib.go b/cmd/syft/cli/packages/lib.go
@@ -72,7 +72,7 @@ import (
 // }
 
 func RunLib(ctx context.Context, app *config.Application, args []string) (*sbom.SBOM, error) {
-	err := validateOutputOptions(app)
+	err := ValidateOutputOptions(app)
 	if err != nil {
 		return nil, err
 	}
@@ -90,7 +90,7 @@ func RunLib(ctx context.Context, app *config.Application, args []string) (*sbom.
 
 	// could be an image or a directory, with or without a scheme
 	userInput := args[0]
-	si, err := source.ParseInputWithName(userInput, app.Platform, true, app.Name)
+	si, err := source.ParseInputWithName(userInput, app.Platform, app.Name, app.DefaultImagePullSource)
 	if err != nil {
 		return nil, fmt.Errorf("could not generate source input for packages command: %w", err)
 	}

diff --git a/syft/pkg/cataloger/cataloger.go b/syft/pkg/cataloger/cataloger.go
@@ -65,7 +65,7 @@ type Cataloger interface {
 }
 
 // InstallationCatalogers returns a slice of locally implemented catalogers that are fit for detecting installations of packages.
-func InstallationCatalogers(cfg Config) []pkg.Cataloger {
+func ImageCatalogers(cfg Config) []pkg.Cataloger {
 	return filterCatalogers([]pkg.Cataloger{
 		alpm.NewAlpmdbCataloger(),
 		ruby.NewGemSpecCataloger(),