internal/licenses: remove Metadata.OldCoverage

We don't need the OldCoverage field anymore. All DBs have
only the new Coverage information.

Change-Id: Ib2d8e0cdacdc2f7b6514a8a5310d6905be15136c
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/363954
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>

4 files changed, 8 insertions, 23 deletions

diff --git a/internal/postgres/insert_module.go b/internal/postgres/insert_module.go
index c4f4a4aa..d61f8116 100644
--- a/internal/postgres/insert_module.go
+++ b/internal/postgres/insert_module.go
@@ -277,17 +277,9 @@ func insertLicenses(ctx context.Context, db *database.DB, m *internal.Module, mo
 	defer derrors.WrapStack(&err, "insertLicenses(ctx, %q, %q)", m.ModulePath, m.Version)
 	var licenseValues []interface{}
 	for _, l := range m.Licenses {
-		var covJSON []byte
-		if l.Coverage.Percent == 0 && l.Coverage.Match == nil {
-			covJSON, err = json.Marshal(l.OldCoverage)
-			if err != nil {
-				return fmt.Errorf("marshalling %+v: %v", l.OldCoverage, err)
-			}
-		} else {
-			covJSON, err = json.Marshal(l.Coverage)
-			if err != nil {
-				return fmt.Errorf("marshalling %+v: %v", l.Coverage, err)
-			}
+		covJSON, err := json.Marshal(l.Coverage)
+		if err != nil {
+			return fmt.Errorf("marshalling %+v: %v", l.Coverage, err)
 		}
 		licenseValues = append(licenseValues, l.FilePath,
 			makeValidUnicode(string(l.Contents)), pq.Array(l.Types), covJSON,
diff --git a/internal/postgres/insert_module_test.go b/internal/postgres/insert_module_test.go
index d415dcd5..5e9d8efc 100644
--- a/internal/postgres/insert_module_test.go
+++ b/internal/postgres/insert_module_test.go
@@ -121,7 +121,7 @@ func checkModule(ctx context.Context, t *testing.T, db *DB, want *internal.Modul
 		wantu.Subdirectories = subdirectories
 		opts := cmp.Options{
 			cmpopts.EquateEmpty(),
-			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
+			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
 			cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 		}
 		if diff := cmp.Diff(wantu, got, opts); diff != "" {
diff --git a/internal/postgres/licenses.go b/internal/postgres/licenses.go
index e18f6ea0..a7282207 100644
--- a/internal/postgres/licenses.go
+++ b/internal/postgres/licenses.go
@@ -14,7 +14,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/google/licensecheck"
 	"github.com/lib/pq"
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/licenses"
@@ -123,12 +122,6 @@ func collectLicenses(rows *sql.Rows, bypassLicenseCheck bool) ([]*licenses.Licen
 		if err := json.Unmarshal(covBytes, &lic.Coverage); err != nil {
 			return nil, err
 		}
-		if len(lic.Coverage.Match) == 0 || lic.Coverage.Match[0].ID == "" {
-			lic.Coverage = licensecheck.Coverage{}
-			if err := json.Unmarshal(covBytes, &lic.OldCoverage); err != nil {
-				return nil, err
-			}
-		}
 		lic.Types = licenseTypes
 		if !bypassLicenseCheck {
 			lic.RemoveNonRedistributableData()
diff --git a/internal/postgres/unit_test.go b/internal/postgres/unit_test.go
index 973e9f9a..9c7813c0 100644
--- a/internal/postgres/unit_test.go
+++ b/internal/postgres/unit_test.go
@@ -78,7 +78,7 @@ func testGetUnitMeta(t *testing.T, ctx context.Context) {
 		}
 		opts := []cmp.Option{
 			cmpopts.EquateEmpty(),
-			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
+			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
 			cmpopts.IgnoreFields(internal.UnitMeta{}, "HasGoMod"),
 			cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 		}
@@ -355,7 +355,7 @@ func TestGetUnitMetaBypass(t *testing.T) {
 				}
 				opts := []cmp.Option{
 					cmpopts.EquateEmpty(),
-					cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
+					cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
 					cmpopts.IgnoreFields(internal.UnitMeta{}, "HasGoMod"),
 					cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 				}
@@ -756,7 +756,7 @@ func checkUnit(ctx context.Context, t *testing.T, db *DB, um *internal.UnitMeta,
 	opts := []cmp.Option{
 		cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 		// The packages table only includes partial license information; it omits the Coverage field.
-		cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
+		cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
 	}
 	want.SourceInfo = um.SourceInfo
 	want.NumImports = len(want.Imports)
@@ -862,7 +862,7 @@ func TestGetUnitFieldSet(t *testing.T) {
 				cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 				cmpopts.EquateEmpty(),
 				// The packages table only includes partial license information; it omits the Coverage field.
-				cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
+				cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
 			}
 			test.want.CommitTime = um.CommitTime
 			test.want.SourceInfo = um.SourceInfo