chore: clean up npm non-constant Sprintf usage

Author: jpayne3506

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
@@ -226,7 +226,6 @@ func (ipsMgr *IpsetManager) run(entry *ipsEntry) (int, error) {
 
 // CreateListNoLock is identical to CreateList except it does not lock the ipsMgr.
 func (ipsMgr *IpsetManager) CreateListNoLock(listName string) error {
-
 	if _, exists := ipsMgr.listMap[listName]; exists {
 		return nil
 	}

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())
 	}
 }
 

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
 			}
 		}

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

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 {

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)
 			}
 		})
 	}

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 {

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)
 	}
 

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)
 		}