Merge pull request #2168 from testwill/fmt

chore: unnecessary use of fmt.Sprintf (S1039)
kubernetes · Jun 28, 2023 · 613582c · 613582c
2 parents 9ddf359 + 8d4b67a
commit 613582c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/cmd/check-gke-ingress/app/ingress/rule.go b/cmd/check-gke-ingress/app/ingress/rule.go
@@ -132,7 +132,7 @@ func CheckRuleHostOverwrite(c *IngressChecker) (string, string, string) {
 		}
 		hostSet[rule.Host] = struct{}{}
 	}
-	return RuleHostOverwriteCheck, report.Passed, fmt.Sprintf("Ingress rule hosts are unique")
+	return RuleHostOverwriteCheck, report.Passed, "Ingress rule hosts are unique"
 }
 
 // CheckServiceExistence checks whether a service exists.

diff --git a/cmd/e2e-test/basic_test.go b/cmd/e2e-test/basic_test.go
@@ -249,7 +249,7 @@ func TestFrontendResourceDeletion(t *testing.T) {
 			t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)
 
 			// Create SSL certificate.
-			certName := fmt.Sprintf("cert-1")
+			certName := "cert-1"
 			cert, err := e2e.NewCert(certName, host, e2e.K8sCert, false)
 			if err != nil {
 				t.Fatalf("e2e.NewCert(%q, %q, _, %t) = %v, want nil", certName, host, false, err)

diff --git a/pkg/controller/translator/translator_test.go b/pkg/controller/translator/translator_test.go
@@ -532,7 +532,7 @@ func TestGetProbeCrossNamespace(t *testing.T) {
 			// path is different. If this pod was created in the same ns, it
 			// would become the health check.
 			Labels:            map[string]string{"app-3001": "test"},
-			Name:              fmt.Sprintf("test-pod-new-ns"),
+			Name:              "test-pod-new-ns",
 			Namespace:         "new-ns",
 			CreationTimestamp: metav1.NewTime(firstPodCreationTime.Add(-time.Duration(time.Hour))),
 		},

diff --git a/pkg/neg/readiness/reflector.go b/pkg/neg/readiness/reflector.go
@@ -178,7 +178,7 @@ func (r *readinessReflector) syncPod(podKey string, neg, backendService *meta.Ke
 func (r *readinessReflector) getExpectedNegCondition(pod *v1.Pod, neg, backendService *meta.Key) v1.PodCondition {
 	expectedCondition := v1.PodCondition{Type: shared.NegReadinessGate}
 	if pod == nil {
-		expectedCondition.Message = fmt.Sprintf("Unknown status for unknown pod.")
+		expectedCondition.Message = "Unknown status for unknown pod."
 		return expectedCondition
 	}
 

diff --git a/pkg/neg/readiness/utils_test.go b/pkg/neg/readiness/utils_test.go
@@ -19,15 +19,16 @@ package readiness
 import (
 	"context"
 	"fmt"
-	"k8s.io/api/core/v1"
+	"net"
+	"reflect"
+	"testing"
+
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
 	"k8s.io/ingress-gce/pkg/neg/types/shared"
-	"net"
-	"reflect"
-	"testing"
 )
 
 const (
@@ -272,23 +273,23 @@ func TestPatchPodStatus(t *testing.T) {
 		{
 			"no change",
 			func(input v1.PodStatus) v1.PodStatus { return input },
-			[]byte(fmt.Sprintf(`{}`)),
+			[]byte(`{}`),
 		},
 		{
 			"message change",
 			func(input v1.PodStatus) v1.PodStatus {
 				input.Message = "random message"
 				return input
 			},
-			[]byte(fmt.Sprintf(`{"status":{"message":"random message"}}`)),
+			[]byte(`{"status":{"message":"random message"}}`),
 		},
 		{
 			"pod condition change",
 			func(input v1.PodStatus) v1.PodStatus {
 				input.Conditions[0].Status = v1.ConditionFalse
 				return input
 			},
-			[]byte(fmt.Sprintf(`{"status":{"$setElementOrder/conditions":[{"type":"Ready"},{"type":"PodScheduled"}],"conditions":[{"status":"False","type":"Ready"}]}}`)),
+			[]byte(`{"status":{"$setElementOrder/conditions":[{"type":"Ready"},{"type":"PodScheduled"}],"conditions":[{"status":"False","type":"Ready"}]}}`),
 		},
 		{
 			"additional init container condition",
@@ -301,7 +302,7 @@ func TestPatchPodStatus(t *testing.T) {
 				}
 				return input
 			},
-			[]byte(fmt.Sprintf(`{"status":{"initContainerStatuses":[{"image":"","imageID":"","lastState":{},"name":"init-container","ready":true,"restartCount":0,"state":{}}]}}`)),
+			[]byte(`{"status":{"initContainerStatuses":[{"image":"","imageID":"","lastState":{},"name":"init-container","ready":true,"restartCount":0,"state":{}}]}}`),
 		},
 	}
 	for _, tc := range testCases {