feat: update licenses to including license content when SPDX expressions are unable to be determined (#3366)

---------
Signed-off-by: HeyeOpenSource <opensource@heye-international.com>
Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
Co-authored-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>

syft/pkg/cataloger/golang/licenses.go

@@ -36,6 +36,7 @@ type goLicense struct {
 	Type           license.Type `json:"type,omitempty"`
 	URLs           []string     `json:"urls,omitempty"`
 	Locations      []string     `json:"locations,omitempty"`
+	Contents       string       `json:"contents,omitempty"`
 }
 
 type goLicenseResolver struct {
@@ -449,6 +450,7 @@ func toPkgLicenses(goLicenses []goLicense) []pkg.License {
 			Type:           l.Type,
 			URLs:           l.URLs,
 			Locations:      toPkgLocations(l.Locations),
+			Contents:       l.Contents,
 		})
 	}
 	return requireCollection(out)
@@ -471,6 +473,7 @@ func toGoLicenses(pkgLicenses []pkg.License) []goLicense {
 			Type:           l.Type,
 			URLs:           l.URLs,
 			Locations:      toGoLocations(l.Locations),
+			Contents:       l.Contents,
 		})
 	}
 	return out

syft/pkg/cataloger/golang/licenses_test.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/google/licensecheck"
 	"github.com/stretchr/testify/require"
 
 	"github.com/anchore/syft/internal/licenses"
@@ -70,7 +71,7 @@ func Test_LicenseSearch(t *testing.T) {
 
 	localVendorDir := filepath.Join(wd, "test-fixtures", "licenses-vendor")
 
-	licenseScanner := licenses.TestingOnlyScanner()
+	licenseScanner := licenses.NewScanner(licensecheck.Scan, float64(75))
 
 	tests := []struct {
 		name     string
@@ -295,7 +296,7 @@ func Test_findVersionPath(t *testing.T) {
 
 func Test_walkDirErrors(t *testing.T) {
 	resolver := newGoLicenseResolver("", CatalogerConfig{})
-	_, err := resolver.findLicensesInFS(context.Background(), licenses.TestingOnlyScanner(), "somewhere", badFS{})
+	_, err := resolver.findLicensesInFS(context.Background(), licenses.NewScanner(licensecheck.Scan, float64(75)), "somewhere", badFS{})
 	require.Error(t, err)
 }
 
@@ -313,8 +314,7 @@ func Test_noLocalGoModDir(t *testing.T) {
 	validTmp := t.TempDir()
 	require.NoError(t, os.MkdirAll(filepath.Join(validTmp, "mod@ver"), 0700|os.ModeDir))
 
-	licenseScanner := licenses.TestingOnlyScanner()
-
+	licenseScanner := licenses.NewScanner(licensecheck.Scan, float64(75))
 	tests := []struct {
 		name    string
 		dir     string
@@ -353,3 +353,30 @@ func Test_noLocalGoModDir(t *testing.T) {
 		})
 	}
 }
+
+func TestLicenseConversion(t *testing.T) {
+	inputLicenses := []pkg.License{
+		{
+			Value:          "Apache-2.0",
+			SPDXExpression: "Apache-2.0",
+			Type:           "concluded",
+			URLs:           nil,
+			Locations:      file.NewLocationSet(file.NewLocation("LICENSE")),
+			Contents:       "",
+		},
+		{
+			Value:          "UNKNOWN",
+			SPDXExpression: "UNKNOWN_4d1cffe420916f2b706300ab63fcafaf35226a0ad3725cb9f95b26036cefae32",
+			Type:           "declared",
+			URLs:           nil,
+			Locations:      file.NewLocationSet(file.NewLocation("LICENSE2")),
+			Contents:       "NVIDIA Software License Agreement and CUDA Supplement to Software License Agreement",
+		},
+	}
+
+	goLicenses := toGoLicenses(inputLicenses)
+
+	result := toPkgLicenses(goLicenses)
+
+	require.Equal(t, inputLicenses, result)
+}

syft/pkg/cataloger/golang/parse_go_binary_test.go

@@ -15,6 +15,7 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/google/licensecheck"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -169,7 +170,7 @@ func TestBuildGoPkgInfo(t *testing.T) {
 		},
 	}
 
-	licenseScanner := licenses.TestingOnlyScanner()
+	licenseScanner := licenses.NewScanner(licensecheck.Scan, float64(75))
 
 	tests := []struct {
 		name          string

syft/pkg/cataloger/java/archive_parser_test.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/google/licensecheck"
 	"github.com/gookit/color"
 	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
@@ -32,7 +33,7 @@ import (
 func TestSearchMavenForLicenses(t *testing.T) {
 	url := maventest.MockRepo(t, "internal/maven/test-fixtures/maven-repo")
 
-	ctx := licenses.SetContextLicenseScanner(context.Background(), licenses.TestingOnlyScanner())
+	ctx := licenses.SetContextLicenseScanner(context.Background(), licenses.NewScanner(licensecheck.Scan, float64(75)))
 
 	tests := []struct {
 		name             string
@@ -91,7 +92,7 @@ func TestSearchMavenForLicenses(t *testing.T) {
 }
 
 func TestParseJar(t *testing.T) {
-	ctx := licenses.SetContextLicenseScanner(context.Background(), licenses.TestingOnlyScanner())
+	ctx := licenses.SetContextLicenseScanner(context.Background(), licenses.NewScanner(licensecheck.Scan, float64(75)))
 
 	tests := []struct {
 		name         string
@@ -1374,7 +1375,7 @@ func Test_parseJavaArchive_regressions(t *testing.T) {
 }
 
 func Test_deterministicMatchingPomProperties(t *testing.T) {
-	ctx := licenses.SetContextLicenseScanner(context.Background(), licenses.TestingOnlyScanner())
+	ctx := licenses.SetContextLicenseScanner(context.Background(), licenses.NewScanner(licensecheck.Scan, float64(75)))
 
 	tests := []struct {
 		fixture  string