internal/worker: remove all references to static
Otherwise, building and deploying will fail.
This requires removing the index page, which anyhow servers little
purpose now that we removed vulncheck results. We can revert this as
needed.
Change-Id: Ie28ee0e6bffc18f88e1fc138ef1aa980634d2148
Reviewed-on: https://go-review.googlesource.com/c/pkgsite-metrics/+/474595
Run-TryBot: Zvonimir Pavlinovic <zpavlinovic@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/cmd/worker/Dockerfile b/cmd/worker/Dockerfile
index 2369366..41de2b1 100644
--- a/cmd/worker/Dockerfile
+++ b/cmd/worker/Dockerfile
@@ -82,8 +82,6 @@
WORKDIR /app
-COPY static static
-
ARG DOCKER_IMAGE
ENV DOCKER_IMAGE=$DOCKER_IMAGE
diff --git a/internal/worker/index.go b/internal/worker/index.go
deleted file mode 100644
index a8cc2e6..0000000
--- a/internal/worker/index.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package worker
-
-import (
- "net/http"
-
- "golang.org/x/pkgsite-metrics/internal/derrors"
-)
-
-type IndexPage struct {
- basePage
-}
-
-func (s *Server) handleIndexPage(w http.ResponseWriter, r *http.Request) error {
- if r.URL.Path != "/" {
- return derrors.NotFound
- }
- tmpl, err := s.maybeLoadTemplate(indexTemplate)
- if err != nil {
- return err
- }
- return renderPage(r.Context(), w, s.createIndexPage(), tmpl)
-}
-
-func (s *Server) createIndexPage() *IndexPage {
- return &IndexPage{
- basePage: newBasePage(),
- }
-}
diff --git a/internal/worker/server.go b/internal/worker/server.go
index e3b8c92..f5691c4 100644
--- a/internal/worker/server.go
+++ b/internal/worker/server.go
@@ -11,7 +11,6 @@
"fmt"
"net/http"
"os"
- "path/filepath"
"strings"
"sync"
"time"
@@ -36,7 +35,6 @@
vulndbClient vulnc.Client
proxyClient *proxy.Client
queue queue.Queue
- staticPath template.TrustedSource
devMode bool
mu sync.Mutex
@@ -94,10 +92,6 @@
queue: q,
proxyClient: proxyClient,
devMode: cfg.DevMode,
- staticPath: cfg.StaticPath,
- }
- if err := s.loadTemplates(); err != nil {
- return nil, err
}
if cfg.ProjectID != "" && cfg.ServiceID != "" {
@@ -120,14 +114,6 @@
derrors.SetReportingClient(reportingClient)
}
- http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(s.staticPath.String()))))
-
- s.handle("/favicon.ico", func(w http.ResponseWriter, r *http.Request) error {
- http.ServeFile(w, r, filepath.Join(s.staticPath.String(), "favicon.ico"))
- return nil
- })
- s.handle("/", s.handleIndexPage)
-
if err := s.registerVulncheckHandlers(ctx); err != nil {
return nil, err
}
diff --git a/internal/worker/templates.go b/internal/worker/templates.go
deleted file mode 100644
index 71d62d1..0000000
--- a/internal/worker/templates.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package worker
-
-import (
- "bytes"
- "context"
- "fmt"
- "io"
- "net/http"
- "strings"
-
- "github.com/google/safehtml/template"
- "golang.org/x/pkgsite-metrics/internal/derrors"
- "golang.org/x/pkgsite-metrics/internal/log"
-)
-
-const (
- indexTemplate = "index.tmpl"
- vulncheckTemplate = "vulncheck.tmpl"
-)
-
-type basePage struct {
-}
-
-func newBasePage() basePage {
- return basePage{}
-}
-
-func (s *Server) loadTemplates() error {
- index, err := s.parseTemplate(template.TrustedSourceFromConstant(indexTemplate))
- if err != nil {
- return err
- }
- vulncheck, err := s.parseTemplate(template.TrustedSourceFromConstant(vulncheckTemplate))
- if err != nil {
- return err
- }
- s.templates = map[string]*template.Template{
- indexTemplate: index,
- vulncheckTemplate: vulncheck,
- }
- return nil
-}
-
-func (s *Server) maybeLoadTemplate(tmplName string) (*template.Template, error) {
- if s.devMode {
- s.mu.Lock()
- defer s.mu.Unlock()
- var err error
- if err = s.loadTemplates(); err != nil {
- return nil, fmt.Errorf("error parsing templates: %v", err)
- }
- }
- return s.templates[tmplName], nil
-}
-
-// Parse the template for the status page.
-func (s *Server) parseTemplate(filename template.TrustedSource) (*template.Template, error) {
- templatePath := template.TrustedSourceJoin(s.staticPath, filename)
- return template.New(filename.String()).Funcs(template.FuncMap{
- "timefmt": FormatTime,
- "commasep": func(s []string) string { return strings.Join(s, ", ") },
- "round": func(n float64) string { return fmt.Sprintf("%.2f", n) },
- }).ParseFilesFromTrustedSources(templatePath)
-}
-
-func renderPage(ctx context.Context, w http.ResponseWriter, page interface{}, tmpl *template.Template) (err error) {
- defer derrors.Wrap(&err, "renderPage")
- var buf bytes.Buffer
- if err := tmpl.Execute(&buf, page); err != nil {
- return err
- }
- if _, err := io.Copy(w, &buf); err != nil {
- log.Infof(ctx, "Error copying buffer to ResponseWriter: %v", err)
- return err
- }
- return nil
-}
diff --git a/internal/worker/vulncheck_scan.go b/internal/worker/vulncheck_scan.go
index 8ef2925..9040466 100644
--- a/internal/worker/vulncheck_scan.go
+++ b/internal/worker/vulncheck_scan.go
@@ -222,7 +222,6 @@
err = fmt.Errorf("%v: %w", err, derrors.ScanModuleVulncheckError)
}
- fmt.Printf("ZP: %v\n", derrors.CategorizeError(err))
row.AddError(err)
log.Infof(ctx, "scanner.runScanModule return error for %s (%v)", sreq.Path(), err)
} else {
