internal: remove vulns experiment
Change-Id: I17561f6ecf2d5aaaa18b6ea50dacfe3397ff091b
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/401616
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
diff --git a/internal/experiment.go b/internal/experiment.go
index 256bc9c..15e2369 100644
--- a/internal/experiment.go
+++ b/internal/experiment.go
@@ -9,7 +9,6 @@
ExperimentEnableStdFrontendFetch = "enable-std-frontend-fetch"
ExperimentNewUnitLayout = "new-unit-layout"
ExperimentStyleGuide = "styleguide"
- ExperimentVulns = "vulns"
)
// Experiments represents all of the active experiments in the codebase and
@@ -18,7 +17,6 @@
ExperimentEnableStdFrontendFetch: "Enable frontend fetching for module std.",
ExperimentNewUnitLayout: "Enable the new layout on the unit page.",
ExperimentStyleGuide: "Enable the styleguide.",
- ExperimentVulns: "Enable vulnerability reporting.",
}
// Experiment holds data associated with an experimental feature for frontend
diff --git a/internal/frontend/search.go b/internal/frontend/search.go
index 5e6aeee..4578791 100644
--- a/internal/frontend/search.go
+++ b/internal/frontend/search.go
@@ -22,7 +22,6 @@
"golang.org/x/mod/semver"
"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"
"golang.org/x/pkgsite/internal/postgres"
@@ -227,7 +226,7 @@
results = append(results, sr)
}
- if getVulnEntries != nil && experiment.IsActive(ctx, internal.ExperimentVulns) {
+ if getVulnEntries != nil {
addVulns(results, getVulnEntries)
}
diff --git a/internal/frontend/search_test.go b/internal/frontend/search_test.go
index 3552118..c675fcb 100644
--- a/internal/frontend/search_test.go
+++ b/internal/frontend/search_test.go
@@ -14,7 +14,6 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"golang.org/x/pkgsite/internal"
- "golang.org/x/pkgsite/internal/experiment"
"golang.org/x/pkgsite/internal/licenses"
"golang.org/x/pkgsite/internal/postgres"
"golang.org/x/pkgsite/internal/testing/sample"
@@ -69,8 +68,6 @@
defer cancel()
defer postgres.ResetTestDB(testDB, t)
- ctx = experiment.NewContext(ctx, internal.ExperimentVulns)
-
var (
now = sample.NowTruncated()
moduleFoo = &internal.Module{
diff --git a/internal/frontend/unit.go b/internal/frontend/unit.go
index f916467..9a6d8a2 100644
--- a/internal/frontend/unit.go
+++ b/internal/frontend/unit.go
@@ -17,7 +17,6 @@
"golang.org/x/pkgsite/internal"
"golang.org/x/pkgsite/internal/cookie"
"golang.org/x/pkgsite/internal/derrors"
- "golang.org/x/pkgsite/internal/experiment"
"golang.org/x/pkgsite/internal/log"
"golang.org/x/pkgsite/internal/middleware"
"golang.org/x/pkgsite/internal/stdlib"
@@ -220,7 +219,7 @@
}
// Get vulnerability information.
- if s.vulnClient != nil && experiment.IsActive(ctx, internal.ExperimentVulns) {
+ if s.vulnClient != nil {
page.Vulns = VulnsForPackage(um.ModulePath, um.Version, um.Path, s.vulnClient.GetByModule)
}
s.servePage(ctx, w, tabSettings.TemplateName, page)
diff --git a/internal/frontend/versions.go b/internal/frontend/versions.go
index 28c4fe0..73b0b3e 100644
--- a/internal/frontend/versions.go
+++ b/internal/frontend/versions.go
@@ -14,7 +14,6 @@
"golang.org/x/mod/semver"
"golang.org/x/pkgsite/internal"
- "golang.org/x/pkgsite/internal/experiment"
"golang.org/x/pkgsite/internal/log"
"golang.org/x/pkgsite/internal/postgres"
"golang.org/x/pkgsite/internal/stdlib"
@@ -196,9 +195,7 @@
if sv := sh.SymbolsAtVersion(mi.Version); sv != nil {
vs.Symbols = symbolsForVersion(linkify(mi), sv)
}
- if experiment.IsActive(ctx, internal.ExperimentVulns) {
- vs.Vulns = VulnsForPackage(mi.ModulePath, mi.Version, "", getVulnEntries)
- }
+ vs.Vulns = VulnsForPackage(mi.ModulePath, mi.Version, "", 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 8e4810a..858a13f 100644
--- a/internal/frontend/versions_test.go
+++ b/internal/frontend/versions_test.go
@@ -10,7 +10,6 @@
"github.com/google/go-cmp/cmp"
"golang.org/x/pkgsite/internal"
- "golang.org/x/pkgsite/internal/experiment"
"golang.org/x/pkgsite/internal/postgres"
"golang.org/x/pkgsite/internal/stdlib"
"golang.org/x/pkgsite/internal/testing/sample"
@@ -188,7 +187,6 @@
t.Run(tc.name, func(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), testTimeout*2)
defer cancel()
- ctx = experiment.NewContext(ctx, internal.ExperimentVulns)
defer postgres.ResetTestDB(testDB, t)
for _, v := range tc.modules {
diff --git a/internal/frontend/vulns.go b/internal/frontend/vulns.go
index 89368f7..ef2e239 100644
--- a/internal/frontend/vulns.go
+++ b/internal/frontend/vulns.go
@@ -12,7 +12,6 @@
"golang.org/x/mod/semver"
"golang.org/x/pkgsite/internal"
"golang.org/x/pkgsite/internal/derrors"
- "golang.org/x/pkgsite/internal/experiment"
"golang.org/x/sync/errgroup"
vulnc "golang.org/x/vuln/client"
"golang.org/x/vuln/osv"
@@ -46,6 +45,9 @@
func vulnsForPackage(modulePath, version, packagePath string, getVulnEntries vulnEntriesFunc) (_ []Vuln, err error) {
defer derrors.Wrap(&err, "vulns(%q, %q, %q)", modulePath, version, packagePath)
+ if getVulnEntries == nil {
+ return nil, nil
+ }
// Get all the vulns for this module.
entries, err := getVulnEntries(modulePath)
if err != nil {
@@ -104,9 +106,6 @@
}
func (s *Server) serveVuln(w http.ResponseWriter, r *http.Request, _ internal.DataSource) error {
- if !experiment.IsActive(r.Context(), internal.ExperimentVulns) {
- return &serverError{status: http.StatusNotFound}
- }
switch r.URL.Path {
case "/", "/list":
// Serve a list of all entries.
