From ef6eff47f9840ddb2c5e02a0b9df4161d954e3a4 Mon Sep 17 00:00:00 2001 From: Kieran Mann Date: Fri, 11 Sep 2026 09:15:10 -0700 Subject: [PATCH 1/2] lint: exclude revive var-naming instead of suppressing it per file Protobuf packages are named by the .proto, so revive's var-naming rule fires on every file that declares one, and fourteen files carried a //nolint:revive to silence it. copy.go in #24 had to grow one too, which is what prompted this. Upstream already solved it in config -- origin/master's exclude list is ours plus a var-naming entry -- and converted the remaining directives to //nolint:staticcheck, which is a newer staticcheck absorbing stylecheck's ST1003. Our pinned golangci-lint 1.55 keeps stylecheck separate and does not enable it, so nothing replaces the directives here. Removing them is not optional once the exclusion lands: nolintlint is enabled, and an unused directive is itself a lint failure. The set is the one upstream converted -- package clauses, _LOOP_CTL_GET_FREE, and IsSolve_Subject -- verified by running revive 1.3.2, the version 1.55 bundles, with var-naming alone. dockerfile_test.go keeps its directive: that one is context-as-argument, a different rule. Co-Authored-By: Claude Opus 5 --- .golangci.yml | 3 +++ api/services/control/generate.go | 2 +- api/services/registry/copy.go | 2 +- api/services/registry/generate.go | 2 +- api/services/registry/proxy_test.go | 2 +- api/services/registry/server.go | 2 +- api/types/generate.go | 2 +- frontend/gateway/pb/caps.go | 2 +- frontend/gateway/pb/exit.go | 2 +- frontend/gateway/pb/generate.go | 2 +- solver/errdefs/solve.go | 1 - sourcepolicy/pb/generate.go | 2 +- sourcepolicy/pb/json.go | 2 +- sourcepolicy/pb/json_test.go | 2 +- util/apicaps/pb/generate.go | 2 +- util/entitlements/security/security_linux.go | 2 +- 16 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 1eadd9508..905d5a3d0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -77,3 +77,6 @@ issues: - linters: - revive text: "if-return" + - linters: + - revive + text: "var-naming" diff --git a/api/services/control/generate.go b/api/services/control/generate.go index ea624c4e0..1c161155f 100644 --- a/api/services/control/generate.go +++ b/api/services/control/generate.go @@ -1,3 +1,3 @@ -package moby_buildkit_v1 //nolint:revive +package moby_buildkit_v1 //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. control.proto diff --git a/api/services/registry/copy.go b/api/services/registry/copy.go index d3f680d64..335a3003d 100644 --- a/api/services/registry/copy.go +++ b/api/services/registry/copy.go @@ -1,4 +1,4 @@ -package earthly_registry_v1 //nolint:revive +package earthly_registry_v1 import ( "context" diff --git a/api/services/registry/generate.go b/api/services/registry/generate.go index 9c329628b..b3ba00e2c 100644 --- a/api/services/registry/generate.go +++ b/api/services/registry/generate.go @@ -1,3 +1,3 @@ -package earthly_registry_v1 //nolint:revive +package earthly_registry_v1 //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. registry.proto diff --git a/api/services/registry/proxy_test.go b/api/services/registry/proxy_test.go index 2df1c7171..39de54a98 100644 --- a/api/services/registry/proxy_test.go +++ b/api/services/registry/proxy_test.go @@ -1,4 +1,4 @@ -package earthly_registry_v1 //nolint:revive +package earthly_registry_v1 import ( "bytes" diff --git a/api/services/registry/server.go b/api/services/registry/server.go index 09d54e23c..a350e46a7 100644 --- a/api/services/registry/server.go +++ b/api/services/registry/server.go @@ -1,4 +1,4 @@ -package earthly_registry_v1 //nolint:revive +package earthly_registry_v1 import ( "net" diff --git a/api/types/generate.go b/api/types/generate.go index 1689e7d7f..84007df1d 100644 --- a/api/types/generate.go +++ b/api/types/generate.go @@ -1,3 +1,3 @@ -package moby_buildkit_v1_types //nolint:revive +package moby_buildkit_v1_types //go:generate protoc -I=. -I=../../vendor/ -I=../../../../../ --gogo_out=plugins=grpc:. worker.proto diff --git a/frontend/gateway/pb/caps.go b/frontend/gateway/pb/caps.go index 14c6c71ab..dd52d7103 100644 --- a/frontend/gateway/pb/caps.go +++ b/frontend/gateway/pb/caps.go @@ -1,4 +1,4 @@ -package moby_buildkit_v1_frontend //nolint:revive +package moby_buildkit_v1_frontend import "github.com/moby/buildkit/util/apicaps" diff --git a/frontend/gateway/pb/exit.go b/frontend/gateway/pb/exit.go index d978bfa66..4db643b3d 100644 --- a/frontend/gateway/pb/exit.go +++ b/frontend/gateway/pb/exit.go @@ -1,4 +1,4 @@ -package moby_buildkit_v1_frontend //nolint:revive +package moby_buildkit_v1_frontend import ( "fmt" diff --git a/frontend/gateway/pb/generate.go b/frontend/gateway/pb/generate.go index 2e55abb1b..4ab07c6d4 100644 --- a/frontend/gateway/pb/generate.go +++ b/frontend/gateway/pb/generate.go @@ -1,3 +1,3 @@ -package moby_buildkit_v1_frontend //nolint:revive +package moby_buildkit_v1_frontend //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. gateway.proto diff --git a/solver/errdefs/solve.go b/solver/errdefs/solve.go index d7b9e7799..d6864bbd8 100644 --- a/solver/errdefs/solve.go +++ b/solver/errdefs/solve.go @@ -14,7 +14,6 @@ func init() { typeurl.Register((*Solve)(nil), "github.com/moby/buildkit", "errdefs.Solve+json") } -//nolint:revive type IsSolve_Subject isSolve_Subject // SolveError will be returned when an error is encountered during a solve that diff --git a/sourcepolicy/pb/generate.go b/sourcepolicy/pb/generate.go index 041c41b80..409d07a5d 100644 --- a/sourcepolicy/pb/generate.go +++ b/sourcepolicy/pb/generate.go @@ -1,3 +1,3 @@ -package moby_buildkit_v1_sourcepolicy //nolint:revive +package moby_buildkit_v1_sourcepolicy //go:generate protoc -I=. --gogofaster_out=plugins=grpc:. policy.proto diff --git a/sourcepolicy/pb/json.go b/sourcepolicy/pb/json.go index a9f84834e..28c4e69c7 100644 --- a/sourcepolicy/pb/json.go +++ b/sourcepolicy/pb/json.go @@ -1,4 +1,4 @@ -package moby_buildkit_v1_sourcepolicy //nolint:revive +package moby_buildkit_v1_sourcepolicy import ( "github.com/gogo/protobuf/proto" diff --git a/sourcepolicy/pb/json_test.go b/sourcepolicy/pb/json_test.go index a590763c3..57381c8a3 100644 --- a/sourcepolicy/pb/json_test.go +++ b/sourcepolicy/pb/json_test.go @@ -1,4 +1,4 @@ -package moby_buildkit_v1_sourcepolicy //nolint:revive +package moby_buildkit_v1_sourcepolicy import ( "encoding/json" diff --git a/util/apicaps/pb/generate.go b/util/apicaps/pb/generate.go index d2feccfd5..281dfabd6 100644 --- a/util/apicaps/pb/generate.go +++ b/util/apicaps/pb/generate.go @@ -1,3 +1,3 @@ -package moby_buildkit_v1_apicaps //nolint:revive +package moby_buildkit_v1_apicaps //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. caps.proto diff --git a/util/entitlements/security/security_linux.go b/util/entitlements/security/security_linux.go index d7f2e2ac6..6ff7b7784 100644 --- a/util/entitlements/security/security_linux.go +++ b/util/entitlements/security/security_linux.go @@ -114,7 +114,7 @@ func getFreeLoopID() (int, error) { } defer fd.Close() - const _LOOP_CTL_GET_FREE = 0x4C82 //nolint:revive + const _LOOP_CTL_GET_FREE = 0x4C82 r1, _, uerr := unix.Syscall(unix.SYS_IOCTL, fd.Fd(), _LOOP_CTL_GET_FREE, 0) if uerr == 0 { return int(r1), nil From eb610b96c7dce895eeef0aa157373117e9c7b265 Mon Sep 17 00:00:00 2001 From: Kieran Mann Date: Wed, 23 Sep 2026 08:33:09 -0700 Subject: [PATCH 2/2] lint: drop //nolint directives made unused by the var-naming exclude Co-Authored-By: Claude Opus 5.5 --- executor/resources/types/systypes.go | 1 - executor/resources/types/types.go | 1 - 2 files changed, 2 deletions(-) diff --git a/executor/resources/types/systypes.go b/executor/resources/types/systypes.go index 56db46945..878fa413b 100644 --- a/executor/resources/types/systypes.go +++ b/executor/resources/types/systypes.go @@ -57,7 +57,6 @@ type SysMemoryStat struct { } type SysSample struct { - //nolint Timestamp_ time.Time `json:"timestamp"` CPUStat *SysCPUStat `json:"cpuStat,omitempty"` ProcStat *ProcStat `json:"procStat,omitempty"` diff --git a/executor/resources/types/types.go b/executor/resources/types/types.go index 9bac557e2..dc80ba10e 100644 --- a/executor/resources/types/types.go +++ b/executor/resources/types/types.go @@ -22,7 +22,6 @@ type Samples struct { // Sample represents a wrapper for sampled data of cgroupv2 controllers type Sample struct { - //nolint Timestamp_ time.Time `json:"timestamp"` CPUStat *CPUStat `json:"cpuStat,omitempty"` MemoryStat *MemoryStat `json:"memoryStat,omitempty"`