Skip to content
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.

Sign up for GitHub

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

[skip changelog] Bump golangci/golangci-lint-action from 6 to 7 #2872

Merged
merged 10 commits into from
Apr 3, 2025
Merged

[skip changelog] Bump golangci/golangci-lint-action from 6 to 7 #2872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
52e59ad
[skip changelog] Bump golangci/golangci-lint-action from 6 to 7
dependabot[bot] Mar 25, 2025
0441aa9
Migrated golanci.yml to v2
cmaglie Mar 31, 2025
7173c0d
Updated golangci-lint version used in GH workflows
cmaglie Mar 31, 2025
4beccdf
Fixed linter warning
cmaglie Mar 31, 2025
d834ac1
Fixed linter warning
cmaglie Mar 31, 2025
2709c00
Fixed linter warnings
cmaglie Mar 31, 2025
48ede6b
Fixed linter warnings
cmaglie Mar 31, 2025
494679a
Fixed linter warning
cmaglie Mar 31, 2025
fd5b7da
Fixed linter warning
cmaglie Mar 31, 2025
f69bff3
Fixed linter warning
cmaglie Mar 31, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/check-go-task.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ jobs:
version: 3.x

- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v7
with:
version: v1.64.5
version: v2.0.2

- name: Check style
env:
Expand Down
309 changes: 152 additions & 157 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,185 +1,180 @@
version: "2"
run:
timeout: 10m
go: "1.24"
tests: true

linters:
# Disable all linters.
disable-all: true
default: none
# Enable specific linter
enable:
# Nice to have
#- depguard
#- errcheck
#- gocritic
#- thelper
- errorlint
- dupword
- copyloopvar
- dupword
- errorlint
- forbidigo
- gofmt
- goimports
- gosec
- gosimple
- govet
- ineffassign
- misspell
- revive
- staticcheck
- tenv
- typecheck
- unconvert
# We must disable this one because there is no support 'optional' protobuf fields yet: https://github.com/arduino/arduino-cli/pull/2570
#- protogetter

linters-settings:
govet:
# Enable analyzers by name.
# Run `GL_DEBUG=govet golangci-lint run --enable=govet` to see default, all available analyzers, and enabled analyzers.
enable:
- appends
- asmdecl
- assign
- atomic
- atomicalign
- bools
- buildtag
- cgocall
- composites
- copylocks
- deepequalerrors
- defers
- directive
- errorsas
#- fieldalignment
- findcall
- framepointer
- httpresponse
- ifaceassert
- loopclosure
- lostcancel
- nilfunc
- nilness
- printf
- reflectvaluecompare
#- shadow
- shift
- sigchanyzer
- slog
- sortslice
- stdmethods
- stringintconv
- structtag
- testinggoroutine
- tests
- unmarshal
- unreachable
- unsafeptr
- unusedresult
- unusedwrite

forbidigo:
forbid:
- p: ^(fmt\.Print(|f|ln)|print|println)$
msg: in cli package use `feedback.*` instead
- p: (os\.(Stdout|Stderr|Stdin))(# )?
msg: in cli package use `feedback.*` instead
analyze-types: true

revive:
confidence: 0.8
settings:
errorlint:
errorf: false
asserts: false
comparison: true
forbidigo:
forbid:
- pattern: ^(fmt\.Print(|f|ln)|print|println)$
msg: in cli package use `feedback.*` instead
- pattern: (os\.(Stdout|Stderr|Stdin))(# )?
msg: in cli package use `feedback.*` instead
analyze-types: true
govet:
enable:
- appends
- asmdecl
- assign
- atomic
- atomicalign
- bools
- buildtag
- cgocall
- composites
- copylocks
- deepequalerrors
- defers
- directive
- errorsas
- findcall
- framepointer
- httpresponse
- ifaceassert
- loopclosure
- lostcancel
- nilfunc
- nilness
- printf
- reflectvaluecompare
- shift
- sigchanyzer
- slog
- sortslice
- stdmethods
- stringintconv
- structtag
- testinggoroutine
- tests
- unmarshal
- unreachable
- unsafeptr
- unusedresult
- unusedwrite
revive:
confidence: 0.8
rules:
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: dot-imports
- name: empty-block
- name: error-naming
- name: error-strings
- name: errorf
- name: exported
- name: increment-decrement
- name: package-comments
- name: range
- name: receiver-naming
- name: redefines-builtin-id
- name: superfluous-else
- name: time-naming
- name: unreachable-code
- name: var-declaration
- name: defer
- name: atomic
- name: waitgroup-by-value
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
rules:
#- name: error-return
#- name: unused-parameter
#- name: var-naming
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: dot-imports
- name: empty-block
- name: error-naming
- 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: unreachable-code
- name: var-declaration
- name: defer
- name: atomic
- name: waitgroup-by-value

errorlint:
# Check for plain error comparisons.
comparison: true

# We might evalute to allow the asserts and errofs in the future
# Do not check for plain type assertions and type switches.
asserts: false
# Do not check whether fmt.Errorf uses the %w verb for formatting errors.
errorf: false

- linters:
- errcheck
- gosec
path: _test\.go
- linters:
- gosec
text: G401
- linters:
- gosec
text: G501
- linters:
- gosec
path: internal/integrationtest/
text: G112
- linters:
- gosec
path: executils/process.go
text: G204
- linters:
- staticcheck
path: commands/lib/search.go
text: SA1019
- linters:
- revive
path: arduino/libraries/loader.go
text: empty-block
- linters:
- revive
path: arduino/serialutils/serialutils.go
text: empty-block
- linters:
- revive
path: arduino/resources/download.go
text: empty-block
- linters:
- revive
path: arduino/builder/internal/progress/progress_test.go
text: empty-block
- linters:
- revive
path: internal/algorithms/channels.go
text: empty-block
- linters:
- forbidigo
path-except: internal/cli/
- linters:
- forbidigo
path: internal/cli/.*_test.go
- linters:
- forbidigo
path: internal/cli/feedback/
paths:
- third_party$
- builtin$
- examples$
issues:
# Fix found issues (if it's supported by the linter).
fix: false
# List of regexps of issue texts to exclude.
#
# But independently of this option we use default exclude patterns,
# it can be disabled by `exclude-use-default: false`.
# To list all excluded by default patterns execute `golangci-lint run --help`
#
# Default: https://golangci-lint.run/usage/false-positives/#default-exclusions
exclude-rules:
# Exclude some linters from running on tests files.
- path: _test\.go
linters: [gosec, errcheck]
# G401: Use of weak cryptographic primitive
- linters: [gosec]
text: "G401"
# G501: Blocklisted import crypto/md5: weak cryptographic primitive
- linters: [gosec]
text: "G501"
# G112: Potential Slowloris Attack because ReadHeaderTimeout is not configured in the http.Server
- linters: [gosec]
path: internal/integrationtest/
text: "G112"
# G204: Subprocess launched with a potential tainted input or cmd arguments
- linters: [gosec]
path: executils/process.go
text: "G204"
# SA1019: req.GetQuery is deprecated: Marked as deprecated in cc/arduino/cli/commands/v1/lib.proto.
- linters: [staticcheck]
path: commands/lib/search.go
text: "SA1019"

# Ignore revive emptyblock
- linters: [revive]
path: arduino/libraries/loader.go
text: "empty-block"
- linters: [revive]
path: arduino/serialutils/serialutils.go
text: "empty-block"
- linters: [revive]
path: arduino/resources/download.go
text: "empty-block"
- linters: [revive]
path: arduino/builder/internal/progress/progress_test.go
text: "empty-block"
- linters: [revive]
path: internal/algorithms/channels.go
text: "empty-block"

# Run linters only on specific path
- path-except: internal/cli/
linters:
- forbidigo
- path: internal/cli/.*_test.go
linters: [forbidigo]
- path: internal/cli/feedback/
linters: [forbidigo]
formatters:
enable:
- gofmt
- goimports
exclusions:
generated: lax
paths:
- third_party$
- builtin$
- examples$
8 changes: 4 additions & 4 deletions commands/service_compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
signProp := boardBuildProperties.ContainsKey("build.keys.sign_key")
encryptProp := boardBuildProperties.ContainsKey("build.keys.encrypt_key")
// we verify that all the properties for the secure boot keys are defined or none of them is defined.
if !(keychainProp == signProp && signProp == encryptProp) {
if keychainProp != signProp || signProp != encryptProp {
return errors.New(i18n.Tr("Firmware encryption/signing requires all the following properties to be defined: %s", "build.keys.keychain, build.keys.sign_key, build.keys.encrypt_key"))
}

Expand Down Expand Up @@ -245,7 +245,7 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
Message: &rpc.CompileResponse_Progress{Progress: p},
})
}
var verbosity logger.Verbosity = logger.VerbosityNormal
var verbosity = logger.VerbosityNormal
if req.GetQuiet() {
verbosity = logger.VerbosityQuiet
}
Expand Down Expand Up @@ -353,10 +353,10 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
// select the core name in case of "package:core" format
normalizedFQBN, err := pme.NormalizeFQBN(fqbn)
if err != nil {
outStream.Write([]byte(fmt.Sprintf("Could not normalize FQBN: %s\n", err)))
fmt.Fprintf(outStream, "Could not normalize FQBN: %s\n", err)
normalizedFQBN = fqbn
}
outStream.Write([]byte(fmt.Sprintf("FQBN: %s\n", normalizedFQBN)))
fmt.Fprintf(outStream, "FQBN: %s\n", normalizedFQBN)
core = core[strings.Index(core, ":")+1:]
outStream.Write([]byte(i18n.Tr("Using board '%[1]s' from platform in folder: %[2]s", targetBoard.BoardID, targetPlatform.InstallDir) + "\n"))
outStream.Write([]byte(i18n.Tr("Using core '%[1]s' from platform in folder: %[2]s", core, buildPlatform.InstallDir) + "\n"))
Expand Down
Loading