From 2b43f622330d7b07ae26d66af85f23231a2ad749 Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Mon, 27 May 2024 11:16:09 +0200
Subject: [PATCH] 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>
---
 .golangci.yml     | 10 ----------
 Makefile          |  2 +-
 pkg/util/utils.go |  5 ++++-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 76abdbd2b8..33bf0c5bf6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -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:
diff --git a/Makefile b/Makefile
index 44ead54ebb..82bd446270 100644
--- a/Makefile
+++ b/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
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 88f20d640c..602d120549 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -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: ")