add configurable task collection backend

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

cmd/attest.go

@@ -193,6 +193,12 @@ func attestationExecWorker(si source.Input, format sbom.Format, predicateType st
 	go func() {
 		defer close(errs)
 
+		catalogingConfig, err := appConfig.ToCatalogingConfig()
+		if err != nil {
+			errs <- err
+			return
+		}
+
 		src, cleanup, err := source.NewFromRegistry(si, appConfig.Registry.ToOptions(), appConfig.Exclusions)
 		if cleanup != nil {
 			defer cleanup()
@@ -202,7 +208,7 @@ func attestationExecWorker(si source.Input, format sbom.Format, predicateType st
 			return
 		}
 
-		s, err := generateSBOM(src)
+		s, err := generateSBOM(src, catalogingConfig)
 		if err != nil {
 			errs <- err
 			return

cmd/packages.go

@@ -94,7 +94,7 @@ func init() {
 func setPackageFlags(flags *pflag.FlagSet) {
 	// Formatting & Input options //////////////////////////////////////////////
 	flags.StringP(
-		"scope", "s", syft.DefaultCatalogingConfig().Scope.String(),
+		"scope", "s", syft.DefaultCatalogingConfig().DefaultScope.String(),
 		fmt.Sprintf("selection of layers to catalog, options=%v", source.AllScopes))
 
 	flags.StringArrayP(
@@ -165,7 +165,7 @@ func bindExclusivePackagesConfigOptions(flags *pflag.FlagSet) error {
 
 	// note: output is not included since this configuration option is shared between multiple subcommands
 
-	if err := viper.BindPFlag("package.cataloger.scope", flags.Lookup("scope")); err != nil {
+	if err := viper.BindPFlag("scope", flags.Lookup("scope")); err != nil {
 		return err
 	}
 
@@ -257,15 +257,9 @@ func isVerbose() (result bool) {
 	return appConfig.CliOptions.Verbosity > 0 || isPipedInput
 }
 
-func generateSBOM(src *source.Source) (*sbom.SBOM, error) {
-	catalogingConfig, err := appConfig.ToCatalogingConfig()
-	if err != nil {
-		return nil, err
-	}
-
+func generateSBOM(src *source.Source, config *syft.CatalogingConfig) (*sbom.SBOM, error) {
 	return syft.Catalog(src,
-		syft.WithConfig(*catalogingConfig),
-		syft.WithDefaultPackageCatalogers(appConfig.Package.ToConfig()),
+		syft.WithConfig(*config),
 	)
 }
 
@@ -274,6 +268,12 @@ func packagesExecWorker(si source.Input, writer sbom.Writer) <-chan error {
 	go func() {
 		defer close(errs)
 
+		catalogingConfig, err := appConfig.ToCatalogingConfig()
+		if err != nil {
+			errs <- err
+			return
+		}
+
 		src, cleanup, err := source.New(si, appConfig.Registry.ToOptions(), appConfig.Exclusions)
 		if cleanup != nil {
 			defer cleanup()
@@ -283,7 +283,7 @@ func packagesExecWorker(si source.Input, writer sbom.Writer) <-chan error {
 			return
 		}
 
-		s, err := generateSBOM(src)
+		s, err := generateSBOM(src, catalogingConfig)
 		if err != nil {
 			errs <- err
 			return

cmd/power_user.go

@@ -104,10 +104,17 @@ func powerUserExecWorker(userInput string, writer sbom.Writer) <-chan error {
 	go func() {
 		defer close(errs)
 
-		appConfig.Secrets.Cataloger.Enabled = true
-		appConfig.FileMetadata.Cataloger.Enabled = true
-		appConfig.FileContents.Cataloger.Enabled = true
-		appConfig.FileClassification.Cataloger.Enabled = true
+		// TODO: replace
+		//appConfig.Secrets.Cataloger.Enabled = true
+		//appConfig.FileMetadata.Cataloger.Enabled = true
+		//appConfig.FileContents.Cataloger.Enabled = true
+		//appConfig.FileClassification.Cataloger.Enabled = true
+
+		catalogingConfig, err := appConfig.ToCatalogingConfig()
+		if err != nil {
+			errs <- err
+			return
+		}
 
 		si, err := source.ParseInput(userInput, appConfig.Platform, true)
 		if err != nil {
@@ -124,7 +131,7 @@ func powerUserExecWorker(userInput string, writer sbom.Writer) <-chan error {
 			defer cleanup()
 		}
 
-		s, err := generateSBOM(src)
+		s, err := generateSBOM(src, catalogingConfig)
 		if err != nil {
 			errs <- err
 			return