replace cilium/customvet by cilium/linters

The cilium/customvet repository is now archived and replaced by cilium/linters. Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
cilium · Jul 12, 2023 · 41c4174 · 41c4174
1 parent 9691dad
commit 41c4174
Show file tree

Hide file tree

Showing 17 changed files with 187 additions and 82 deletions.
diff --git a/contrib/scripts/custom-vet-check.sh b/contrib/scripts/custom-vet-check.sh
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Authors of Cilium
 
-# "customvet" is a custom go vet tool that can be found at
-# https://github.com/cilium/customvet
-# It performs custom static analysis checks checks for the
-# cilium repository.
-"$GO" run github.com/cilium/customvet -timeafter.ignore inctimer -readall.ignore safeio ./...
+# Cilium implements custom linters that can be found at
+# https://github.com/cilium/linters
+# They performs custom static analysis checks.
+"$GO" run github.com/cilium/linters -timeafter.ignore inctimer -readall.ignore safeio ./...
diff --git a/go.mod b/go.mod
@@ -18,10 +18,10 @@ require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/cilium/checkmate v1.0.3
 	github.com/cilium/coverbee v0.3.2
-	github.com/cilium/customvet v0.0.0-20221207181232-aa8731fa2d27
 	github.com/cilium/deepequal-gen v0.0.0-20230330134849-754271daeec2
 	github.com/cilium/ebpf v0.11.0
 	github.com/cilium/fake v0.4.0
+	github.com/cilium/linters v0.0.0-20230711081823-012f25fa2197
 	github.com/cilium/lumberjack/v2 v2.3.0
 	github.com/cilium/proxy v0.0.0-20230623092907-8fddead4e52c
 	github.com/cilium/workerpool v1.2.0

diff --git a/go.sum b/go.sum
diff --git a/pkg/inctimer/inctimer.go b/pkg/inctimer/inctimer.go
@@ -73,10 +73,8 @@ func (it *incTimer) After(d time.Duration) <-chan time.Time {
 	return it.t.C
 }
 
-// After wraps the time.After function to get
-// around the customvet warning for cases
-// where it is inconvenient to use the instantiated
-// version.
+// After wraps the time.After function to get around the /timeafter linter
+// warning for cases where it is inconvenient to use the instantiated version.
 func After(d time.Duration) <-chan time.Time {
 	return time.After(d)
 }
diff --git a/tools/tools.go b/tools/tools.go
@@ -6,8 +6,8 @@
 package tools
 
 import (
-	_ "github.com/cilium/customvet"
 	_ "github.com/cilium/deepequal-gen"
+	_ "github.com/cilium/linters"
 	_ "github.com/gogo/protobuf/gogoproto" // Used for protobuf generation of pkg/k8s/types/slim/k8s
 	_ "golang.org/x/tools/cmd/goimports"
 	_ "k8s.io/code-generator"

diff --git a/vendor/github.com/cilium/customvet/README.md b/vendor/github.com/cilium/customvet/README.md
diff --git a/vendor/github.com/cilium/customvet/main.go b/vendor/github.com/cilium/customvet/main.go
diff --git a/...or/github.com/cilium/customvet/.gitignore → vendor/github.com/cilium/linters/.gitignore b/...or/github.com/cilium/customvet/.gitignore → vendor/github.com/cilium/linters/.gitignore
diff --git a/vendor/github.com/cilium/linters/.golangci.yml b/vendor/github.com/cilium/linters/.golangci.yml
diff --git a/vendor/github.com/cilium/customvet/LICENSE → vendor/github.com/cilium/linters/LICENSE b/vendor/github.com/cilium/customvet/LICENSE → vendor/github.com/cilium/linters/LICENSE
diff --git a/vendor/github.com/cilium/linters/README.md b/vendor/github.com/cilium/linters/README.md
diff --git a/vendor/github.com/cilium/linters/ioreadall/doc.go b/vendor/github.com/cilium/linters/ioreadall/doc.go
diff --git a/...ustomvet/analysis/ioreadall/io_readall.go → ...om/cilium/linters/ioreadall/io_readall.go b/...ustomvet/analysis/ioreadall/io_readall.go → ...om/cilium/linters/ioreadall/io_readall.go
diff --git a/vendor/github.com/cilium/linters/main.go b/vendor/github.com/cilium/linters/main.go
diff --git a/vendor/github.com/cilium/linters/timeafter/doc.go b/vendor/github.com/cilium/linters/timeafter/doc.go
diff --git a/...ustomvet/analysis/timeafter/time_after.go → ...om/cilium/linters/timeafter/time_after.go b/...ustomvet/analysis/timeafter/time_after.go → ...om/cilium/linters/timeafter/time_after.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -178,11 +178,6 @@ github.com/cilium/checkmate
 github.com/cilium/coverbee
 github.com/cilium/coverbee/pkg/cparser
 github.com/cilium/coverbee/pkg/verifierlog
-# github.com/cilium/customvet v0.0.0-20221207181232-aa8731fa2d27
-## explicit; go 1.19
-github.com/cilium/customvet
-github.com/cilium/customvet/analysis/ioreadall
-github.com/cilium/customvet/analysis/timeafter
 # github.com/cilium/deepequal-gen v0.0.0-20230330134849-754271daeec2
 ## explicit; go 1.20
 github.com/cilium/deepequal-gen
@@ -205,6 +200,11 @@ github.com/cilium/ebpf/rlimit
 # github.com/cilium/fake v0.4.0
 ## explicit; go 1.19
 github.com/cilium/fake
+# github.com/cilium/linters v0.0.0-20230711081823-012f25fa2197
+## explicit; go 1.19
+github.com/cilium/linters
+github.com/cilium/linters/ioreadall
+github.com/cilium/linters/timeafter
 # github.com/cilium/lumberjack/v2 v2.3.0
 ## explicit; go 1.13
 github.com/cilium/lumberjack/v2