internal/frontend: replace aliased types with their original types
They are Vuln, vulnEntriesFunc, VulnsForPackage.
Change-Id: I77172775a5cd3dbd0b1fba10f0c4ef296319275b
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/444680
Reviewed-by: Jamal Carvalho <jamal@golang.org>
diff --git a/internal/frontend/search.go b/internal/frontend/search.go
index 01cf346..c823fa5 100644
--- a/internal/frontend/search.go
+++ b/internal/frontend/search.go
@@ -27,6 +27,7 @@
"golang.org/x/pkgsite/internal/postgres"
"golang.org/x/pkgsite/internal/stdlib"
"golang.org/x/pkgsite/internal/version"
+ "golang.org/x/pkgsite/internal/vulns"
"golang.org/x/text/message"
vulnc "golang.org/x/vuln/client"
)
@@ -129,7 +130,7 @@
if len(filters) > 0 {
symbol = filters[0]
}
- var getVulnEntries vulnEntriesFunc
+ var getVulnEntries vulns.VulnEntriesFunc
if vulnClient != nil {
getVulnEntries = vulnClient.GetByModule
}
@@ -225,7 +226,7 @@
SymbolGOOS string
SymbolGOARCH string
SymbolLink string
- Vulns []Vuln
+ Vulns []vulns.Vuln
}
type subResult struct {
@@ -236,7 +237,7 @@
// fetchSearchPage fetches data matching the search query from the database and
// returns a SearchPage.
func fetchSearchPage(ctx context.Context, db *postgres.DB, cq, symbol string,
- pageParams paginationParams, searchSymbols bool, getVulnEntries vulnEntriesFunc) (*SearchPage, error) {
+ pageParams paginationParams, searchSymbols bool, getVulnEntries vulns.VulnEntriesFunc) (*SearchPage, error) {
maxResultCount := maxSearchOffset + pageParams.limit
// Pageless search: always start from the beginning.
@@ -607,7 +608,7 @@
// addVulns adds vulnerability information to search results by consulting the
// vulnerability database.
-func addVulns(ctx context.Context, rs []*SearchResult, getVulnEntries vulnEntriesFunc) {
+func addVulns(ctx context.Context, rs []*SearchResult, getVulnEntries vulns.VulnEntriesFunc) {
// Get all vulns concurrently.
var wg sync.WaitGroup
// TODO(golang/go#48223): throttle concurrency?
@@ -616,7 +617,7 @@
wg.Add(1)
go func() {
defer wg.Done()
- r.Vulns = VulnsForPackage(ctx, r.ModulePath, r.Version, r.PackagePath, getVulnEntries)
+ r.Vulns = vulns.VulnsForPackage(ctx, r.ModulePath, r.Version, r.PackagePath, getVulnEntries)
}()
}
wg.Wait()
diff --git a/internal/frontend/search_test.go b/internal/frontend/search_test.go
index c335323..94c5943 100644
--- a/internal/frontend/search_test.go
+++ b/internal/frontend/search_test.go
@@ -22,6 +22,7 @@
"golang.org/x/pkgsite/internal/licenses"
"golang.org/x/pkgsite/internal/postgres"
"golang.org/x/pkgsite/internal/testing/sample"
+ "golang.org/x/pkgsite/internal/vulns"
"golang.org/x/text/language"
"golang.org/x/text/message"
"golang.org/x/vuln/osv"
@@ -384,7 +385,7 @@
DisplayVersion: moduleFoo.Version,
Licenses: []string{"MIT"},
CommitTime: elapsedTime(moduleFoo.CommitTime),
- Vulns: []Vuln{{ID: "test", Details: "vuln"}},
+ Vulns: []vulns.Vuln{{ID: "test", Details: "vuln"}},
},
},
},
diff --git a/internal/frontend/tabs.go b/internal/frontend/tabs.go
index 972f6b6..aace156 100644
--- a/internal/frontend/tabs.go
+++ b/internal/frontend/tabs.go
@@ -11,6 +11,7 @@
"golang.org/x/pkgsite/internal"
"golang.org/x/pkgsite/internal/derrors"
+ "golang.org/x/pkgsite/internal/vulns"
)
// TabSettings defines tab-specific metadata.
@@ -77,7 +78,7 @@
// handler.
func fetchDetailsForUnit(ctx context.Context, r *http.Request, tab string, ds internal.DataSource, um *internal.UnitMeta,
requestedVersion string, bc internal.BuildContext,
- getVulnEntries vulnEntriesFunc) (_ interface{}, err error) {
+ getVulnEntries vulns.VulnEntriesFunc) (_ interface{}, err error) {
defer derrors.Wrap(&err, "fetchDetailsForUnit(r, %q, ds, um=%q,%q,%q)", tab, um.Path, um.ModulePath, um.Version)
switch tab {
case tabMain:
diff --git a/internal/frontend/unit.go b/internal/frontend/unit.go
index cf3ea7b..79fce3b 100644
--- a/internal/frontend/unit.go
+++ b/internal/frontend/unit.go
@@ -21,6 +21,7 @@
"golang.org/x/pkgsite/internal/middleware"
"golang.org/x/pkgsite/internal/stdlib"
"golang.org/x/pkgsite/internal/version"
+ "golang.org/x/pkgsite/internal/vulns"
)
// UnitPage contains data needed to render the unit template.
@@ -91,7 +92,7 @@
Details interface{}
// Vulns holds vulnerability information.
- Vulns []Vuln
+ Vulns []vulns.Vuln
// DepsDevURL holds the full URL to this module version on deps.dev.
DepsDevURL string
@@ -134,7 +135,7 @@
// It's also okay to provide just one (e.g. GOOS=windows), which will select
// the first doc with that value, ignoring the other one.
bc := internal.BuildContext{GOOS: r.FormValue("GOOS"), GOARCH: r.FormValue("GOARCH")}
- var getVulnEntries vulnEntriesFunc
+ var getVulnEntries vulns.VulnEntriesFunc
if s.vulnClient != nil {
getVulnEntries = s.vulnClient.GetByModule
}
@@ -240,7 +241,7 @@
// Get vulnerability information.
if s.vulnClient != nil {
- page.Vulns = VulnsForPackage(ctx, um.ModulePath, um.Version, um.Path, s.vulnClient.GetByModule)
+ page.Vulns = vulns.VulnsForPackage(ctx, um.ModulePath, um.Version, um.Path, s.vulnClient.GetByModule)
}
s.servePage(ctx, w, tabSettings.TemplateName, page)
return nil
diff --git a/internal/frontend/versions.go b/internal/frontend/versions.go
index 5de5270..e9e6840 100644
--- a/internal/frontend/versions.go
+++ b/internal/frontend/versions.go
@@ -18,6 +18,7 @@
"golang.org/x/pkgsite/internal/postgres"
"golang.org/x/pkgsite/internal/stdlib"
"golang.org/x/pkgsite/internal/version"
+ "golang.org/x/pkgsite/internal/vulns"
)
// VersionsDetails contains the hierarchy of version summary information used
@@ -81,10 +82,10 @@
RetractionRationale string
IsMinor bool
Symbols [][]*Symbol
- Vulns []Vuln
+ Vulns []vulns.Vuln
}
-func fetchVersionsDetails(ctx context.Context, ds internal.DataSource, um *internal.UnitMeta, getVulnEntries vulnEntriesFunc) (*VersionsDetails, error) {
+func fetchVersionsDetails(ctx context.Context, ds internal.DataSource, um *internal.UnitMeta, getVulnEntries vulns.VulnEntriesFunc) (*VersionsDetails, error) {
db, ok := ds.(*postgres.DB)
if !ok {
// The proxydatasource does not support the imported by page.
@@ -145,7 +146,7 @@
modInfos []*internal.ModuleInfo,
sh *internal.SymbolHistory,
linkify func(v *internal.ModuleInfo) string,
- getVulnEntries vulnEntriesFunc,
+ getVulnEntries vulns.VulnEntriesFunc,
) *VersionsDetails {
// lists organizes versions by VersionListKey.
lists := make(map[VersionListKey]*VersionList)
@@ -200,7 +201,7 @@
if mi.ModulePath == stdlib.ModulePath {
pkg = packagePath
}
- vs.Vulns = VulnsForPackage(ctx, mi.ModulePath, mi.Version, pkg, getVulnEntries)
+ vs.Vulns = vulns.VulnsForPackage(ctx, mi.ModulePath, mi.Version, pkg, getVulnEntries)
vl := lists[key]
if vl == nil {
seenLists = append(seenLists, key)
diff --git a/internal/frontend/versions_test.go b/internal/frontend/versions_test.go
index f82df0f..ffe83e4 100644
--- a/internal/frontend/versions_test.go
+++ b/internal/frontend/versions_test.go
@@ -14,6 +14,7 @@
"golang.org/x/pkgsite/internal/stdlib"
"golang.org/x/pkgsite/internal/testing/sample"
"golang.org/x/pkgsite/internal/version"
+ "golang.org/x/pkgsite/internal/vulns"
"golang.org/x/vuln/osv"
)
@@ -149,7 +150,7 @@
ThisModule: []*VersionList{
func() *VersionList {
vl := makeList(v1Path, modulePath1, "v1", []string{"v1.3.0", "v1.2.3", "v1.2.1"}, false)
- vl.Versions[2].Vulns = []Vuln{{
+ vl.Versions[2].Vulns = []vulns.Vuln{{
Details: vulnEntry.Details,
}}
return vl
diff --git a/internal/frontend/vulns.go b/internal/frontend/vulns.go
index 8549da0..57ea1bc 100644
--- a/internal/frontend/vulns.go
+++ b/internal/frontend/vulns.go
@@ -24,13 +24,6 @@
nistAdvisoryUrlPrefix = "https://nvd.nist.gov/vuln/detail/"
)
-// A Vuln contains information to display about a vulnerability.
-type Vuln = vulns.Vuln
-
-type vulnEntriesFunc = vulns.VulnEntriesFunc
-
-var VulnsForPackage = vulns.VulnsForPackage
-
// VulnListPage holds the information for a page that lists vuln entries.
type VulnListPage struct {
basePage
