From fa4f11facc35eae24a226b16075f48ff1ecd46cc Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Mon, 10 Jun 2024 14:46:45 +0200
Subject: [PATCH] update golangci-lint to v1.59.1

Includes fixes for new lint warnings from unparam and usestdlibvars.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 Makefile                              | 2 +-
 cmd/podman/containers/ps.go           | 6 +++---
 pkg/bindings/connection.go            | 7 ++++++-
 pkg/bindings/containers/containers.go | 2 +-
 pkg/bindings/images/images.go         | 2 +-
 pkg/machine/config.go                 | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 7030cf90b4..e17bd7769a 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.59.0
+GOLANGCI_LINT_VERSION := 1.59.1
 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/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index c247adf68e..ed2968ebbf 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -161,7 +161,7 @@ func jsonOut(responses []entities.ListContainer) error {
 	return nil
 }
 
-func quietOut(responses []entities.ListContainer) error {
+func quietOut(responses []entities.ListContainer) {
 	for _, r := range responses {
 		id := r.ID
 		if !noTrunc {
@@ -169,7 +169,6 @@ func quietOut(responses []entities.ListContainer) error {
 		}
 		fmt.Println(id)
 	}
-	return nil
 }
 
 func getResponses() ([]entities.ListContainer, error) {
@@ -217,7 +216,8 @@ func ps(cmd *cobra.Command, _ []string) error {
 	case report.IsJSON(listOpts.Format):
 		return jsonOut(listContainers)
 	case listOpts.Quiet && !cmd.Flags().Changed("format"):
-		return quietOut(listContainers)
+		quietOut(listContainers)
+		return nil
 	}
 
 	responses := make([]psReporter, 0, len(listContainers))
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index d2c3aaba2a..496e469157 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -321,30 +321,35 @@ func (c *Connection) GetDialer(ctx context.Context) (net.Conn, error) {
 
 // IsInformational returns true if the response code is 1xx
 func (h *APIResponse) IsInformational() bool {
+	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 1
 }
 
 // IsSuccess returns true if the response code is 2xx
 func (h *APIResponse) IsSuccess() bool {
+	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 2
 }
 
 // IsRedirection returns true if the response code is 3xx
 func (h *APIResponse) IsRedirection() bool {
+	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 3
 }
 
 // IsClientError returns true if the response code is 4xx
 func (h *APIResponse) IsClientError() bool {
+	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 4
 }
 
 // IsConflictError returns true if the response code is 409
 func (h *APIResponse) IsConflictError() bool {
-	return h.Response.StatusCode == 409
+	return h.Response.StatusCode == http.StatusConflict
 }
 
 // IsServerError returns true if the response code is 5xx
 func (h *APIResponse) IsServerError() bool {
+	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 5
 }
diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index 19fc74f735..116ed91875 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -427,7 +427,7 @@ func Export(ctx context.Context, nameOrID string, w io.Writer, options *ExportOp
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode/100 == 2 {
+	if response.IsSuccess() {
 		_, err = io.Copy(w, response.Body)
 		return err
 	}
diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go
index 018edbc974..275e68a9ac 100644
--- a/pkg/bindings/images/images.go
+++ b/pkg/bindings/images/images.go
@@ -162,7 +162,7 @@ func Export(ctx context.Context, nameOrIDs []string, w io.Writer, options *Expor
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode/100 == 2 || response.StatusCode/100 == 3 {
+	if response.IsSuccess() || response.IsRedirection() {
 		_, err = io.Copy(w, response.Body)
 		return err
 	}
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index 4c5c5cdc0b..25a9aae69b 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -269,7 +269,7 @@ func WaitAndPingAPI(sock string) {
 	if err == nil {
 		defer resp.Body.Close()
 	}
-	if err != nil || resp.StatusCode != 200 {
+	if err != nil || resp.StatusCode != http.StatusOK {
 		logrus.Warn("API socket failed ping test")
 	}
 }