cmd/vulnreport: embed test files

Change-Id: I2828b15f925e6d4d66c799517c80150936b37838
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/599175
Reviewed-by: Damien Neil <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: tatianab

cmd/vulnreport/find_aliases.go

@@ -174,11 +174,8 @@ type memGC struct {
 	ghsas map[string]ghsa.SecurityAdvisory
 }
 
-func newMemGC(archive string) (*memGC, error) {
-	ar, err := txtar.ParseFile(archive)
-	if err != nil {
-		return nil, err
-	}
+func newMemGC(archive []byte) (*memGC, error) {
+	ar := txtar.Parse(archive)
 	m := &memGC{
 		ghsas: make(map[string]ghsa.SecurityAdvisory),
 	}

cmd/vulnreport/issue_client.go

@@ -29,11 +29,8 @@ type memIC struct {
 	is map[int]issues.Issue
 }
 
-func newMemIC(archive string) (*memIC, error) {
-	ar, err := txtar.ParseFile(archive)
-	if err != nil {
-		return nil, err
-	}
+func newMemIC(archive []byte) (*memIC, error) {
+	ar := txtar.Parse(archive)
 	m := &memIC{
 		is: make(map[int]issues.Issue),
 	}

cmd/vulnreport/priority/load.go

@@ -10,7 +10,6 @@ import (
 	_ "embed"
 	"encoding/csv"
 	"io"
-	"os"
 	"strconv"
 )
 
@@ -26,10 +25,10 @@ func gzCSVToMap(b []byte) (map[string]int, error) {
 	if err != nil {
 		return nil, err
 	}
-	return csvToMap(gzr)
+	return CSVToMap(gzr)
 }
 
-func csvToMap(r io.Reader) (map[string]int, error) {
+func CSVToMap(r io.Reader) (map[string]int, error) {
 	reader := csv.NewReader(r)
 	records, err := reader.ReadAll()
 	if err != nil {
@@ -50,12 +49,3 @@ func csvToMap(r io.Reader) (map[string]int, error) {
 
 	return m, nil
 }
-
-func CSVToMap(fname string) (map[string]int, error) {
-	r, err := os.Open(fname)
-	if err != nil {
-		return nil, err
-	}
-	defer r.Close()
-	return csvToMap(r)
-}

cmd/vulnreport/run_test.go

@@ -7,6 +7,7 @@ package main
 import (
 	"bytes"
 	"context"
+	_ "embed"
 	"flag"
 	"fmt"
 	"io/fs"
@@ -48,52 +49,59 @@ func (m *memWFS) WriteFile(fname string, b []byte) error {
 	m.written[fname] = b
 	return nil
 }
-
 func testFilename(t *testing.T) string {
 	return filepath.Join("testdata", t.Name()+".txtar")
 }
 
-// TODO(tatianabradley): embed these test files.
-const (
-	testRepoFile     = "testdata/repo.txtar"
-	testIssueTracker = "testdata/issue_tracker.txtar"
-	testLegacyGHSAs  = "testdata/legacy_ghsas.txtar"
-	testModuleMap    = "testdata/modules.csv"
+var (
+	//go:embed testdata/repo.txtar
+	testRepo []byte
+	//go:embed testdata/issue_tracker.txtar
+	testIssueTracker []byte
+	//go:embed testdata/legacy_ghsas.txtar
+	testLegacyGHSAs []byte
+	//go:embed testdata/modules.csv
+	testModuleMap []byte
 )
 
 // runTest runs the command on the test case in the default test environment.
 func runTest(t *testing.T, cmd command, tc *testCase) {
 	runTestWithEnv(t, cmd, tc, func(t *testing.T) (*environment, error) {
-		return newTestEnv(t, testRepoFile, testIssueTracker, testLegacyGHSAs, testModuleMap)
+		return newDefaultTestEnv(t)
 	})
 }
 
 var testTime = time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
 
-func newTestEnv(t *testing.T, reportRepoFile, issueTracker, legacyGHSAs, testModuleMap string) (*environment, error) {
+func newDefaultTestEnv(t *testing.T) (*environment, error) {
 	t.Helper()
 
-	repo, err := gitrepo.ReadTxtarRepo(reportRepoFile, testTime)
+	ar := txtar.Parse(testRepo)
+	repo, err := gitrepo.FromTxtarArchive(ar, testTime)
 	if err != nil {
 		return nil, err
 	}
-	fsys, err := test.ReadTxtarFS(reportRepoFile)
+	fsys, err := test.TxtarArchiveToFS(ar)
 	if err != nil {
 		return nil, err
 	}
+
 	pc, err := proxy.NewTestClient(t, *realProxy)
 	if err != nil {
 		return nil, err
 	}
-	ic, err := newMemIC(issueTracker)
+
+	ic, err := newMemIC(testIssueTracker)
 	if err != nil {
 		return nil, err
 	}
-	gc, err := newMemGC(legacyGHSAs)
+
+	gc, err := newMemGC(testLegacyGHSAs)
 	if err != nil {
 		return nil, err
 	}
-	mm, err := priority.CSVToMap(testModuleMap)
+
+	mm, err := priority.CSVToMap(bytes.NewReader(testModuleMap))
 	if err != nil {
 		return nil, err
 	}

internal/gitrepo/gitrepo.go

@@ -138,13 +138,18 @@ func HeadCommit(repo *git.Repository) (*object.Commit, error) {
 // ReadTxtarRepo converts a txtar file to a single-commit
 // repo. It is intended for testing.
 func ReadTxtarRepo(filename string, now time.Time) (_ *git.Repository, err error) {
-	defer derrors.Wrap(&err, "readTxtarRepo(%q)", filename)
+	defer derrors.Wrap(&err, "ReadTxtarRepo(%q)", filename)
 
-	mfs := memfs.New()
 	ar, err := txtar.ParseFile(filename)
 	if err != nil {
 		return nil, err
 	}
+
+	return FromTxtarArchive(ar, now)
+}
+
+func FromTxtarArchive(ar *txtar.Archive, now time.Time) (_ *git.Repository, err error) {
+	mfs := memfs.New()
 	for _, f := range ar.Files {
 		file, err := mfs.Create(f.Name)
 		if err != nil {

internal/test/txtar.go

@@ -102,12 +102,16 @@ func FindFile(ar *txtar.Archive, filename string) (*txtar.File, error) {
 }
 
 func ReadTxtarFS(filename string) (fs.FS, error) {
-	a, err := txtar.ParseFile(filename)
+	ar, err := txtar.ParseFile(filename)
 	if err != nil {
 		return nil, err
 	}
+	return TxtarArchiveToFS(ar)
+}
+
+func TxtarArchiveToFS(ar *txtar.Archive) (fs.FS, error) {
 	m := make(fstest.MapFS)
-	for _, a := range a.Files {
+	for _, a := range ar.Files {
 		m[a.Name] = &fstest.MapFile{Data: a.Data}
 	}
 	return m, nil