opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-01 00:01:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22815 from Luap99/golangci-lint

Browse Source 
update golangci-lint to v1.59.0
This commit is contained in:
openshift-merge-bot[bot]
2024-05-27 11:58:04 +00:00
committed by GitHub
parent f48cf3cb8d 2b43f62233
commit d02a876dbe
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.golangci.yml
View File

@ -16,12 +16,10 @@ linters:
- nakedret - nakedret
- gosmopolitan # usage of time.Local in pkg/k8s.io - gosmopolitan # usage of time.Local in pkg/k8s.io
- tagliatelle # too many JSON keys cannot be changed due to compat - 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) - dupword # too many false positives (e.g., in tests)
- gocognit - gocognit
- testpackage - testpackage
- err113 - err113
- exhaustivestruct
- errorlint - errorlint
- wrapcheck - wrapcheck
- paralleltest - paralleltest
@ -34,7 +32,6 @@ linters:
- nestif - nestif
- predeclared - predeclared
- thelper - thelper
- ifshort
- forbidigo - forbidigo
- exhaustive - exhaustive
- gofumpt - gofumpt
@ -48,7 +45,6 @@ linters:
- gocyclo - gocyclo
- lll - lll
- gosec - gosec
- maligned
- musttag # way to many warnings to fix for now, also some false positives - musttag # way to many warnings to fix for now, also some false positives
- mnd # way to many false positives - mnd # way to many false positives
- gomoddirectives - gomoddirectives
@ -65,12 +61,6 @@ linters:
- nonamedreturns - nonamedreturns
- exhaustruct - exhaustruct
# deprecated linters # 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 - execinquery
linters-settings: linters-settings:
errcheck: errcheck:

2
Makefile
View File

@ -62,7 +62,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
# N/B: This value is managed by Renovate, manual changes are # N/B: This value is managed by Renovate, manual changes are
# possible, as long as they don't disturb the formatting # possible, as long as they don't disturb the formatting
# (i.e. DO NOT ADD A 'v' prefix!) # (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) PYTHON ?= $(shell command -v python3 python|head -n1)
PKG_MANAGER ?= $(shell command -v dnf yum|head -n1) PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
# ~/.local/bin is not in PATH on all systems # ~/.local/bin is not in PATH on all systems

5
pkg/util/utils.go
View File

@ -138,7 +138,10 @@ func ParseRegistryCreds(creds string) (*types.DockerAuthConfig, error) {
username, password := parseCreds(creds) username, password := parseCreds(creds)
if username == "" { if username == "" {
fmt.Print("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 == "" { if password == "" {
fmt.Print("Password: ") fmt.Print("Password: ")