diff --git a/pkg/ip/link_linux_test.go b/pkg/ip/link_linux_test.go index 1d1dfcea..009fab5d 100644 --- a/pkg/ip/link_linux_test.go +++ b/pkg/ip/link_linux_test.go @@ -38,7 +38,7 @@ var _ = Describe("Link", func() { var ( hostNetNS ns.NetNS containerNetNS ns.NetNS - ifaceCounter int = 0 + ifaceCounter = 0 hostVeth net.Interface containerVeth net.Interface hostVethName string diff --git a/plugins/ipam/dhcp/lease.go b/plugins/ipam/dhcp/lease.go index 2bdf401d..27d57d0c 100644 --- a/plugins/ipam/dhcp/lease.go +++ b/plugins/ipam/dhcp/lease.go @@ -385,7 +385,7 @@ func checkLinkExistsWithBackoff(ctx context.Context, linkName string) (bool, err func checkLinkByName(linkName string) (bool, error) { _, err := netlinksafe.LinkByName(linkName) if err != nil { - var linkNotFoundErr *netlink.LinkNotFoundError = &netlink.LinkNotFoundError{} + linkNotFoundErr := &netlink.LinkNotFoundError{} if errors.As(err, linkNotFoundErr) { return false, nil } diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index 056a6983..a8a10f7c 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -511,10 +511,7 @@ func calcGatewayIP(ipn *net.IPNet) net.IP { } func setupBridge(n *NetConf) (*netlink.Bridge, *current.Interface, error) { - vlanFiltering := false - if n.Vlan != 0 || n.VlanTrunk != nil { - vlanFiltering = true - } + vlanFiltering := n.Vlan != 0 || n.VlanTrunk != nil // create bridge if necessary br, err := ensureBridge(n.BrName, n.MTU, n.PromiscMode, vlanFiltering) if err != nil { diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go index 744f046d..50a4f15f 100644 --- a/plugins/main/bridge/bridge_test.go +++ b/plugins/main/bridge/bridge_test.go @@ -345,7 +345,7 @@ func newResolvConf() (string, error) { } defer f.Close() name := f.Name() - _, err = f.WriteString(fmt.Sprintf("nameserver %s", NAMESERVER)) + _, err = fmt.Fprintf(f, "nameserver %s", NAMESERVER) return name, err } @@ -1834,13 +1834,13 @@ var _ = Describe("bridge Operations", func() { }) var ( - correctID int = 10 - correctMinID int = 100 - correctMaxID int = 105 - incorrectMinID int = 1000 - incorrectMaxID int = 100 - overID int = 5000 - negativeID int = -1 + correctID = 10 + correctMinID = 100 + correctMaxID = 105 + incorrectMinID = 1000 + incorrectMaxID = 100 + overID = 5000 + negativeID = -1 ) DescribeTable( diff --git a/plugins/meta/firewall/firewall_iptables_test.go b/plugins/meta/firewall/firewall_iptables_test.go index 8849b552..d2d9b618 100644 --- a/plugins/meta/firewall/firewall_iptables_test.go +++ b/plugins/meta/firewall/firewall_iptables_test.go @@ -37,9 +37,10 @@ import ( func findChains(chains []string) (bool, bool) { var foundAdmin, foundPriv bool for _, ch := range chains { - if ch == "CNI-ADMIN" { + switch ch { + case "CNI-ADMIN": foundAdmin = true - } else if ch == "CNI-FORWARD" { + case "CNI-FORWARD": foundPriv = true } } diff --git a/plugins/meta/tuning/tuning_test.go b/plugins/meta/tuning/tuning_test.go index ca643456..6bcbf20e 100644 --- a/plugins/meta/tuning/tuning_test.go +++ b/plugins/meta/tuning/tuning_test.go @@ -86,7 +86,7 @@ func createSysctlAllowFile(sysctls []string) error { return err } for _, sysctl := range sysctls { - _, err = f.WriteString(fmt.Sprintf("%s\n", sysctl)) + _, err = fmt.Fprintln(f, sysctl) if err != nil { return err }