Fix golangci-lint govet issues

This commit fixes all the errors found by the linter, govet, run by golangci-lint. Signed-off-by: Bryan Cox <[email protected]>
openshift · Jan 23, 2025 · b4e70b7 · b4e70b7
1 parent 7e6ca6c
commit b4e70b7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/etcd-defrag/etcddefrag_controller.go b/etcd-defrag/etcddefrag_controller.go
@@ -192,7 +192,7 @@ func (r *DefragController) runDefrag(ctx context.Context) error {
 				// Defrag can timeout if defragmentation takes longer than etcdcli.DefragDialTimeout.
 				r.log.Error(err, "DefragController Defragment Failed", "member", member.Name, "ID", member.ID)
 				errMsg := fmt.Sprintf("failed defrag on member: %s, memberID: %x: %v", member.Name, member.ID, err)
-				errs = append(errs, fmt.Errorf(errMsg))
+				errs = append(errs, fmt.Errorf("%s", errMsg))
 				continue
 			}
 

diff --git a/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go b/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
@@ -1155,7 +1155,7 @@ func (r *HostedClusterReconciler) reconcile(ctx context.Context, req ctrl.Reques
 		validReleaseImage := meta.FindStatusCondition(hcluster.Status.Conditions, string(hyperv1.ValidReleaseImage))
 		if validReleaseImage != nil && validReleaseImage.Status == metav1.ConditionFalse {
 			if validReleaseImage.Reason == hyperv1.SecretNotFoundReason {
-				return ctrl.Result{}, fmt.Errorf(validReleaseImage.Message)
+				return ctrl.Result{}, fmt.Errorf("%s", validReleaseImage.Message)
 			}
 			log.Error(fmt.Errorf("release image is invalid"), "reconciliation is blocked", "message", validReleaseImage.Message)
 			return ctrl.Result{}, nil

diff --git a/test/e2e/util/eventually.go b/test/e2e/util/eventually.go
@@ -152,7 +152,7 @@ func EventuallyObject[T client.Object](t *testing.T, ctx context.Context, object
 						matches = matches || matcher.Matches(condition)
 					}
 					if matches {
-						t.Logf(condition.String())
+						t.Logf("%s", condition.String())
 					}
 				}
 			}
@@ -332,7 +332,7 @@ func EventuallyObjects[T client.Object](t *testing.T, ctx context.Context, objec
 							matches = matches || matcher.Matches(condition)
 						}
 						if matches {
-							t.Logf(condition.String())
+							t.Logf("%s", condition.String())
 						}
 					}
 				}

diff --git a/test/e2e/util/hypershift_framework.go b/test/e2e/util/hypershift_framework.go
@@ -88,7 +88,7 @@ func (h *hypershiftTest) Execute(opts *PlatformAgnosticOptions, platform hyperv1
 		if err := recover(); err != nil {
 			// on a panic, print error and mark test as failed so postTeardown() is skipped
 			// panics from subtests can't be caught by this.
-			h.Errorf(string(debug.Stack()))
+			h.Errorf("%s", string(debug.Stack()))
 		}
 
 		h.teardown(hostedCluster, opts, artifactDir, false)