all: use golang.org/x/vuln/vulncheck
Package has moved from golang.org/x/exp/vulncheck.
Update to new location.
Change-Id: If5c57ab6664b186fed42492561497f1daab89667
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/406156
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Damien Neil <dneil@google.com>
Reviewed-by: Julie Qiu <julieqiu@google.com>
Run-TryBot: Damien Neil <dneil@google.com>
diff --git a/cmd/vulnreport/exported_functions.go b/cmd/vulnreport/exported_functions.go
index f98c81f..7c335c9 100644
--- a/cmd/vulnreport/exported_functions.go
+++ b/cmd/vulnreport/exported_functions.go
@@ -11,10 +11,10 @@
"os"
"strings"
- "golang.org/x/exp/vulncheck"
"golang.org/x/tools/go/packages"
vdbclient "golang.org/x/vuln/client"
"golang.org/x/vuln/osv"
+ "golang.org/x/vuln/vulncheck"
"golang.org/x/vulndb/internal/database"
"golang.org/x/vulndb/internal/derrors"
"golang.org/x/vulndb/internal/report"
diff --git a/go.mod b/go.mod
index 942fc3a..1450015 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.18
require (
- golang.org/x/vuln v0.0.0-20211221130724-9d39a965865f
+ golang.org/x/vuln v0.0.0-20220504230052-b2400d8d07c8
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
)
@@ -26,13 +26,12 @@
go.opentelemetry.io/otel/metric v0.27.0
go.opentelemetry.io/otel/sdk v1.4.0
golang.org/x/exp/event v0.0.0-20220218215828-6cf2b201936e
- golang.org/x/exp/vulncheck v0.0.0-20220128181451-c853b6ddb95e
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
- golang.org/x/tools v0.1.11-0.20220502155856-c39ac6a12f3f
+ golang.org/x/tools v0.1.11-0.20220504204054-4911e4af7dc7
google.golang.org/api v0.70.0
google.golang.org/grpc v1.44.0
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
diff --git a/go.sum b/go.sum
index 44790f0..2526759 100644
--- a/go.sum
+++ b/go.sum
@@ -357,8 +357,6 @@
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp/event v0.0.0-20220218215828-6cf2b201936e h1:K2AuHMC+jaRTzAcivRwKOzjTZ1925Yx4xHMg07YoBQc=
golang.org/x/exp/event v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AVlZHjhWbW/3yOcmKMtJiObwBPJajBlUpQXRijFNrNc=
-golang.org/x/exp/vulncheck v0.0.0-20220128181451-c853b6ddb95e h1:kj6CqhF72LIC164lWwXBHe9VQotnq8aeSGAt8sMzjIQ=
-golang.org/x/exp/vulncheck v0.0.0-20220128181451-c853b6ddb95e/go.mod h1:HF28XewMFGXG3D7EgmemgILbLRiYH0qjmXOQM5HuF+g=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -591,10 +589,10 @@
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/tools v0.1.11-0.20220502155856-c39ac6a12f3f h1:XzDrzSCkoVLlp82ClKiXaSmY27l43ubTa+XVawAylkk=
-golang.org/x/tools v0.1.11-0.20220502155856-c39ac6a12f3f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
-golang.org/x/vuln v0.0.0-20211221130724-9d39a965865f h1:ItHAoc29v2tEtSkL2oGCsO0s1TrbNAZW5108AFJ3FSY=
-golang.org/x/vuln v0.0.0-20211221130724-9d39a965865f/go.mod h1:YzHo/6uxZoZ2fGerGwR/VABIRuNZ3yHsHX8KGvlHnzM=
+golang.org/x/tools v0.1.11-0.20220504204054-4911e4af7dc7 h1:QA4ZyquqBP74mma6x4nQD4mSgYyTlie6xsnHTNOrOTI=
+golang.org/x/tools v0.1.11-0.20220504204054-4911e4af7dc7/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
+golang.org/x/vuln v0.0.0-20220504230052-b2400d8d07c8 h1:ktGzfLSmromqTs5OnNke8ZkhPYxp+FBZl1OwYHAI0Ks=
+golang.org/x/vuln v0.0.0-20220504230052-b2400d8d07c8/go.mod h1:d4bTbXdZXwwxS/kocyDYvMPrnheQY7jl7nGUkXyWsH8=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/worker/scan_modules.go b/internal/worker/scan_modules.go
index bcf4a7c..a8337ba 100644
--- a/internal/worker/scan_modules.go
+++ b/internal/worker/scan_modules.go
@@ -17,9 +17,9 @@
"time"
"cloud.google.com/go/storage"
- "golang.org/x/exp/vulncheck"
"golang.org/x/tools/go/packages"
vulnc "golang.org/x/vuln/client"
+ "golang.org/x/vuln/vulncheck"
"golang.org/x/vulndb/internal/derrors"
"golang.org/x/vulndb/internal/worker/log"
"golang.org/x/vulndb/internal/worker/store"
