mirror of
https://github.com/containers/podman.git
synced 2025-05-17 23:26:08 +08:00
update golangci-lint to v1.59.0
Remove deactivated linters from the config as they will be removed in the future and thorw warnings, all of them were disabled already anyway so this is no functional change. Second, fix one new lint warning for fmt.Scanln() error checking. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -16,12 +16,10 @@ linters:
|
||||
- nakedret
|
||||
- gosmopolitan # usage of time.Local in pkg/k8s.io
|
||||
- tagliatelle # too many JSON keys cannot be changed due to compat
|
||||
- nosnakecase # too many false positives due to the `unix` package
|
||||
- dupword # too many false positives (e.g., in tests)
|
||||
- gocognit
|
||||
- testpackage
|
||||
- err113
|
||||
- exhaustivestruct
|
||||
- errorlint
|
||||
- wrapcheck
|
||||
- paralleltest
|
||||
@ -34,7 +32,6 @@ linters:
|
||||
- nestif
|
||||
- predeclared
|
||||
- thelper
|
||||
- ifshort
|
||||
- forbidigo
|
||||
- exhaustive
|
||||
- gofumpt
|
||||
@ -48,7 +45,6 @@ linters:
|
||||
- gocyclo
|
||||
- lll
|
||||
- gosec
|
||||
- maligned
|
||||
- musttag # way to many warnings to fix for now, also some false positives
|
||||
- mnd # way to many false positives
|
||||
- gomoddirectives
|
||||
@ -65,12 +61,6 @@ linters:
|
||||
- nonamedreturns
|
||||
- exhaustruct
|
||||
# deprecated linters
|
||||
- golint # replaced by revive
|
||||
- scopelint # replaced by exportloopref
|
||||
- interfacer
|
||||
- deadcode # deprecated since v1.49.0, replaced by unused
|
||||
- structcheck # deprecated since v1.49.0, replaced by unused
|
||||
- varcheck # deprecated since v1.49.0, replaced by unused
|
||||
- execinquery
|
||||
linters-settings:
|
||||
errcheck:
|
||||
|
2
Makefile
2
Makefile
@ -62,7 +62,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
|
||||
# N/B: This value is managed by Renovate, manual changes are
|
||||
# possible, as long as they don't disturb the formatting
|
||||
# (i.e. DO NOT ADD A 'v' prefix!)
|
||||
GOLANGCI_LINT_VERSION := 1.58.2
|
||||
GOLANGCI_LINT_VERSION := 1.59.0
|
||||
PYTHON ?= $(shell command -v python3 python|head -n1)
|
||||
PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
|
||||
# ~/.local/bin is not in PATH on all systems
|
||||
|
@ -138,7 +138,10 @@ func ParseRegistryCreds(creds string) (*types.DockerAuthConfig, error) {
|
||||
username, password := parseCreds(creds)
|
||||
if username == "" {
|
||||
fmt.Print("Username: ")
|
||||
fmt.Scanln(&username)
|
||||
_, err := fmt.Scanln(&username)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not read username: %w", err)
|
||||
}
|
||||
}
|
||||
if password == "" {
|
||||
fmt.Print("Password: ")
|
||||
|
Reference in New Issue
Block a user