Move the enrichment into the parlay package vs the command

Author: garethr

internal/commands/enrich.go

@@ -10,8 +10,6 @@ import (
 	"github.com/snyk/parlay/pkg/parlay"
 
 	cdx "github.com/CycloneDX/cyclonedx-go"
-	"github.com/package-url/packageurl-go"
-	"github.com/remeh/sizedwaitgroup"
 	"github.com/spf13/cobra"
 )
 
@@ -38,35 +36,7 @@ func NewEnrichCommand(logger *log.Logger) *cobra.Command {
 				panic(err)
 			}
 
-			wg := sizedwaitgroup.New(20)
-
-			newComponents := make([]cdx.Component, len(*bom.Components))
-
-			for i, component := range *bom.Components {
-				wg.Add()
-				go func(component cdx.Component, i int) {
-					purl, _ := packageurl.FromString(component.PackageURL)
-					resp, err := parlay.GetPackageData(purl)
-					if err == nil {
-						packageData := resp.JSON200
-						if packageData != nil {
-							if packageData.Description != nil {
-								component.Description = *packageData.Description
-							}
-							if packageData.Licenses != nil {
-								licences := cdx.LicenseChoice{Expression: *packageData.Licenses}
-								component.Licenses = &cdx.Licenses{licences}
-							}
-						}
-					}
-					newComponents[i] = component
-					wg.Done()
-				}(component, i)
-			}
-
-			wg.Wait()
-
-			bom.Components = &newComponents
+			bom = parlay.EnrichSBOM(bom)
 
 			err = cdx.NewBOMEncoder(os.Stdout, cdx.BOMFileFormatJSON).Encode(bom)
 		},

pkg/parlay/enrich.go

@@ -1 +1,41 @@
 package parlay
+
+import (
+
+	cdx "github.com/CycloneDX/cyclonedx-go"
+	"github.com/package-url/packageurl-go"
+	"github.com/remeh/sizedwaitgroup"
+)
+
+func EnrichSBOM(bom *cdx.BOM) *cdx.BOM {
+	wg := sizedwaitgroup.New(20)
+
+	newComponents := make([]cdx.Component, len(*bom.Components))
+
+	for i, component := range *bom.Components {
+		wg.Add()
+		go func(component cdx.Component, i int) {
+			purl, _ := packageurl.FromString(component.PackageURL)
+			resp, err := GetPackageData(purl)
+			if err == nil {
+				packageData := resp.JSON200
+				if packageData != nil {
+					if packageData.Description != nil {
+						component.Description = *packageData.Description
+					}
+					if packageData.Licenses != nil {
+						licences := cdx.LicenseChoice{Expression: *packageData.Licenses}
+						component.Licenses = &cdx.Licenses{licences}
+					}
+				}
+			}
+			newComponents[i] = component
+			wg.Done()
+		}(component, i)
+	}
+
+	wg.Wait()
+
+	bom.Components = &newComponents
+	return bom
+}