*: fix non-constant format strings

printf: non-constant format string in call to (*github.com/sirupsen/logrus.Entry).Warnf (govet) Signed-off-by: Steve Kuznetsov <[email protected]>
Azure · Feb 7, 2025 · 18cf165 · 18cf165
1 parent 88960c9
commit 18cf165
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 17 deletions.
diff --git a/pkg/api/error.go b/pkg/api/error.go
@@ -113,11 +113,17 @@ const (
 
 // NewCloudError returns a new CloudError
 func NewCloudError(statusCode int, code, target, message string, a ...interface{}) *CloudError {
+	var msg string
+	if len(a) == 0 {
+		msg = fmt.Sprint(message)
+	} else {
+		msg = fmt.Sprintf(msg, a...)
+	}
 	return &CloudError{
 		StatusCode: statusCode,
 		CloudErrorBody: &CloudErrorBody{
 			Code:    code,
-			Message: fmt.Sprintf(message, a...),
+			Message: msg,
 			Target:  target,
 		},
 	}

diff --git a/pkg/cluster/gatherlogs.go b/pkg/cluster/gatherlogs.go
@@ -175,7 +175,7 @@ func (m *manager) logClusterOperators(ctx context.Context) (interface{}, error)
 			errs = append(errs, err)
 			continue
 		}
-		m.log.Infof(string(json))
+		m.log.Info(string(json))
 	}
 
 	return strings.Join(lines, "\n"), errors.Join(errs...)
@@ -217,7 +217,7 @@ func (m *manager) logIngressControllers(ctx context.Context) (interface{}, error
 			errs = append(errs, err)
 			continue
 		}
-		m.log.Infof(string(json))
+		m.log.Info(string(json))
 	}
 
 	return strings.Join(lines, "\n"), errors.Join(errs...)

diff --git a/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew.go b/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew.go
@@ -448,13 +448,13 @@ func (e *etcdrenew) isEtcdRevised(ctx context.Context) (bool, error) {
 	isAtRevision := true
 	rawEtcd, err := e.k.KubeGet(ctx, "etcd.operator.openshift.io", "", "cluster")
 	if err != nil {
-		e.log.Warnf(err.Error())
+		e.log.Warn(err.Error())
 		return false, nil
 	}
 	etcd := &operatorv1.Etcd{}
 	err = codec.NewDecoderBytes(rawEtcd, &codec.JsonHandle{}).Decode(etcd)
 	if err != nil {
-		e.log.Warnf(err.Error())
+		e.log.Warn(err.Error())
 		return false, nil
 	}
 

diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go b/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go
@@ -137,11 +137,11 @@ func TestReconcile(t *testing.T) {
 			}
 
 			if condition.Status != tt.wantConditionStatus {
-				t.Errorf(string(condition.Status))
+				t.Error(string(condition.Status))
 			}
 
 			if condition.Message != tt.wantConditionMessage {
-				t.Errorf(condition.Message)
+				t.Error(condition.Message)
 			}
 		})
 	}

diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go
@@ -116,11 +116,11 @@ func TestReconcile(t *testing.T) {
 			}
 
 			if condition.Status != tt.wantConditionStatus {
-				t.Errorf(string(condition.Status))
+				t.Error(string(condition.Status))
 			}
 
 			if condition.Message != tt.wantConditionMessage {
-				t.Errorf(condition.Message)
+				t.Error(condition.Message)
 			}
 		})
 	}

diff --git a/pkg/operator/controllers/checkers/internetchecker/checker.go b/pkg/operator/controllers/checkers/internetchecker/checker.go
@@ -66,7 +66,7 @@ func (r *checker) Check(URLs []string) error {
 	}
 	if len(errsAll) != 0 {
 		// TODO: Consider replacing with multi error wrapping with Go 1.20: https://github.com/golang/go/issues/53435#issuecomment-1320343377
-		return fmt.Errorf(strings.Join(errsAll, "\n"))
+		return fmt.Errorf("%s", strings.Join(errsAll, "\n"))
 	}
 
 	return nil

diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go
@@ -122,11 +122,11 @@ func TestReconcile(t *testing.T) {
 			}
 
 			if condition.Status != tt.wantConditionStatus {
-				t.Errorf(string(condition.Status))
+				t.Error(string(condition.Status))
 			}
 
 			if condition.Message != tt.wantConditionMessage {
-				t.Errorf(condition.Message)
+				t.Error(condition.Message)
 			}
 		})
 	}

diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go
@@ -807,8 +807,8 @@ func TestEnsureGlobalPullSecret(t *testing.T) {
 			s, err := r.ensureGlobalPullSecret(ctx, tt.operatorPullSecret, tt.pullSecret)
 			utilerror.AssertErrorMessage(t, err, tt.wantError)
 
-			if !reflect.DeepEqual(s, tt.wantSecret) {
-				t.Fatalf(cmp.Diff(s, tt.wantSecret))
+			if diff := cmp.Diff(s, tt.wantSecret); diff != "" {
+				t.Fatalf("Unexpected pull secret (-want, +got): %s", diff)
 			}
 		})
 	}

diff --git a/pkg/operator/controllers/subnets/subnets_controller.go b/pkg/operator/controllers/subnets/subnets_controller.go
@@ -144,7 +144,7 @@ func (r *reconcileManager) reconcileSubnets(ctx context.Context) error {
 	}
 
 	if len(combinedErrors) > 0 {
-		return fmt.Errorf(strings.Join(combinedErrors, "\n"))
+		return fmt.Errorf("%s", strings.Join(combinedErrors, "\n"))
 	}
 
 	return nil

diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go
@@ -27,7 +27,7 @@ func parseTokenResponse(location string) (string, error) {
 	}
 
 	if v.Get("error") != "" {
-		return "", fmt.Errorf(v.Get("error_description"))
+		return "", fmt.Errorf("%s", v.Get("error_description"))
 	}
 
 	v, err = url.ParseQuery(locURL.Fragment)
@@ -36,7 +36,7 @@ func parseTokenResponse(location string) (string, error) {
 	}
 
 	if v.Get("error") != "" {
-		return "", fmt.Errorf(v.Get("error_description"))
+		return "", fmt.Errorf("%s", v.Get("error_description"))
 	}
 
 	return v.Get("access_token"), nil