From f067c923da11eff21e38601480a6c0c4cac960c1 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:21:07 -0300
Subject: [PATCH] fix go vet errors with Go 1.24 (#5651) (#5684)

(cherry picked from commit 11cb0a9bda548557edf0ccbc769b68eb8519ce60)

Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
---
 internal/pkg/agent/application/monitoring/handler.go | 2 +-
 internal/pkg/agent/vault/aesgcm/aesgcm_test.go       | 4 ++--
 internal/pkg/cli/confirm.go                          | 6 +++---
 internal/pkg/cli/input.go                            | 2 +-
 pkg/control/v1/client/client.go                      | 6 +++---
 pkg/control/v2/client/client.go                      | 4 ++--
 pkg/testing/multipass/provisioner.go                 | 5 +++--
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/internal/pkg/agent/application/monitoring/handler.go b/internal/pkg/agent/application/monitoring/handler.go
index c053621ebd4..b41ad81cfac 100644
--- a/internal/pkg/agent/application/monitoring/handler.go
+++ b/internal/pkg/agent/application/monitoring/handler.go
@@ -48,7 +48,7 @@ func (h *apiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 		}
 
-		writeResponse(w, unexpectedErrorWithReason(err.Error()))
+		writeResponse(w, unexpectedErrorWithReason("%s", err.Error()))
 	}
 }
 
diff --git a/internal/pkg/agent/vault/aesgcm/aesgcm_test.go b/internal/pkg/agent/vault/aesgcm/aesgcm_test.go
index b5f4348419b..82460bbdc0d 100644
--- a/internal/pkg/agent/vault/aesgcm/aesgcm_test.go
+++ b/internal/pkg/agent/vault/aesgcm/aesgcm_test.go
@@ -173,12 +173,12 @@ func TestEncryptDecryptHex(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			enc, err := EncryptHex(tc.key, tc.data)
 			if !errors.Is(tc.err, err) {
-				t.Fatalf(cmp.Diff(tc.err, err))
+				t.Fatal(cmp.Diff(tc.err, err))
 			}
 
 			dec, err := DecryptHex(tc.key, enc)
 			if !errors.Is(tc.err, err) {
-				t.Fatalf(cmp.Diff(tc.err, err))
+				t.Fatal(cmp.Diff(tc.err, err))
 			}
 
 			if len(tc.data) == 0 {
diff --git a/internal/pkg/cli/confirm.go b/internal/pkg/cli/confirm.go
index dab615eada1..099e723622b 100644
--- a/internal/pkg/cli/confirm.go
+++ b/internal/pkg/cli/confirm.go
@@ -22,14 +22,14 @@ func Confirm(prompt string, def bool) (bool, error) {
 }
 
 func confirm(r io.Reader, out io.Writer, prompt string, def bool) (bool, error) {
-	options := " [Y/n]"
+	options := "[Y/n]"
 	if !def {
-		options = " [y/N]"
+		options = "[y/N]"
 	}
 
 	reader := bufio.NewScanner(r)
 	for {
-		fmt.Fprintf(out, prompt+options+":")
+		fmt.Fprintf(out, "%s %s:", prompt, options)
 
 		if !reader.Scan() {
 			break
diff --git a/internal/pkg/cli/input.go b/internal/pkg/cli/input.go
index a8df2f7a3cd..c178fcbfbdb 100644
--- a/internal/pkg/cli/input.go
+++ b/internal/pkg/cli/input.go
@@ -20,7 +20,7 @@ func ReadInput(prompt string) (string, error) {
 
 func input(r io.Reader, out io.Writer, prompt string) (string, error) {
 	reader := bufio.NewScanner(r)
-	fmt.Fprintf(out, prompt+" ")
+	fmt.Fprintf(out, "%s ", prompt)
 
 	if !reader.Scan() {
 		return "", errors.New("error reading user input")
diff --git a/pkg/control/v1/client/client.go b/pkg/control/v1/client/client.go
index 940af2b701c..3c7042bdc77 100644
--- a/pkg/control/v1/client/client.go
+++ b/pkg/control/v1/client/client.go
@@ -7,7 +7,7 @@ package client
 import (
 	"context"
 	"encoding/json"
-	"fmt"
+	"errors"
 	"sync"
 	"time"
 
@@ -165,7 +165,7 @@ func (c *client) Restart(ctx context.Context) error {
 		return err
 	}
 	if res.Status == proto.ActionStatus_V1_FAILURE {
-		return fmt.Errorf(res.Error)
+		return errors.New(res.Error)
 	}
 	return nil
 }
@@ -180,7 +180,7 @@ func (c *client) Upgrade(ctx context.Context, version string, sourceURI string)
 		return "", err
 	}
 	if res.Status == proto.ActionStatus_V1_FAILURE {
-		return "", fmt.Errorf(res.Error)
+		return "", errors.New(res.Error)
 	}
 	return res.Version, nil
 }
diff --git a/pkg/control/v2/client/client.go b/pkg/control/v2/client/client.go
index 7481010c4aa..a3fbd75d3c9 100644
--- a/pkg/control/v2/client/client.go
+++ b/pkg/control/v2/client/client.go
@@ -295,7 +295,7 @@ func (c *client) Restart(ctx context.Context) error {
 		return err
 	}
 	if res.Status == cproto.ActionStatus_FAILURE {
-		return fmt.Errorf(res.Error)
+		return errors.New(res.Error)
 	}
 	return nil
 }
@@ -313,7 +313,7 @@ func (c *client) Upgrade(ctx context.Context, version string, sourceURI string,
 		return "", err
 	}
 	if res.Status == cproto.ActionStatus_FAILURE {
-		return "", fmt.Errorf(res.Error)
+		return "", errors.New(res.Error)
 	}
 	return res.Version, nil
 }
diff --git a/pkg/testing/multipass/provisioner.go b/pkg/testing/multipass/provisioner.go
index 7f3ad91db68..0ef59821335 100644
--- a/pkg/testing/multipass/provisioner.go
+++ b/pkg/testing/multipass/provisioner.go
@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -208,7 +209,7 @@ func (p *provisioner) ensureInstanceNotExist(ctx context.Context, batch common.O
 		p.logger.Logf(msg)
 		p.logger.Logf("output: %s", output.String())
 		p.logger.Logf("stderr: %s", stdErr.String())
-		return fmt.Errorf(msg)
+		return errors.New(msg)
 	}
 	list := struct {
 		List []struct {
@@ -248,7 +249,7 @@ func (p *provisioner) ensureInstanceNotExist(ctx context.Context, batch common.O
 				p.logger.Logf(msg)
 				p.logger.Logf("output: %s", output.String())
 				p.logger.Logf("stderr: %s", stdErr.String())
-				return fmt.Errorf(msg)
+				return errors.New(msg)
 			}
 
 			break