ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-12 19:32:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bump golangci-lint to v2.4.0 (#7878)

Browse Source 
Signed-off-by: Sebastian Spaink <sebastianspaink@gmail.com>
This commit is contained in:
Sebastian Spaink
2025-09-03 15:21:30 -05:00
committed by GitHub
parent 964ddb5dec
commit 8c0079f551
7 changed files with 246 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.golangci.yaml
+237 -203
View File
@@ -1,214 +1,248 @@
version: "2"
run:
timeout: 5m
issues:
max-same-issues: 0 # don't hide issues in CI runs because they are the same type
exclude-dirs:
- internal/gojsonschema
exclude-rules:
- path: ast/
linters:
- staticcheck
text: "SA1019"
- path: bundle/
linters:
- staticcheck
text: "SA1019"
- path: capabilities/
linters:
- staticcheck
text: "SA1019"
- path: compile/
linters:
- staticcheck
text: "SA1019"
- path: config/
linters:
- staticcheck
text: "SA1019"
- path: cover/
linters:
- staticcheck
text: "SA1019"
- path: debug/
linters:
- staticcheck
text: "SA1019"
- path: dependencies/
linters:
- staticcheck
text: "SA1019"
- path: download/
linters:
- staticcheck
text: "SA1019"
- path: format/
linters:
- staticcheck
text: "SA1019"
- path: hooks/
linters:
- staticcheck
text: "SA1019"
- path: ir/
linters:
- staticcheck
text: "SA1019"
- path: keys/
linters:
- staticcheck
text: "SA1019"
- path: loader/
linters:
- staticcheck
text: "SA1019"
- path: logging/
linters:
- staticcheck
text: "SA1019"
- path: metrics/
linters:
- staticcheck
text: "SA1019"
- path: plugins/
linters:
- staticcheck
text: "SA1019"
- path: profiler/
linters:
- staticcheck
text: "SA1019"
- path: refactor/
linters:
- staticcheck
text: "SA1019"
- path: repl/
linters:
- staticcheck
text: "SA1019"
- path: rego/
linters:
- staticcheck
text: "SA1019"
- path: resolver/
linters:
- staticcheck
text: "SA1019"
- path: runtime/
linters:
- staticcheck
text: "SA1019"
- path: schemas/
linters:
- staticcheck
text: "SA1019"
- path: sdk/
linters:
- staticcheck
text: "SA1019"
- path: server/
linters:
- staticcheck
text: "SA1019"
- path: storage/
linters:
- staticcheck
text: "SA1019"
- path: tester/
linters:
- staticcheck
text: "SA1019"
- path: topdown/
linters:
- staticcheck
text: "SA1019"
- path: tracing/
linters:
- staticcheck
text: "SA1019"
- path: types/
linters:
- staticcheck
text: "SA1019"
- path: util/
linters:
- staticcheck
text: "SA1019"
- path: version/
linters:
- staticcheck
text: "SA1019"
linters-settings:
lll:
line-length: 200
gocritic:
disabled-checks:
- appendAssign
# NOTE(ae): this one should be enabled, but there were too
# many violations to fix in one go... revisit later
- singleCaseSwitch
# Reasonable rule, but not sure what to replace with in
# many locations, so disabling for now
- exitAfterDefer
# The following 3 rules are disabled from the perfomance tag
# enabled further down. The first two are reasonable, but not
# super important. appendCombine is really nice though! And
# should be enabled. Just many places to fix..
- hugeParam
- preferFprint
- appendCombine
enabled-checks:
# NOTE that these are rules enabled in addition to the default set
- filepathJoin
- dupImport
- redundantSprint
- stringConcatSimplify
enabled-tags:
- performance
settings:
ifElseChain:
# ridiculous value set for now, but this should be
# lowered to something more reasonable, as the rule
# is reasonable (replace long if-else chains with
# switch)... just too many violations right now
minThreshold: 10
govet:
enable:
- deepequalerrors
- nilness
perfsprint:
# only rule disabled by default, but it's a good one
err-error: true
revive:
rules:
# this mainly complains about us using min/max for variable names,
# which seems like an unlikely source of actual issues
- name: redefines-builtin-id
disabled: true
- name: unused-receiver
disabled: false
linters:
disable-all: true
default: none
enable:
- mirror
- copyloopvar
- errcheck
- gocritic
- govet
- ineffassign
- intrange
- mirror
- misspell
- perfsprint
- prealloc
- revive # replacement for golint
- staticcheck
- unconvert
- unused
- usetesting
# - gosec # too many false positives
settings:
gocritic:
enabled-checks:
# NOTE that these are rules enabled in addition to the default set
- filepathJoin
- dupImport
- redundantSprint
- stringConcatSimplify
disabled-checks:
- appendAssign
# NOTE(ae): this one should be enabled, but there were too
# many violations to fix in one go... revisit later
- singleCaseSwitch
# Reasonable rule, but not sure what to replace with in
# many locations, so disabling for now
- exitAfterDefer
# The following 3 rules are disabled from the perfomance tag
# enabled further down. The first two are reasonable, but not
# super important. appendCombine is really nice though! And
# should be enabled. Just many places to fix..
- hugeParam
- preferFprint
- appendCombine
enabled-tags:
- performance
settings:
ifElseChain:
# ridiculous value set for now, but this should be
# lowered to something more reasonable, as the rule
# is reasonable (replace long if-else chains with
# switch)... just too many violations right now
minThreshold: 10
govet:
enable:
- deepequalerrors
- nilness
lll:
line-length: 200
perfsprint:
# only rule disabled by default, but it's a good one
err-error: true
revive:
# this mainly complains about us using min/max for variable names,
# which seems like an unlikely source of actual issues
rules:
- name: redefines-builtin-id
disabled: true
- name: unused-receiver
disabled: false
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
rules:
- linters:
- staticcheck
path: ast/
text: SA1019
- linters:
- staticcheck
path: bundle/
text: SA1019
- linters:
- staticcheck
path: capabilities/
text: SA1019
- linters:
- staticcheck
path: compile/
text: SA1019
- linters:
- staticcheck
path: config/
text: SA1019
- linters:
- staticcheck
path: cover/
text: SA1019
- linters:
- staticcheck
path: debug/
text: SA1019
- linters:
- staticcheck
path: dependencies/
text: SA1019
- linters:
- staticcheck
path: download/
text: SA1019
- linters:
- staticcheck
path: format/
text: SA1019
- linters:
- staticcheck
path: hooks/
text: SA1019
- linters:
- staticcheck
path: ir/
text: SA1019
- linters:
- staticcheck
path: keys/
text: SA1019
- linters:
- staticcheck
path: loader/
text: SA1019
- linters:
- staticcheck
path: logging/
text: SA1019
- linters:
- staticcheck
path: metrics/
text: SA1019
- linters:
- staticcheck
path: plugins/
text: SA1019
- linters:
- staticcheck
path: profiler/
text: SA1019
- linters:
- staticcheck
path: refactor/
text: SA1019
- linters:
- staticcheck
path: repl/
text: SA1019
- linters:
- staticcheck
path: rego/
text: SA1019
- linters:
- staticcheck
path: resolver/
text: SA1019
- linters:
- staticcheck
path: runtime/
text: SA1019
- linters:
- staticcheck
path: schemas/
text: SA1019
- linters:
- staticcheck
path: sdk/
text: SA1019
- linters:
- staticcheck
path: server/
text: SA1019
- linters:
- staticcheck
path: storage/
text: SA1019
- linters:
- staticcheck
path: tester/
text: SA1019
- linters:
- staticcheck
path: topdown/
text: SA1019
- linters:
- staticcheck
path: tracing/
text: SA1019
- linters:
- staticcheck
path: types/
text: SA1019
- linters:
- staticcheck
path: util/
text: SA1019
- linters:
- staticcheck
path: version/
text: SA1019
- linters:
- staticcheck
text: QF1001
- linters:
- staticcheck
text: QF1002
- linters:
- staticcheck
text: QF1003
- linters:
- staticcheck
text: QF1008
- linters:
- staticcheck
text: QF1009
- linters:
- staticcheck
text: QF1012
paths:
- internal/gojsonschema
- third_party$
- builtin$
- examples$
issues:
# don't hide issues in CI runs because they are the same type
max-same-issues: 0
formatters:
enable:
- gofmt
- goimports
- unused
- misspell
- usetesting
- typecheck
- staticcheck
- gosimple
- prealloc
- unconvert
- copyloopvar
- perfsprint
- gocritic
# - gosec # too many false positives
exclusions:
generated: lax
paths:
- internal/gojsonschema
- third_party$
- builtin$
- examples$
Makefile
+1 -1
View File
@@ -28,7 +28,7 @@ ifeq ($(WASM_ENABLED),1)
GO_TAGS = -tags=opa_wasm
endif
GOLANGCI_LINT_VERSION := v1.64.5
GOLANGCI_LINT_VERSION := v2.4.0
YAML_LINT_VERSION := 0.29.0
YAML_LINT_FORMAT ?= auto
internal/wasm/sdk/examples/loaders/main.go
+1 -1
View File
@@ -90,7 +90,7 @@ func setup(u string, token string) error {
WithURL(url.String()).
WithPrepareRequest(func(req *gohttp.Request) error {
if token != "" {
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
req.Header.Add("Authorization", "Bearer "+token)
}
return nil
}).
v1/bundle/file.go
+1 -1
View File
@@ -462,7 +462,7 @@ func (it *iterator) Next() (*storage.Update, error) {
f := it.files[it.idx]
it.idx++
isPolicy := false
var isPolicy bool
if strings.HasSuffix(f.name, RegoExt) {
isPolicy = true
}
v1/test/cases/internal/keywordrefs/main.go
+2 -2
View File
@@ -45,7 +45,7 @@ func main() {
func generate(keywords []string, root string, template string) error {
err := os.MkdirAll(root, os.ModePerm)
if err != nil {
return fmt.Errorf("error creating directory %s: %v\n", root, err)
return fmt.Errorf("error creating directory %s: %v", root, err)
}
// Generate a YAML file for each keyword
@@ -56,7 +56,7 @@ func generate(keywords []string, root string, template string) error {
err := os.WriteFile(file, []byte(outputContent), 0644)
if err != nil {
return fmt.Errorf("error writing file %s: %v\n", file, err)
return fmt.Errorf("error writing file %s: %v", file, err)
}
fmt.Printf("Generated file: %s\n", file)
}
v1/test/e2e/testing.go
+3 -3
View File
@@ -353,14 +353,14 @@ func (t *TestRuntime) DeletePolicy(name string) error {
func (t *TestRuntime) UploadPolicy(name string, policy io.Reader) error {
req, err := http.NewRequest("PUT", t.URL()+"/v1/policies/"+name, policy)
if err != nil {
return fmt.Errorf("Unexpected error creating request: %s", err)
return fmt.Errorf("unexpected error creating request: %s", err)
}
resp, err := t.Client.Do(req)
if err != nil {
return fmt.Errorf("Failed to PUT the test policy: %s", err)
return fmt.Errorf("failed to PUT the test policy: %s", err)
}
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("Unexpected response: %d %s", resp.StatusCode, resp.Status)
return fmt.Errorf("unexpected response: %d %s", resp.StatusCode, resp.Status)
}
return nil
}
v1/topdown/graphql.go
+1 -1
View File
@@ -675,7 +675,7 @@ const gqlCacheName = "graphql"
func init() {
var defaultCacheEntries int = 10
var defaultCacheEntries = 10
var graphqlCacheConfig = cache.NamedValueCacheConfig{
MaxNumEntries: &defaultCacheEntries,
}