internal: add NewRawLatestInfo method

Consolidate creation of RawLatestInfo in one function.

For golang/go#43265

Change-Id: Id57d044c33a678b8ff4e57ada1a5569e09f841d0
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/295897
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/fetch/raw_latest.go

@@ -7,9 +7,7 @@ package fetch
 import (
 	"context"
 	"errors"
-	"fmt"
 
-	"golang.org/x/mod/modfile"
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/log"
@@ -35,15 +33,7 @@ func RawLatestInfo(ctx context.Context, modulePath string, prox *proxy.Client, h
 	if err != nil {
 		return nil, err
 	}
-	f, err := modfile.ParseLax(fmt.Sprintf("%s@%s/go.mod", modulePath, v), modBytes, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &internal.RawLatestInfo{
-		ModulePath: modulePath,
-		Version:    v,
-		GoModFile:  f,
-	}, nil
+	return internal.NewRawLatestInfo(modulePath, v, modBytes)
 }
 
 // fetchRawLatestVersion uses the proxy to determine the latest

internal/postgres/version.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/Masterminds/squirrel"
-	"golang.org/x/mod/modfile"
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/database"
 	"golang.org/x/pkgsite/internal/derrors"
@@ -246,26 +245,22 @@ func (db *DB) GetRawLatestInfo(ctx context.Context, modulePath string) (_ *inter
 	defer derrors.WrapStack(&err, "GetRawLatestInfo(%q)", modulePath)
 
 	var (
-		info       internal.RawLatestInfo
+		version    string
 		goModBytes []byte
 	)
 	err = db.db.QueryRow(ctx, `
-		SELECT p.path, r.version, r.go_mod_bytes
+		SELECT r.version, r.go_mod_bytes
 		FROM raw_latest_versions r
 		INNER JOIN paths p ON p.id = r.module_path_id
 		WHERE p.path = $1`,
-		modulePath).Scan(&info.ModulePath, &info.Version, &goModBytes)
+		modulePath).Scan(&version, &goModBytes)
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return nil, nil
 		}
 		return nil, err
 	}
-	info.GoModFile, err = modfile.ParseLax(modulePath+" from DB", goModBytes, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &info, nil
+	return internal.NewRawLatestInfo(modulePath, version, goModBytes)
 }
 
 // UpdateRawLatestInfo upserts its argument into the raw_latest_versions table

internal/postgres/version_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.org/x/mod/modfile"
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/source"
@@ -252,15 +251,10 @@ func TestGetVersions(t *testing.T) {
 }
 
 func addRawLatest(ctx context.Context, t *testing.T, db *DB, modulePath, version, modFile string) {
-	f, err := modfile.ParseLax(modulePath+"@"+version, []byte(modFile), nil)
+	info, err := internal.NewRawLatestInfo(modulePath, version, []byte(modFile))
 	if err != nil {
 		t.Fatal(err)
 	}
-	info := &internal.RawLatestInfo{
-		ModulePath: modulePath,
-		Version:    version,
-		GoModFile:  f,
-	}
 	if err := db.UpdateRawLatestInfo(ctx, info); err != nil {
 		t.Fatal(err)
 	}
@@ -391,12 +385,10 @@ func TestRawLatestInfo(t *testing.T) {
 	defer release()
 	ctx := context.Background()
 
-	goMod, err := modfile.ParseLax("m from DB", []byte(`module m`), nil)
+	info, err := internal.NewRawLatestInfo("m", "v1.0.0", []byte(`module m`))
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	info := &internal.RawLatestInfo{ModulePath: "m", Version: "v1.0.0", GoModFile: goMod}
 	if err := testDB.UpdateRawLatestInfo(ctx, info); err != nil {
 		t.Fatal(err)
 	}
@@ -408,7 +400,10 @@ func TestRawLatestInfo(t *testing.T) {
 		t.Fatalf("mismatch (-want, +got): %s", diff)
 	}
 
-	info.Version = "v1.2.3"
+	info, err = internal.NewRawLatestInfo("m", "v1.2.3", []byte(`module m`))
+	if err != nil {
+		t.Fatal(err)
+	}
 	if err := testDB.UpdateRawLatestInfo(ctx, info); err != nil {
 		t.Fatal(err)
 	}

internal/raw_latest.go

@@ -5,6 +5,7 @@
 package internal
 
 import (
+	"fmt"
 	"strings"
 
 	"golang.org/x/mod/modfile"
@@ -21,6 +22,18 @@ type RawLatestInfo struct {
 	GoModFile  *modfile.File
 }
 
+func NewRawLatestInfo(modulePath, version string, modBytes []byte) (*RawLatestInfo, error) {
+	f, err := modfile.ParseLax(fmt.Sprintf("%s@%s/go.mod", modulePath, version), modBytes, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &RawLatestInfo{
+		ModulePath: modulePath,
+		Version:    version,
+		GoModFile:  f,
+	}, nil
+}
+
 // PopulateModuleInfo uses the RawLatestInfo to populate fields of the given module.
 func (r *RawLatestInfo) PopulateModuleInfo(mi *ModuleInfo) {
 	mi.Deprecated, mi.DeprecationComment = isDeprecated(r.GoModFile)