Fix warning for IP set type; log the actual value.

Author: fasaxc

app-policy/policystore/ipset.go

@@ -15,7 +15,6 @@
 package policystore
 
 import (
-	"fmt"
 	"net"
 	"strconv"
 	"strings"
@@ -63,7 +62,7 @@ func NewIPSet(t syncapi.IPSetUpdate_IPSetType) IPSet {
 	case syncapi.IPSetUpdate_NET:
 		return ipNetSet{v4: &trieNode{}, v6: &trieNode{}}
 	}
-	log.Warn(fmt.Sprintf("Unrecognized IPSet type %T", t))
+	log.Warnf("Unrecognized IPSet type %v", t)
 	return nil
 }
 

felix/bpf/conntrack/timeouts_test.go

@@ -1,9 +1,10 @@
 package conntrack
 
 import (
-	"github.com/projectcalico/calico/felix/config"
 	"reflect"
 	"testing"
+
+	"github.com/projectcalico/calico/felix/config"
 )
 
 func TestConfigNames(t *testing.T) {
@@ -12,7 +13,7 @@ func TestConfigNames(t *testing.T) {
 	v := reflect.ValueOf(&to)
 	v = v.Elem()
 
-	for key, _ := range c.BPFConntrackTimeouts {
+	for key := range c.BPFConntrackTimeouts {
 		field := v.FieldByName(key)
 		if !field.IsValid() {
 			t.Errorf("Config contains invalid BPF conntrack timeout: %s", key)