internal/licenses: rename Coverage fields

Coverage -> OldCoverage
NewCoverage -> Coverage

Change-Id: I05b41e1525700b3539dad9894b6b678f6c88c67d
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/283653
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
Reviewed-by: Julie Qiu <julie@golang.org>

4 files changed, 20 insertions, 20 deletions

diff --git a/internal/postgres/insert_module.go b/internal/postgres/insert_module.go
index 563e90c8..47000d0e 100644
--- a/internal/postgres/insert_module.go
+++ b/internal/postgres/insert_module.go
@@ -208,15 +208,15 @@ func insertLicenses(ctx context.Context, db *database.DB, m *internal.Module, mo
 	var licenseValues []interface{}
 	for _, l := range m.Licenses {
 		var covJSON []byte
-		if l.NewCoverage.Percent == 0 && l.NewCoverage.Match == nil {
-			covJSON, err = json.Marshal(l.Coverage)
+		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.Coverage, err)
+				return fmt.Errorf("marshalling %+v: %v", l.OldCoverage, err)
 			}
 		} else {
-			covJSON, err = json.Marshal(l.NewCoverage)
+			covJSON, err = json.Marshal(l.Coverage)
 			if err != nil {
-				return fmt.Errorf("marshalling %+v: %v", l.NewCoverage, err)
+				return fmt.Errorf("marshalling %+v: %v", l.Coverage, err)
 			}
 		}
 		licenseValues = append(licenseValues, l.FilePath,
diff --git a/internal/postgres/insert_module_test.go b/internal/postgres/insert_module_test.go
index 8921a652..fb21c6ac 100644
--- a/internal/postgres/insert_module_test.go
+++ b/internal/postgres/insert_module_test.go
@@ -96,7 +96,7 @@ func checkModule(ctx context.Context, t *testing.T, want *internal.Module) {
 		}
 		wantu.Subdirectories = subdirectories
 		opts := cmp.Options{
-			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
+			cmpopts.IgnoreFields(licenses.Metadata{}, "OldCoverage"),
 			cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 		}
 		if diff := cmp.Diff(wantu, got, opts); diff != "" {
@@ -273,9 +273,9 @@ func TestInsertModuleNewCoverage(t *testing.T) {
 	m.Licenses = []*licenses.License{
 		{
 			Metadata: &licenses.Metadata{
-				Types:       []string{sample.LicenseType},
-				FilePath:    sample.LicenseFilePath,
-				NewCoverage: newCoverage,
+				Types:    []string{sample.LicenseType},
+				FilePath: sample.LicenseFilePath,
+				Coverage: newCoverage,
 			},
 			Contents: []byte(`Lorem Ipsum`),
 		},
@@ -289,9 +289,9 @@ func TestInsertModuleNewCoverage(t *testing.T) {
 	}
 	got := u.LicenseContents[0].Metadata
 	want := &licenses.Metadata{
-		Types:       []string{"MIT"},
-		FilePath:    sample.LicenseFilePath,
-		NewCoverage: newCoverage,
+		Types:    []string{"MIT"},
+		FilePath: sample.LicenseFilePath,
+		Coverage: newCoverage,
 	}
 	if !cmp.Equal(got, want) {
 		t.Errorf("\ngot  %+v\nwant %+v", got, want)
diff --git a/internal/postgres/licenses.go b/internal/postgres/licenses.go
index a3a8ec72..6f91bdac 100644
--- a/internal/postgres/licenses.go
+++ b/internal/postgres/licenses.go
@@ -120,12 +120,12 @@ func collectLicenses(rows *sql.Rows, bypassLicenseCheck bool) ([]*licenses.Licen
 		// which is always populated, but the old one doesn't. First try
 		// unmarshalling the new one, then if that doesn't populate the ID
 		// field, try the old.
-		if err := json.Unmarshal(covBytes, &lic.NewCoverage); err != nil {
+		if err := json.Unmarshal(covBytes, &lic.Coverage); err != nil {
 			return nil, err
 		}
-		if len(lic.NewCoverage.Match) == 0 || lic.NewCoverage.Match[0].ID == "" {
-			lic.NewCoverage = licensecheck.Coverage{}
-			if err := json.Unmarshal(covBytes, &lic.Coverage); err != nil {
+		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
 			}
 		}
diff --git a/internal/postgres/unit_test.go b/internal/postgres/unit_test.go
index a4c67b07..0a7ef993 100644
--- a/internal/postgres/unit_test.go
+++ b/internal/postgres/unit_test.go
@@ -72,7 +72,7 @@ func TestGetUnitMeta(t *testing.T) {
 			t.Fatal(err)
 		}
 		opts := []cmp.Option{
-			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
+			cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
 			cmpopts.IgnoreFields(internal.UnitMeta{}, "HasGoMod"),
 			cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 		}
@@ -412,7 +412,7 @@ func TestGetUnitMetaBypass(t *testing.T) {
 					t.Fatal(err)
 				}
 				opts := []cmp.Option{
-					cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
+					cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
 					cmpopts.IgnoreFields(internal.UnitMeta{}, "HasGoMod"),
 					cmp.AllowUnexported(source.Info{}, safehtml.HTML{}),
 				}
@@ -580,7 +580,7 @@ func checkUnit(ctx context.Context, t *testing.T, um *internal.UnitMeta, want *i
 	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"),
+		cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
 	}
 	want.SourceInfo = um.SourceInfo
 	want.NumImports = len(want.Imports)
@@ -684,7 +684,7 @@ func TestGetUnitFieldSet(t *testing.T) {
 			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"),
+				cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage", "OldCoverage"),
 			}
 			test.want.CommitTime = um.CommitTime
 			test.want.SourceInfo = um.SourceInfo