feat: Fix string formats causing PR pipeline to fail

BeegiiK · BeegiiK · commit 8e11f4b6e205 · 2025-07-22T12:29:08.000+01:00
diff --git a/aitelemetry/telemetrywrapper_test.go b/aitelemetry/telemetrywrapper_test.go
@@ -87,7 +87,7 @@ func handleGetCloud(w http.ResponseWriter, req *http.Request) {
 	w.Write([]byte(getCloudResponse))
 }
 
-func initTelemetry(t *testing.T) (TelemetryHandle, TelemetryHandle) {
+func initTelemetry() (TelemetryHandle, TelemetryHandle) {
 	th1, err1 := NewAITelemetry(httpURL, "00ca2a73-c8d6-4929-a0c2-cf84545ec225", aiConfig)
 	if err1 != nil {
 		fmt.Printf("Error initializing AI telemetry: %v", err1)
@@ -118,7 +118,7 @@ func TestEmptyAIKey(t *testing.T) {
 func TestNewAITelemetry(t *testing.T) {
 	var err error
 
-	th1, th2 := initTelemetry(t)
+	th1, th2 := initTelemetry()
 	if th1 == nil {
 		t.Errorf("Error initializing AI telemetry: %v", err)
 	}
@@ -129,7 +129,7 @@ func TestNewAITelemetry(t *testing.T) {
 }
 
 func TestTrackMetric(t *testing.T) {
-	th1, th2 := initTelemetry(t)
+	th1, th2 := initTelemetry()
 
 	metric := Metric{
 		Name:             "test",
@@ -143,7 +143,7 @@ func TestTrackMetric(t *testing.T) {
 }
 
 func TestTrackLog(t *testing.T) {
-	th1, th2 := initTelemetry(t)
+	th1, th2 := initTelemetry()
 
 	report := Report{
 		Message:          "test",
@@ -157,7 +157,7 @@ func TestTrackLog(t *testing.T) {
 }
 
 func TestTrackEvent(t *testing.T) {
-	th1, th2 := initTelemetry(t)
+	th1, th2 := initTelemetry()
 
 	event := Event{
 		EventName:  "testEvent",
@@ -172,14 +172,14 @@ func TestTrackEvent(t *testing.T) {
 }
 
 func TestFlush(t *testing.T) {
-	th1, th2 := initTelemetry(t)
+	th1, th2 := initTelemetry()
 
 	th1.Flush()
 	th2.Flush()
 }
 
 func TestClose(t *testing.T) {
-	th1, th2 := initTelemetry(t)
+	th1, th2 := initTelemetry()
 
 	th1.Close(10)
 	th2.Close(10)
diff --git a/cni/network/network.go b/cni/network/network.go
@@ -281,14 +281,14 @@ func (plugin *NetPlugin) getPodInfo(args string) (name, ns string, err error) {
 	if len(k8sNamespace) == 0 {
 		errMsg := "Pod Namespace not specified in CNI Args"
 		logger.Error(errMsg)
-		return "", "", plugin.Errorf(errMsg)
+		return "", "", plugin.Errorf("%s", errMsg)
 	}
 
 	k8sPodName := string(podCfg.K8S_POD_NAME)
 	if len(k8sPodName) == 0 {
 		errMsg := "Pod Name not specified in CNI Args"
 		logger.Error(errMsg)
-		return "", "", plugin.Errorf(errMsg)
+		return "", "", plugin.Errorf("%s", errMsg)
 	}
 
 	return k8sPodName, k8sNamespace, nil
@@ -450,14 +450,14 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 	if len(k8sContainerID) == 0 {
 		errMsg := "Container ID not specified in CNI Args"
 		logger.Error(errMsg)
-		return plugin.Errorf(errMsg)
+		return plugin.Errorf("%s", errMsg)
 	}
 
 	k8sIfName := args.IfName
 	if len(k8sIfName) == 0 {
 		errMsg := "Interfacename not specified in CNI Args"
 		logger.Error(errMsg)
-		return plugin.Errorf(errMsg)
+		return plugin.Errorf("%s", errMsg)
 	}
 
 	platformInit(nwCfg)
@@ -520,7 +520,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 			errMsg := fmt.Sprintf("received multiple NC results %+v from CNS while dualnic feature is not supported", ipamAddResult.interfaceInfo)
 			logger.Error("received multiple NC results from CNS while dualnic feature is not supported",
 				zap.Any("results", ipamAddResult.interfaceInfo))
-			return plugin.Errorf(errMsg)
+			return plugin.Errorf("%s", errMsg)
 		}
 	} else {
 		// when nwcfg.multitenancy (use multitenancy flag for swift v1 only) is false
@@ -790,7 +790,7 @@ func (plugin *NetPlugin) createEpInfo(opt *createEpInfoOpt) (*network.EndpointIn
 	epPolicies, err := getPoliciesFromRuntimeCfg(opt.nwCfg, opt.ipamAddResult.ipv6Enabled) // not specific to delegated or infra
 	if err != nil {
 		logger.Error("failed to get policies from runtime configurations", zap.Error(err))
-		return nil, plugin.Errorf(err.Error())
+		return nil, plugin.Errorf("%s", err.Error())
 	}
 	endpointInfo.EndpointPolicies = append(endpointInfo.EndpointPolicies, epPolicies...)
 
@@ -1228,14 +1228,14 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
 	if len(k8sNamespace) == 0 {
 		errMsg := "Required parameter Pod Namespace not specified in CNI Args during UPDATE"
 		logger.Error(errMsg)
-		return plugin.Errorf(errMsg)
+		return plugin.Errorf("%s", errMsg)
 	}
 
 	k8sPodName := string(podCfg.K8S_POD_NAME)
 	if len(k8sPodName) == 0 {
 		errMsg := "Required parameter Pod Name not specified in CNI Args during UPDATE"
 		logger.Error(errMsg)
-		return plugin.Errorf(errMsg)
+		return plugin.Errorf("%s", errMsg)
 	}
 
 	// Initialize values from network config.
@@ -1245,7 +1245,7 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
 	if _, err = plugin.nm.GetNetworkInfo(networkID); err != nil {
 		errMsg := fmt.Sprintf("Failed to query network during CNI UPDATE: %v", err)
 		logger.Error(errMsg)
-		return plugin.Errorf(errMsg)
+		return plugin.Errorf("%s", errMsg)
 	}
 
 	// Query the existing endpoint since this is an update.
@@ -1272,21 +1272,21 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
 	if orchestratorContext, err = json.Marshal(podInfo); err != nil {
 		logger.Error("Marshalling KubernetesPodInfo failed",
 			zap.Error(err))
-		return plugin.Errorf(err.Error())
+		return plugin.Errorf("%s", err.Error())
 	}
 
 	cnsclient, err := cnscli.New(nwCfg.CNSUrl, defaultRequestTimeout)
 	if err != nil {
 		logger.Error("failed to initialized cns client",
 			zap.String("url", nwCfg.CNSUrl),
 			zap.String("error", err.Error()))
-		return plugin.Errorf(err.Error())
+		return plugin.Errorf("%s", err.Error())
 	}
 
 	if targetNetworkConfig, err = cnsclient.GetNetworkContainer(context.TODO(), orchestratorContext); err != nil {
 		logger.Info("GetNetworkContainer failed",
 			zap.Error(err))
-		return plugin.Errorf(err.Error())
+		return plugin.Errorf("%s", err.Error())
 	}
 
 	logger.Info("Network config received from cns",
diff --git a/cns/service/main.go b/cns/service/main.go
@@ -1020,7 +1020,7 @@ func main() {
 
 		var localServerURL string
 		if config.Server.Port != "" {
-			localServerURL = fmt.Sprintf(defaultLocalServerIP + ":" + config.Server.Port)
+			localServerURL = fmt.Sprintf("%s", defaultLocalServerIP+":"+config.Server.Port)
 		} else {
 			localServerURL = fmt.Sprintf(defaultLocalServerIP + ":" + defaultLocalServerPort)
 		}
diff --git a/npm/ipsm/ipsm.go b/npm/ipsm/ipsm.go
@@ -215,7 +215,7 @@ func (ipsMgr *IpsetManager) run(entry *ipsEntry) (int, error) {
 		errfmt := fmt.Errorf("error running command: [%s %v] Stderr: [%w, %s]",
 			cmdName, strings.Join(cmdArgs, " "), err, strings.TrimSuffix(string(output), "\n"))
 		if exitCode > 0 {
-			metrics.SendErrorLogAndMetric(util.IpsmID, errfmt.Error())
+			metrics.SendErrorLogAndMetric(util.IpsmID, "%s", errfmt.Error())
 		}
 
 		return exitCode, errfmt
diff --git a/npm/ipsm/ipsm_test.go b/npm/ipsm/ipsm_test.go
@@ -547,26 +547,26 @@ func TestDestroyNpmIpsets(t *testing.T) {
 	err := ipsMgr.CreateSetNoLock(testSet1Name, []string{"nethash"})
 	if err != nil {
 		t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.createSet")
-		t.Errorf(err.Error())
+		t.Errorf("%s", err.Error())
 	}
 
 	err = ipsMgr.CreateSetNoLock(testSet2Name, []string{"nethash"})
 	if err != nil {
 		t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.createSet")
-		t.Errorf(err.Error())
+		t.Errorf("%s", err.Error())
 	}
 
 	// expect prometheus to add this entry, but remove it when destroying npm sets
 	err = ipsMgr.AddToSet(testSet1Name, "1.2.3.4", util.IpsetNetHashFlag, "")
 	if err != nil {
 		t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.addToSet")
-		t.Errorf(err.Error())
+		t.Errorf("%s", err.Error())
 	}
 
 	err = ipsMgr.DestroyNpmIpsets()
 	if err != nil {
 		t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.DestroyNpmIpsets")
-		t.Errorf(err.Error())
+		t.Errorf("%s", err.Error())
 	}
 }
 
diff --git a/npm/iptm/iptm.go b/npm/iptm/iptm.go
@@ -362,7 +362,7 @@ func (iptMgr *IptablesManager) addAllRulesToChains() error {
 					msg = "Error: failed to add main chains with invalid rule length"
 				}
 
-				metrics.SendErrorLogAndMetric(util.IptmID, msg)
+				metrics.SendErrorLogAndMetric(util.IptmID, "%s", msg)
 				return err
 			}
 		}
diff --git a/npm/metrics/ai-utils.go b/npm/metrics/ai-utils.go
@@ -106,7 +106,7 @@ func SendLog(operationID int, msg string, printLog bool) {
 		CustomDimensions: make(map[string]string),
 	}
 	if printLog {
-		klog.Infof(msg)
+		klog.Infof("%s", msg)
 	}
 	if th == nil {
 		return
diff --git a/npm/pkg/dataplane/dataplane.go b/npm/pkg/dataplane/dataplane.go
@@ -508,7 +508,7 @@ func (dp *DataPlane) addPolicies(netPols []*policies.NPMNetworkPolicy) error {
 			// this should never happen because bootup phase is for windows, but just in case, we don't want to applyDataplaneNow() or else there will be a deadlock on dp.applyInfo
 			msg := fmt.Sprintf("[DataPlane] [%s] at risk of improperly applying a policy which is removed then readded", contextAddNetPolPrecaution)
 			klog.Warning(msg)
-			metrics.SendErrorLogAndMetric(util.DaemonDataplaneID, msg)
+			metrics.SendErrorLogAndMetric(util.DaemonDataplaneID, "%s", msg)
 		} else {
 			// prevent #2977
 			if err := dp.applyDataPlaneNow(contextAddNetPolPrecaution); err != nil {
diff --git a/npm/pkg/dataplane/debug/converter_test.go b/npm/pkg/dataplane/debug/converter_test.go
@@ -179,7 +179,7 @@ func TestGetSetType(t *testing.T) {
 			actualType := c.getSetType(test.inputSetName, test.inputMapName)
 			diff := cmp.Diff(test.expected, actualType)
 			if diff != "" {
-				t.Fatalf(diff)
+				t.Fatalf("%s", diff)
 			}
 		})
 	}
diff --git a/npm/pkg/dataplane/ipsets/dirtycache.go b/npm/pkg/dataplane/ipsets/dirtycache.go
@@ -10,25 +10,25 @@ import (
 )
 
 /*
-	dirtyCacheInterface will maintain the dirty cache.
-	It may maintain membersToAdd and membersToDelete.
-	Members are either IPs, CIDRs, IP-Port pairs, or prefixed set names if the parent is a list.
-
-	Assumptions:
-	- if the set becomes dirty via update or destroy, then the set WAS in the kernel before
-	- if the set becomes dirty via create, then the set was NOT in the kernel before
-
-	Usage:
-	- create, addMember, deleteMember, and destroy are idempotent
-	- create should not be called if the set becomes dirty via add/delete or the set is removed from the deleteCache via add/update
-	- deleteMember should not be called if the set is in the deleteCache
-	- deleteMember is safe to call on members in the kernel and members added via addMember
-	- deleteMember is also safe to call on members not in the kernel if the set isn't in the kernel yet (became dirty via create)
-
-	Examples of Expected Behavior:
-	- if a set is created and then destroyed, that set will not be in the dirty cache anymore
-	- if a set is updated and then destroyed, that set will be in the delete cache
-	- if the only operations on a set are adding and removing the same member, the set may still be in the dirty cache, but the member will be untracked
+dirtyCacheInterface will maintain the dirty cache.
+It may maintain membersToAdd and membersToDelete.
+Members are either IPs, CIDRs, IP-Port pairs, or prefixed set names if the parent is a list.
+
+Assumptions:
+- if the set becomes dirty via update or destroy, then the set WAS in the kernel before
+- if the set becomes dirty via create, then the set was NOT in the kernel before
+
+Usage:
+- create, addMember, deleteMember, and destroy are idempotent
+- create should not be called if the set becomes dirty via add/delete or the set is removed from the deleteCache via add/update
+- deleteMember should not be called if the set is in the deleteCache
+- deleteMember is safe to call on members in the kernel and members added via addMember
+- deleteMember is also safe to call on members not in the kernel if the set isn't in the kernel yet (became dirty via create)
+
+Examples of Expected Behavior:
+- if a set is created and then destroyed, that set will not be in the dirty cache anymore
+- if a set is updated and then destroyed, that set will be in the delete cache
+- if the only operations on a set are adding and removing the same member, the set may still be in the dirty cache, but the member will be untracked
 */
 type dirtyCacheInterface interface {
 	// reset empties dirty cache
@@ -96,7 +96,7 @@ func (dc *dirtyCache) create(set *IPSet) {
 	if _, ok := dc.toUpdateCache[set.Name]; ok {
 		msg := fmt.Sprintf("create should not be called for set %s since it's in the toUpdateCache", set.Name)
 		klog.Warning(msg)
-		metrics.SendErrorLogAndMetric(util.IpsmID, msg)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "%s", msg)
 		return
 	}
 
@@ -136,7 +136,7 @@ func (dc *dirtyCache) deleteMember(set *IPSet, member string) {
 	if dc.isSetToDelete(set.Name) {
 		msg := fmt.Sprintf("attempting to delete member %s for set %s in the toDestroyCache", member, set.Name)
 		klog.Warning(msg)
-		metrics.SendErrorLogAndMetric(util.IpsmID, msg)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "%s", msg)
 		return
 	}
 	if diff, ok := dc.toCreateCache[set.Name]; ok {
diff --git a/npm/pkg/dataplane/ipsets/ipsetmanager.go b/npm/pkg/dataplane/ipsets/ipsetmanager.go
@@ -246,7 +246,7 @@ func (iMgr *IPSetManager) AddToSets(addToSets []*IPSetMetadata, ip, podKey strin
 
 	if !validateIPSetMemberIP(ip) {
 		msg := fmt.Sprintf("error: failed to add to sets: invalid ip %s", ip)
-		metrics.SendErrorLogAndMetric(util.IpsmID, msg)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "%s", msg)
 		return npmerrors.Errorf(npmerrors.AppendIPSet, true, msg)
 	}
 
@@ -282,7 +282,7 @@ func (iMgr *IPSetManager) RemoveFromSets(removeFromSets []*IPSetMetadata, ip, po
 
 	if !validateIPSetMemberIP(ip) {
 		msg := fmt.Sprintf("error: failed to add to sets: invalid ip %s", ip)
-		metrics.SendErrorLogAndMetric(util.IpsmID, msg)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "%s", msg)
 		return npmerrors.Errorf(npmerrors.AppendIPSet, true, msg)
 	}
 
diff --git a/npm/pkg/dataplane/ipsets/ipsetmanager_linux.go b/npm/pkg/dataplane/ipsets/ipsetmanager_linux.go
@@ -428,7 +428,7 @@ func (iMgr *IPSetManager) applyIPSets() error {
 		if iMgr.consecutiveApplyFailures >= maxConsecutiveFailures {
 			msg := fmt.Sprintf("exceeded max consecutive failures (%d) when applying ipsets. final error: %s", maxConsecutiveFailures, restoreError.Error())
 			klog.Error(msg)
-			metrics.SendErrorLogAndMetric(util.IpsmID, msg)
+			metrics.SendErrorLogAndMetric(util.IpsmID, "%s", msg)
 			metrics.Close()
 			panic(msg)
 		}
diff --git a/test/internal/kubernetes/utils.go b/test/internal/kubernetes/utils.go
@@ -359,7 +359,7 @@ func WaitForDeploymentToDelete(ctx context.Context, deploymentsClient typedappsv
 		if apierrors.IsNotFound(err) {
 			return nil
 		}
-		return errors.Errorf(fmt.Sprintf("expected isNotFound error when getting deployment, but got %+v", err))
+		return errors.Errorf("expected isNotFound error when getting deployment, but got %+v", err)
 	}
 	retrier := retry.Retrier{Attempts: DeleteRetryAttempts, Delay: DeleteRetryDelay}
 	return errors.Wrapf(retrier.Do(ctx, assertDeploymentNotFound), "could not assert deployment %s isNotFound", d.Name)

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ func main() {`
`1020`	`1020`
`1021`	`1021`	`var localServerURL string`
`1022`	`1022`	`if config.Server.Port != "" {`
`1023`		`- localServerURL = fmt.Sprintf(defaultLocalServerIP + ":" + config.Server.Port)`
	`1023`	`+ localServerURL = fmt.Sprintf("%s", defaultLocalServerIP+":"+config.Server.Port)`
`1024`	`1024`	`} else {`
`1025`	`1025`	`localServerURL = fmt.Sprintf(defaultLocalServerIP + ":" + defaultLocalServerPort)`
`1026`	`1026`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func (ipsMgr IpsetManager) run(entry ipsEntry) (int, error) {`
`215`	`215`	`errfmt := fmt.Errorf("error running command: [%s %v] Stderr: [%w, %s]",`
`216`	`216`	`cmdName, strings.Join(cmdArgs, " "), err, strings.TrimSuffix(string(output), "\n"))`
`217`	`217`	`if exitCode > 0 {`
`218`		`- metrics.SendErrorLogAndMetric(util.IpsmID, errfmt.Error())`
	`218`	`+ metrics.SendErrorLogAndMetric(util.IpsmID, "%s", errfmt.Error())`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`return exitCode, errfmt`
Original file line number	Diff line number	Diff line change
`@@ -547,26 +547,26 @@ func TestDestroyNpmIpsets(t *testing.T) {`
`547`	`547`	`err := ipsMgr.CreateSetNoLock(testSet1Name, []string{"nethash"})`
`548`	`548`	`if err != nil {`
`549`	`549`	`t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.createSet")`
`550`		`- t.Errorf(err.Error())`
	`550`	`+ t.Errorf("%s", err.Error())`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`err = ipsMgr.CreateSetNoLock(testSet2Name, []string{"nethash"})`
`554`	`554`	`if err != nil {`
`555`	`555`	`t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.createSet")`
`556`		`- t.Errorf(err.Error())`
	`556`	`+ t.Errorf("%s", err.Error())`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`// expect prometheus to add this entry, but remove it when destroying npm sets`
`560`	`560`	`err = ipsMgr.AddToSet(testSet1Name, "1.2.3.4", util.IpsetNetHashFlag, "")`
`561`	`561`	`if err != nil {`
`562`	`562`	`t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.addToSet")`
`563`		`- t.Errorf(err.Error())`
	`563`	`+ t.Errorf("%s", err.Error())`
`564`	`564`	`}`
`565`	`565`
`566`	`566`	`err = ipsMgr.DestroyNpmIpsets()`
`567`	`567`	`if err != nil {`
`568`	`568`	`t.Errorf("TestDestroyNpmIpsets failed @ ipsMgr.DestroyNpmIpsets")`
`569`		`- t.Errorf(err.Error())`
	`569`	`+ t.Errorf("%s", err.Error())`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ func (iptMgr *IptablesManager) addAllRulesToChains() error {`
`362`	`362`	`msg = "Error: failed to add main chains with invalid rule length"`
`363`	`363`	`}`
`364`	`364`
`365`		`- metrics.SendErrorLogAndMetric(util.IptmID, msg)`
	`365`	`+ metrics.SendErrorLogAndMetric(util.IptmID, "%s", msg)`
`366`	`366`	`return err`
`367`	`367`	`}`
`368`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func SendLog(operationID int, msg string, printLog bool) {`
`106`	`106`	`CustomDimensions: make(map[string]string),`
`107`	`107`	`}`
`108`	`108`	`if printLog {`
`109`		`- klog.Infof(msg)`
	`109`	`+ klog.Infof("%s", msg)`
`110`	`110`	`}`
`111`	`111`	`if th == nil {`
`112`	`112`	`return`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func TestGetSetType(t *testing.T) {`
`179`	`179`	`actualType := c.getSetType(test.inputSetName, test.inputMapName)`
`180`	`180`	`diff := cmp.Diff(test.expected, actualType)`
`181`	`181`	`if diff != "" {`
`182`		`- t.Fatalf(diff)`
	`182`	`+ t.Fatalf("%s", diff)`
`183`	`183`	`}`
`184`	`184`	`})`
`185`	`185`	`}`