cmd/vulncheck_sandbox,internal/worker: rename vulncheck files
This also requires changes to references to the sandbox.
This is first in the series of CLs that change the use word "vulncheck"
with "govulncheck".
Change-Id: I0832f345e8bed05a095f0611b0f93513469d84ee
Reviewed-on: https://go-review.googlesource.com/c/pkgsite-metrics/+/476057
Reviewed-by: Jonathan Amsterdam <jba@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Zvonimir Pavlinovic <zpavlinovic@google.com>
diff --git a/Makefile b/Makefile
index a404d73..2bf4db5 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@
# This target is a local file that marks the time of the last
# docker build. We use a file because make uses only local file timestamps to determine
# whether a target needs to be regenerated.
-docker-build: go-image.tar.gz go-vulndb cmd/worker/*.go internal/**/*.go cmd/vulncheck_sandbox/* config.json cmd/worker/Dockerfile
+docker-build: go-image.tar.gz go-vulndb cmd/worker/*.go internal/**/*.go cmd/govulncheck_sandbox/* config.json cmd/worker/Dockerfile
docker build -f cmd/worker/Dockerfile -t $(IMAGE) . \
--build-arg DOCKER_IMAGE=$(IMAGE) \
--build-arg BQ_DATASET=disable
@@ -111,6 +111,6 @@
rm -f go-image.tar.gz
rm -rf go-vulndb
rm -f config.json
- rm -f vulncheck_sandbox
+ rm -f govulncheck_sandbox
.PHONY: docker-run docker-run-bg test vulncheck-test analysis-test clean
diff --git a/cmd/vulncheck_sandbox/vulncheck_sandbox.go b/cmd/govulncheck_sandbox/govulncheck_sandbox.go
similarity index 100%
rename from cmd/vulncheck_sandbox/vulncheck_sandbox.go
rename to cmd/govulncheck_sandbox/govulncheck_sandbox.go
diff --git a/cmd/vulncheck_sandbox/vulncheck_sandbox_test.go b/cmd/govulncheck_sandbox/govulncheck_sandbox_test.go
similarity index 100%
rename from cmd/vulncheck_sandbox/vulncheck_sandbox_test.go
rename to cmd/govulncheck_sandbox/govulncheck_sandbox_test.go
diff --git a/cmd/vulncheck_sandbox/testdata/module/go.mod b/cmd/govulncheck_sandbox/testdata/module/go.mod
similarity index 100%
rename from cmd/vulncheck_sandbox/testdata/module/go.mod
rename to cmd/govulncheck_sandbox/testdata/module/go.mod
diff --git a/cmd/vulncheck_sandbox/testdata/module/go.sum b/cmd/govulncheck_sandbox/testdata/module/go.sum
similarity index 100%
rename from cmd/vulncheck_sandbox/testdata/module/go.sum
rename to cmd/govulncheck_sandbox/testdata/module/go.sum
diff --git a/cmd/vulncheck_sandbox/testdata/module/vuln.go b/cmd/govulncheck_sandbox/testdata/module/vuln.go
similarity index 100%
rename from cmd/vulncheck_sandbox/testdata/module/vuln.go
rename to cmd/govulncheck_sandbox/testdata/module/vuln.go
diff --git a/cmd/vulncheck_sandbox/testdata/vulndb/golang.org/x/text.json b/cmd/govulncheck_sandbox/testdata/vulndb/golang.org/x/text.json
similarity index 100%
rename from cmd/vulncheck_sandbox/testdata/vulndb/golang.org/x/text.json
rename to cmd/govulncheck_sandbox/testdata/vulndb/golang.org/x/text.json
diff --git a/cmd/vulncheck_sandbox/testdata/vulndb/index.json b/cmd/govulncheck_sandbox/testdata/vulndb/index.json
similarity index 100%
rename from cmd/vulncheck_sandbox/testdata/vulndb/index.json
rename to cmd/govulncheck_sandbox/testdata/vulndb/index.json
diff --git a/cmd/vulncheck_sandbox/testdata/vulndb/stdlib.json b/cmd/govulncheck_sandbox/testdata/vulndb/stdlib.json
similarity index 100%
rename from cmd/vulncheck_sandbox/testdata/vulndb/stdlib.json
rename to cmd/govulncheck_sandbox/testdata/vulndb/stdlib.json
diff --git a/cmd/worker/Dockerfile b/cmd/worker/Dockerfile
index d2fcff1..98ff116 100644
--- a/cmd/worker/Dockerfile
+++ b/cmd/worker/Dockerfile
@@ -81,9 +81,9 @@
# Install the latest version of govulncheck in the binaries directory.
RUN GOBIN=/tmp/binaries go install golang.org/x/vuln/cmd/govulncheck@latest
-# Build the program that runs vulncheck inside the sandbox and install it in the sandbox's
+# Build the program that runs govulncheck inside the sandbox and install it in the sandbox's
# binaries directory.
-RUN go build -mod=readonly -o /tmp/binaries/vulncheck_sandbox ./cmd/vulncheck_sandbox
+RUN go build -mod=readonly -o /tmp/binaries/govulncheck_sandbox ./cmd/govulncheck_sandbox
# Build the sandbox runner program and put it in the bundle root.
RUN go build -mod=readonly -o /bundle/rootfs/runner ./internal/sandbox/runner.go
diff --git a/internal/worker/vulncheck.go b/internal/worker/govulncheck.go
similarity index 100%
rename from internal/worker/vulncheck.go
rename to internal/worker/govulncheck.go
diff --git a/internal/worker/vulncheck_enqueue.go b/internal/worker/govulncheck_enqueue.go
similarity index 100%
rename from internal/worker/vulncheck_enqueue.go
rename to internal/worker/govulncheck_enqueue.go
diff --git a/internal/worker/vulncheck_enqueue_test.go b/internal/worker/govulncheck_enqueue_test.go
similarity index 100%
rename from internal/worker/vulncheck_enqueue_test.go
rename to internal/worker/govulncheck_enqueue_test.go
diff --git a/internal/worker/vulncheck_results.go b/internal/worker/govulncheck_results.go
similarity index 100%
rename from internal/worker/vulncheck_results.go
rename to internal/worker/govulncheck_results.go
diff --git a/internal/worker/vulncheck_scan.go b/internal/worker/govulncheck_scan.go
similarity index 98%
rename from internal/worker/vulncheck_scan.go
rename to internal/worker/govulncheck_scan.go
index d543f9d..92d1f29 100644
--- a/internal/worker/vulncheck_scan.go
+++ b/internal/worker/govulncheck_scan.go
@@ -331,7 +331,7 @@
log.Infof(ctx, "running govulncheck in sandbox: %s@%s", modulePath, version)
smdir := strings.TrimPrefix(mdir, sandboxRoot)
- stdout, err := s.sbox.Command(binaryDir+"/vulncheck_sandbox", govulncheckPath, ModeGovulncheck, smdir).Output()
+ stdout, err := s.sbox.Command(binaryDir+"/govulncheck_sandbox", govulncheckPath, ModeGovulncheck, smdir).Output()
log.Infof(ctx, "done with govulncheck in sandbox: %s@%s err=%v", modulePath, version, err)
if err != nil {
@@ -375,7 +375,7 @@
}
log.Infof(ctx, "running vulncheck in sandbox on %s: %s@%s/%s", modulePath, version, binDir, destf.Name())
- stdout, err := s.sbox.Command(binaryDir+"/vulncheck_sandbox", govulncheckPath, ModeBinary, destf.Name()).Output()
+ stdout, err := s.sbox.Command(binaryDir+"/govulncheck_sandbox", govulncheckPath, ModeBinary, destf.Name()).Output()
log.Infof(ctx, "done with vulncheck in sandbox on %s: %s@%s/%s err=%v", modulePath, version, binDir, destf.Name(), err)
if err != nil {
diff --git a/internal/worker/vulncheck_scan_test.go b/internal/worker/govulncheck_scan_test.go
similarity index 100%
rename from internal/worker/vulncheck_scan_test.go
rename to internal/worker/govulncheck_scan_test.go
