Skip to content

Upgrade golangci-lint to v2 #3330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
- name: Verify generated files
run: make install-tools generate check-generated
- name: Run golangci-lint
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
uses: golangci/golangci-lint-action@dec74fa03096ff515422f71d18d41307cacde373 # v7.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with:
version: v1.64.2
args: --verbose --timeout=10m
version: v2.0.1
args: --verbose
- name: Run yamllint
run: yamllint .
- name: Install shellcheck
Expand Down
288 changes: 123 additions & 165 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,189 +1,147 @@
# Copyright The containerd Authors.

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# -----------------------------------------------------------------------------
# From https://github.com/containerd/nerdctl/blob/v0.12.1/.golangci.yml
# -----------------------------------------------------------------------------
---
# golangci-lint configuration file.
# https://golangci-lint.run/usage/configuration/
version: "2"
run:
concurrency: 6
timeout: 2m # to avoid timeout locally
linters:
disable-all: true
default: none
enable:
- depguard
- gofmt
- goimports
- govet
- ineffassign
- misspell
- nakedret
# - prealloc
- typecheck
# - asciicheck
- bodyclose
- copyloopvar
# - dogsled
# - dupl
- depguard
- dupword
- errcheck
- errorlint
# - exhaustive
# - exportloopref
# - funlen
- forbidigo
# - gci
# - gochecknoglobals
# - gochecknoinits
# - gocognit
# - goconst
- gocritic
# - gocyclo
- godot
# - godox
- gofumpt
# - goheader
# - gomodguard
# - goprintffuncname
# - gosec
- gosimple
# - lll
# - nestif
# - nlreturn
- govet
- ineffassign
- misspell
- nakedret
- noctx
- nolintlint
- perfsprint
# - rowserrcheck
# - sqlclosecheck
- staticcheck
# - stylecheck
# - testpackage
# - tparallel
- revive
# - unconvert
# - unparam
- staticcheck
- unused
- whitespace
# - wrapcheck
# - wsl
linters-settings:
depguard:
settings:
depguard:
rules:
main:
deny:
- pkg: golang.org/x/net/context
desc: use the 'context' package from the standard library
- pkg: math/rand$
desc: use the 'math/rand/v2' package
errorlint:
asserts: false
forbidigo:
forbid:
- pattern: ^print(ln)?$
msg: Do not use builtin print functions. It's for bootstrapping only and may be removed in the future.
- pattern: ^fmt\.Print.*$
msg: Do not use fmt.Print statements.
- pattern: ^testing.T.Fatal.*$
msg: Use assert functions from the gotest.tools/v3/assert package instead.
analyze-types: true
gocritic:
disabled-checks:
- appendCombine
- sloppyReassign
- unlabelStmt
- rangeValCopy
- hugeParam
- importShadow
- sprintfQuotedString
- builtinShadow
- filepathJoin
# See "Tags" section in https://github.com/go-critic/go-critic#usage
enabled-tags:
- diagnostic
- performance
- style
- opinionated
- experimental
settings:
ifElseChain:
# Min number of if-else blocks that makes the warning trigger.
minThreshold: 3
perfsprint:
int-conversion: false
err-error: false
errorf: true
sprintf1: false
strconcat: false
revive:
# Set below 0.8 to enable error-strings
confidence: 0.6
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
rules:
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: deep-exit
- name: dot-imports
arguments:
- allowedPackages:
- github.com/lima-vm/lima/pkg/must
- name: empty-block
- name: error-naming
- name: error-return
- name: error-strings
- name: errorf
- name: exported
disabled: true
- name: increment-decrement
- name: indent-error-flow
- name: package-comments
disabled: true
- name: range
- name: receiver-naming
- name: redefines-builtin-id
- name: superfluous-else
- name: time-naming
- name: unexported-return
- name: unreachable-code
- name: unused-parameter
- name: use-any
- name: var-declaration
- name: var-naming
staticcheck:
# https://staticcheck.dev/docs/configuration/options/#checks
checks:
- all
- -QF*
- -SA3000 # false positive for Go 1.15+. See https://github.com/golang/go/issues/34129
- -ST1000
- -ST1001 # duplicates revive.dot-imports
- -ST1022
exclusions:
presets:
- common-false-positives
- legacy
- std-error-handling
rules:
main:
deny:
- pkg: "golang.org/x/net/context"
desc: "use the 'context' package from the standard library"
- pkg: "math/rand$"
desc: "use the 'math/rand/v2' package"
forbidigo:
analyze-types: true
forbid:
- p: ^print(ln)?$
msg: Do not use builtin print functions. It's for bootstrapping only and may be removed in the future.
- p: ^fmt\.Print.*$
msg: Do not use fmt.Print statements.
- p: ^testing.T.Fatal.*$
msg: Use assert functions from the gotest.tools/v3/assert package instead.
gocritic:
# See "Tags" section in https://github.com/go-critic/go-critic#usage
enabled-tags:
- diagnostic
- performance
- style
- opinionated
- experimental
disabled-checks:
- appendCombine
- sloppyReassign
- unlabelStmt
- rangeValCopy
- hugeParam
- importShadow
- sprintfQuotedString
- builtinShadow
- filepathJoin
settings:
ifElseChain:
# Min number of if-else blocks that makes the warning trigger.
minThreshold: 3
errorlint:
asserts: false
perfsprint:
int-conversion: false
err-error: false
errorf: true
sprintf1: false
strconcat: false
revive:
# Set below 0.8 to enable error-strings
confidence: 0.6
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
rules:
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: deep-exit
- name: dot-imports
arguments:
- allowedPackages:
- github.com/lima-vm/lima/pkg/must
- name: empty-block
- name: error-naming
- name: error-return
- name: error-strings
- name: errorf
- name: exported
- name: increment-decrement
- name: indent-error-flow
- name: package-comments
- name: range
- name: receiver-naming
- name: redefines-builtin-id
- name: superfluous-else
- name: time-naming
- name: unexported-return
- name: unreachable-code
- name: unused-parameter
- name: use-any
- name: var-declaration
- name: var-naming
staticcheck:
# https://staticcheck.dev/docs/configuration/options/#checks
checks:
- "all"
- "-SA3000" # false positive for Go 1.15+. See https://github.com/golang/go/issues/34129
# Allow using Uid, Gid in pkg/osutil.
- path: pkg/osutil/
text: '(?i)(uid)|(gid)'
# Disable some linters for test files.
- linters:
- godot
path: _test\.go
# Disable perfsprint for fmt.Sprint until https://github.com/catenacyber/perfsprint/issues/39 gets fixed.
- linters:
- perfsprint
text: fmt.Sprint.* can be replaced with faster
issues:
# Maximum issues count per one linter.
max-issues-per-linter: 0
# Maximum count of issues with the same text.
max-same-issues: 0
include:
- EXC0013 # revive: package comment should be of the form "(.+)..."
- EXC0014 # revive: comment on exported (.+) should be of the form "(.+)..."
exclude-rules:
# Allow using Uid, Gid in pkg/osutil.
- path: "pkg/osutil/"
text: "uid"
# Disable some linters for test files.
- path: _test\.go
linters:
- godot
# Disable revive.exported for constants.
- text: "exported: comment on exported const"
linters:
- revive
# Disable perfsprint for fmt.Sprint until https://github.com/catenacyber/perfsprint/issues/39 gets fixed.
- text: "fmt.Sprint.* can be replaced with faster"
linters:
- perfsprint
formatters:
enable:
- gofmt
- gofumpt
- goimports
Loading
Loading