internal/postgres: add retraction/deprecation info to GetUnitMeta

For golang/go#43265
For golang/go#41321

Change-Id: I8dc86d87882b96d3c3ffe7c1d035937f210b9a91
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/296229
Trust: Jonathan Amsterdam <[email protected]>
Run-TryBot: Jonathan Amsterdam <[email protected]>
TryBot-Result: kokoro <[email protected]>
Reviewed-by: Julie Qiu <[email protected]>

Author: jba

internal/postgres/details.go

@@ -12,12 +12,9 @@ import (
 	"fmt"
 	"reflect"
 	"regexp"
-	"time"
 
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/derrors"
-	"golang.org/x/pkgsite/internal/experiment"
-	"golang.org/x/pkgsite/internal/log"
 	"golang.org/x/pkgsite/internal/middleware"
 )
 
@@ -67,7 +64,7 @@ func (db *DB) GetNestedModules(ctx context.Context, modulePath string) (_ []*int
 		return nil, err
 	}
 
-	if err := populateRawLatestInfo(ctx, db, modules); err != nil {
+	if err := populateRawLatestInfos(ctx, db, modules); err != nil {
 		return nil, err
 	}
 
@@ -171,17 +168,8 @@ func (db *DB) GetModuleInfo(ctx context.Context, modulePath, resolvedVersion str
 		return nil, fmt.Errorf("row.Scan(): %v", err)
 	}
 
-	if experiment.IsActive(ctx, internal.ExperimentRetractions) {
-		// Get information about retractions an deprecations, and apply it.
-		start := time.Now()
-		info, err := db.GetRawLatestInfo(ctx, modulePath)
-		if err != nil {
-			return nil, err
-		}
-		if info != nil {
-			info.PopulateModuleInfo(mi)
-		}
-		log.Debugf(ctx, "raw latest info fetched and applied in %dms", time.Since(start).Milliseconds())
+	if err := populateRawLatestInfo(ctx, db, mi); err != nil {
+		return nil, err
 	}
 	return mi, nil
 }

internal/postgres/unit.go

@@ -71,6 +71,9 @@ func (db *DB) GetUnitMeta(ctx context.Context, fullPath, requestedModulePath, re
 		}
 
 		um.Licenses = lics
+		if err := populateRawLatestInfo(ctx, db, &um.ModuleInfo); err != nil {
+			return nil, err
+		}
 		return &um, nil
 	default:
 		return nil, err

internal/postgres/unit_test.go

@@ -27,6 +27,7 @@ func TestGetUnitMeta(t *testing.T) {
 	defer release()
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 	defer cancel()
+	ctx = experiment.NewContext(ctx, internal.ExperimentRetractions)
 
 	for _, testModule := range []struct {
 		module, version, packageSuffix string
@@ -59,6 +60,8 @@ func TestGetUnitMeta(t *testing.T) {
 		}
 	}
 
+	addRawLatest(ctx, t, testDB, "m.com", "v.1.1.0", "module m.com\nretract v1.0.1 // bad")
+
 	type teststruct struct {
 		name                  string
 		path, module, version string
@@ -136,7 +139,12 @@ func TestGetUnitMeta(t *testing.T) {
 		{
 			name: "directory",
 			path: "m.com/dir",
-			want: wantUnitMeta("m.com", "v1.0.1", ""),
+			want: func() *internal.UnitMeta {
+				um := wantUnitMeta("m.com", "v1.0.1", "")
+				um.Retracted = true
+				um.RetractionRationale = "bad"
+				return um
+			}(),
 		},
 		{
 			name:    "module at master version",
@@ -174,14 +182,17 @@ func TestGetUnitMeta(t *testing.T) {
 			if test.version == "" {
 				test.version = internal.LatestVersion
 			}
-			test.want = sample.UnitMeta(
+			want := sample.UnitMeta(
 				test.path,
 				test.want.ModulePath,
 				test.want.Version,
 				test.want.Name,
 				test.want.IsRedistributable,
 			)
-			test.want.CommitTime = sample.CommitTime
+			want.CommitTime = sample.CommitTime
+			want.Retracted = test.want.Retracted
+			want.RetractionRationale = test.want.RetractionRationale
+			test.want = want
 			checkUnitMeta(ctx, test)
 		})
 	}

internal/postgres/version.go

@@ -93,7 +93,7 @@ func getPathVersions(ctx context.Context, db *DB, path string, versionTypes ...v
 	if err := db.db.RunQuery(ctx, query, collect, path); err != nil {
 		return nil, err
 	}
-	if err := populateRawLatestInfo(ctx, db, versions); err != nil {
+	if err := populateRawLatestInfos(ctx, db, versions); err != nil {
 		return nil, err
 	}
 	return versions, nil
@@ -109,8 +109,26 @@ func versionTypeExpr(vts []version.Type) string {
 	return strings.Join(vs, ", ")
 }
 
-func populateRawLatestInfo(ctx context.Context, db *DB, mis []*internal.ModuleInfo) (err error) {
-	defer derrors.WrapStack(&err, "populateRawLatestInfo(%d ModuleInfos)", len(mis))
+func populateRawLatestInfo(ctx context.Context, db *DB, mi *internal.ModuleInfo) (err error) {
+	defer derrors.WrapStack(&err, "populateRawLatestInfo(%q)", mi.ModulePath)
+
+	if experiment.IsActive(ctx, internal.ExperimentRetractions) {
+		// Get information about retractions an deprecations, and apply it.
+		start := time.Now()
+		info, err := db.GetRawLatestInfo(ctx, mi.ModulePath)
+		if err != nil {
+			return err
+		}
+		if info != nil {
+			info.PopulateModuleInfo(mi)
+		}
+		log.Debugf(ctx, "raw latest info fetched and applied in %dms", time.Since(start).Milliseconds())
+	}
+	return nil
+}
+
+func populateRawLatestInfos(ctx context.Context, db *DB, mis []*internal.ModuleInfo) (err error) {
+	defer derrors.WrapStack(&err, "populateRawLatestInfos(%d ModuleInfos)", len(mis))
 
 	if experiment.IsActive(ctx, internal.ExperimentRetractions) {
 		start := time.Now()