chore: update Go code for new lints (#13437)

Before updating our dev image with a new version of golangci-lint, this change
updates our Go code to satisfy new lints.

No functional changes.

Author: olix0r

multicluster/cmd/check.go

@@ -475,7 +475,7 @@ func (hc *healthChecker) checkRemoteClusterAnchors(ctx context.Context, localAnc
 
 func (hc *healthChecker) checkServiceMirrorLocalRBAC(ctx context.Context) error {
 	links := []string{}
-	errors := []string{}
+	messages := []string{}
 	for _, link := range hc.links {
 		err := healthcheck.CheckServiceAccounts(
 			ctx,
@@ -485,7 +485,7 @@ func (hc *healthChecker) checkServiceMirrorLocalRBAC(ctx context.Context) error
 			serviceMirrorComponentsSelector(link.TargetClusterName),
 		)
 		if err != nil {
-			errors = append(errors, err.Error())
+			messages = append(messages, err.Error())
 		}
 		err = healthcheck.CheckClusterRoles(
 			ctx,
@@ -495,7 +495,7 @@ func (hc *healthChecker) checkServiceMirrorLocalRBAC(ctx context.Context) error
 			serviceMirrorComponentsSelector(link.TargetClusterName),
 		)
 		if err != nil {
-			errors = append(errors, err.Error())
+			messages = append(messages, err.Error())
 		}
 		err = healthcheck.CheckClusterRoleBindings(
 			ctx,
@@ -505,7 +505,7 @@ func (hc *healthChecker) checkServiceMirrorLocalRBAC(ctx context.Context) error
 			serviceMirrorComponentsSelector(link.TargetClusterName),
 		)
 		if err != nil {
-			errors = append(errors, err.Error())
+			messages = append(messages, err.Error())
 		}
 		err = healthcheck.CheckRoles(
 			ctx,
@@ -516,7 +516,7 @@ func (hc *healthChecker) checkServiceMirrorLocalRBAC(ctx context.Context) error
 			serviceMirrorComponentsSelector(link.TargetClusterName),
 		)
 		if err != nil {
-			errors = append(errors, err.Error())
+			messages = append(messages, err.Error())
 		}
 		err = healthcheck.CheckRoleBindings(
 			ctx,
@@ -527,12 +527,12 @@ func (hc *healthChecker) checkServiceMirrorLocalRBAC(ctx context.Context) error
 			serviceMirrorComponentsSelector(link.TargetClusterName),
 		)
 		if err != nil {
-			errors = append(errors, err.Error())
+			messages = append(messages, err.Error())
 		}
 		links = append(links, fmt.Sprintf("\t* %s", link.TargetClusterName))
 	}
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, "\n"))
+	if len(messages) > 0 {
+		return errors.New(strings.Join(messages, "\n"))
 	}
 	if len(links) == 0 {
 		return healthcheck.SkipError{Reason: "no links"}

pkg/healthcheck/healthcheck.go

@@ -2403,7 +2403,7 @@ func (hc *HealthChecker) checkMisconfiguredOpaquePortAnnotations(ctx context.Con
 	}
 
 	if len(errStrings) >= 1 {
-		return fmt.Errorf(strings.Join(errStrings, "\n    "))
+		return errors.New(strings.Join(errStrings, "\n    "))
 	}
 
 	return nil
@@ -2906,7 +2906,7 @@ func CheckPodsRunning(pods []corev1.Pod, namespace string) error {
 		if namespace != "" {
 			msg += fmt.Sprintf(" in the \"%s\" namespace", namespace)
 		}
-		return fmt.Errorf(msg)
+		return errors.New(msg)
 	}
 	for _, pod := range pods {
 		status := k8s.GetPodStatus(pod)

pkg/identity/service.go

@@ -103,7 +103,7 @@ func (svc *Service) Run(issuerEvent <-chan struct{}, issuerError <-chan error) {
 				svc.recordEvent(nil, v1.EventTypeWarning, eventTypeSkipped, message)
 			} else {
 				message := "Updated identity issuer"
-				log.Infof(message)
+				log.Info(message)
 				svc.recordEvent(nil, v1.EventTypeNormal, eventTypeUpdated, message)
 			}
 		case err := <-issuerError:

pkg/inject/inject.go

@@ -1058,7 +1058,7 @@ func (conf *ResourceConfig) injectPodSpec(values *podPatch) {
 
 	// use the primary container's capabilities to ensure psp compliance, if
 	// enabled
-	if conf.pod.spec.Containers != nil && len(conf.pod.spec.Containers) > 0 {
+	if len(conf.pod.spec.Containers) > 0 {
 		if sc := conf.pod.spec.Containers[0].SecurityContext; sc != nil && sc.Capabilities != nil {
 			values.Proxy.Capabilities = &l5dcharts.Capabilities{
 				Add:  []string{},

pkg/protohttp/protohttp_test.go

@@ -187,7 +187,7 @@ func TestWriteErrorToHttpResponse(t *testing.T) {
 
 		responseWriter := newStubResponseWriter()
 		expectedErrorMessage := "error message"
-		grpcError := status.Errorf(codes.AlreadyExists, expectedErrorMessage)
+		grpcError := status.Error(codes.AlreadyExists, expectedErrorMessage)
 
 		WriteErrorToHTTPResponse(responseWriter, grpcError)
 

pkg/version/version_test.go

@@ -2,7 +2,6 @@ package version
 
 import (
 	"errors"
-	"fmt"
 	"testing"
 )
 
@@ -78,7 +77,7 @@ func TestMatch(t *testing.T) {
 
 	for _, tc := range testCases {
 		tc := tc // pin
-		t.Run(fmt.Sprintf(tc.name), func(t *testing.T) {
+		t.Run(tc.name, func(t *testing.T) {
 			err := match(tc.expected, tc.actual)
 			if (err == nil && tc.err != nil) ||
 				(err != nil && tc.err == nil) ||

test/integration/deep/dualstack/dualstack_test.go

@@ -145,7 +145,7 @@ func TestDualStack(t *testing.T) {
 				testutil.AnnotatedFatalf(t, "unexpected error", "unexpected error: %v\noutput:\n%s", err, out)
 			}
 			if out != "IPv6\n" {
-				testutil.AnnotatedFatalf(t, "expected 'IPv6', received '%s'", out)
+				testutil.AnnotatedFatalf(t, "expected 'IPv6'", "received '%s'", out)
 			}
 		})
 
@@ -162,7 +162,7 @@ func TestDualStack(t *testing.T) {
 					testutil.AnnotatedFatalf(t, "unexpected error", "unexpected error: %v\noutput:\n%s", err, out)
 				}
 				if out != "IPv6\n" {
-					testutil.AnnotatedFatalf(t, "expected 'IPv6', received '%s'", out)
+					testutil.AnnotatedFatalf(t, "expected 'IPv6'", "received '%s'", out)
 				}
 			}
 		})

test/integration/install/inject/inject_test.go

@@ -183,11 +183,11 @@ func TestInjectAutoParams(t *testing.T) {
 		})
 
 		if err != nil {
-			testutil.AnnotatedFatalf(t, "failed to find autoinjected pod: ", err.Error())
+			testutil.AnnotatedFatal(t, "failed to find autoinjected pod: ", err.Error())
 		}
 
 		if err := injectionValidator.ValidatePod(&pod.Spec); err != nil {
-			testutil.AnnotatedFatalf(t, "failed to validate auto injection", err.Error())
+			testutil.AnnotatedFatal(t, "failed to validate auto injection", err.Error())
 		}
 	})
 }

test/integration/multicluster/multicluster-traffic/pod_to_pod_test.go

@@ -102,7 +102,7 @@ func TestPodToPodTraffic(t *testing.T) {
 					testutil.AnnotatedFatal(t, "mirror service should not have endpoints", "mirror service should not have endpoints")
 				}
 				if !kerrors.IsNotFound(err) {
-					testutil.AnnotatedFatalf(t, "failed to retrieve mirror service endpoints", err.Error())
+					testutil.AnnotatedFatal(t, "failed to retrieve mirror service endpoints", err.Error())
 				}
 				return nil
 			})

test/integration/viz/install_test.go

@@ -151,7 +151,7 @@ func TestDashboard(t *testing.T) {
 	output := strings.Join(outputLines, "")
 	if !strings.Contains(output, dashboardURL) {
 		testutil.AnnotatedFatalf(t,
-			"dashboard command failed. Expected url [%s] not present", dashboardURL)
+			"dashboard command failed", "Expected url [%s] not present", dashboardURL)
 	}
 
 	resp, err := TestHelper.HTTPGetURL(dashboardURL + "/api/version")