ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Fix revive linter errors

Browse Source 
Golangci-lint is now running version 1.52.1. This introduced some errors.

Signed-off-by: Marcelo Guerrero Viveros <marguerr@redhat.com>
This commit is contained in:
Marcelo Guerrero Viveros 2023-03-24 21:02:23 +01:00
parent 3bc00017e3
commit d71d0f2da1
33 changed files with 87 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/testutils/bad_reader.go
View File

@ -21,7 +21,7 @@ type BadReader struct {
Error error Error error
} }
func (r *BadReader) Read(buffer []byte) (int, error) { func (r *BadReader) Read(_ []byte) (int, error) {
if r.Error != nil { if r.Error != nil {
return 0, r.Error return 0, r.Error
} }

4
pkg/testutils/cmd.go
View File

@ -81,7 +81,7 @@ func CmdAddWithArgs(args *skel.CmdArgs, f func() error) (types.Result, []byte, e
return CmdAdd(args.Netns, args.ContainerID, args.IfName, args.StdinData, f) return CmdAdd(args.Netns, args.ContainerID, args.IfName, args.StdinData, f)
} }
func CmdCheck(cniNetns, cniContainerID, cniIfname string, conf []byte, f func() error) error { func CmdCheck(cniNetns, cniContainerID, cniIfname string, f func() error) error {
os.Setenv("CNI_COMMAND", "CHECK") os.Setenv("CNI_COMMAND", "CHECK")
os.Setenv("CNI_PATH", os.Getenv("PATH")) os.Setenv("CNI_PATH", os.Getenv("PATH"))
os.Setenv("CNI_NETNS", cniNetns) os.Setenv("CNI_NETNS", cniNetns)
@ -93,7 +93,7 @@ func CmdCheck(cniNetns, cniContainerID, cniIfname string, conf []byte, f func()
} }
func CmdCheckWithArgs(args *skel.CmdArgs, f func() error) error { func CmdCheckWithArgs(args *skel.CmdArgs, f func() error) error {
return CmdCheck(args.Netns, args.ContainerID, args.IfName, args.StdinData, f) return CmdCheck(args.Netns, args.ContainerID, args.IfName, f)
} }
func CmdDel(cniNetns, cniContainerID, cniIfname string, f func() error) error { func CmdDel(cniNetns, cniContainerID, cniIfname string, f func() error) error {

2
plugins/ipam/dhcp/daemon.go
View File

@ -115,7 +115,7 @@ func (d *DHCP) Allocate(args *skel.CmdArgs, result *current.Result) error {
// Release stops maintenance of the lease acquired in Allocate() // Release stops maintenance of the lease acquired in Allocate()
// and sends a release msg to the DHCP server. // and sends a release msg to the DHCP server.
func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error { func (d *DHCP) Release(args *skel.CmdArgs, _ *struct{}) error {
conf := NetConf{} conf := NetConf{}
if err := json.Unmarshal(args.StdinData, &conf); err != nil { if err := json.Unmarshal(args.StdinData, &conf); err != nil {
return fmt.Errorf("error parsing netconf: %v", err) return fmt.Errorf("error parsing netconf: %v", err)

6
plugins/ipam/dhcp/dhcp2_test.go
View File

@ -16,7 +16,6 @@ package main
import ( import (
"fmt" "fmt"
"net"
"os" "os"
"os/exec" "os/exec"
"sync" "sync"
@ -39,11 +38,10 @@ var _ = Describe("DHCP Multiple Lease Operations", func() {
var clientCmd *exec.Cmd var clientCmd *exec.Cmd
var socketPath string var socketPath string
var tmpDir string var tmpDir string
var serverIP net.IPNet
var err error var err error
BeforeEach(func() { BeforeEach(func() {
dhcpServerStopCh, serverIP, socketPath, originalNS, targetNS, err = dhcpSetupOriginalNS() dhcpServerStopCh, socketPath, originalNS, targetNS, err = dhcpSetupOriginalNS()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Move the container side to the container's NS // Move the container side to the container's NS
@ -63,7 +61,7 @@ var _ = Describe("DHCP Multiple Lease Operations", func() {
}) })
// Start the DHCP server // Start the DHCP server
dhcpServerDone, err = dhcpServerStart(originalNS, net.IPv4(192, 168, 1, 5), serverIP.IP, 2, dhcpServerStopCh) dhcpServerDone, err = dhcpServerStart(originalNS, 2, dhcpServerStopCh)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Start the DHCP client daemon // Start the DHCP client daemon

18
plugins/ipam/dhcp/dhcp_test.go
View File

@ -48,7 +48,7 @@ func getTmpDir() (string, error) {
return tmpDir, err return tmpDir, err
} }
func dhcpServerStart(netns ns.NetNS, leaseIP, serverIP net.IP, numLeases int, stopCh <-chan bool) (*sync.WaitGroup, error) { func dhcpServerStart(netns ns.NetNS, numLeases int, stopCh <-chan bool) (*sync.WaitGroup, error) {
// Add the expected IP to the pool // Add the expected IP to the pool
lp := memorypool.MemoryPool{} lp := memorypool.MemoryPool{}
@ -200,7 +200,7 @@ var _ = Describe("DHCP Operations", func() {
}) })
// Start the DHCP server // Start the DHCP server
dhcpServerDone, err = dhcpServerStart(originalNS, net.IPv4(192, 168, 1, 5), serverIP.IP, 1, dhcpServerStopCh) dhcpServerDone, err = dhcpServerStart(originalNS, 1, dhcpServerStopCh)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Start the DHCP client daemon // Start the DHCP client daemon
@ -361,7 +361,7 @@ const (
contVethName1 string = "eth1" contVethName1 string = "eth1"
) )
func dhcpSetupOriginalNS() (chan bool, net.IPNet, string, ns.NetNS, ns.NetNS, error) { func dhcpSetupOriginalNS() (chan bool, string, ns.NetNS, ns.NetNS, error) {
var originalNS, targetNS ns.NetNS var originalNS, targetNS ns.NetNS
var dhcpServerStopCh chan bool var dhcpServerStopCh chan bool
var socketPath string var socketPath string
@ -382,11 +382,6 @@ func dhcpSetupOriginalNS() (chan bool, net.IPNet, string, ns.NetNS, ns.NetNS, er
targetNS, err = testutils.NewNS() targetNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
serverIP := net.IPNet{
IP: net.IPv4(192, 168, 1, 1),
Mask: net.IPv4Mask(255, 255, 255, 0),
}
// Use (original) NS // Use (original) NS
err = originalNS.Do(func(ns.NetNS) error { err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
@ -481,7 +476,7 @@ func dhcpSetupOriginalNS() (chan bool, net.IPNet, string, ns.NetNS, ns.NetNS, er
return nil return nil
}) })
return dhcpServerStopCh, serverIP, socketPath, originalNS, targetNS, err return dhcpServerStopCh, socketPath, originalNS, targetNS, err
} }
var _ = Describe("DHCP Lease Unavailable Operations", func() { var _ = Describe("DHCP Lease Unavailable Operations", func() {
@ -491,11 +486,10 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
var clientCmd *exec.Cmd var clientCmd *exec.Cmd
var socketPath string var socketPath string
var tmpDir string var tmpDir string
var serverIP net.IPNet
var err error var err error
BeforeEach(func() { BeforeEach(func() {
dhcpServerStopCh, serverIP, socketPath, originalNS, targetNS, err = dhcpSetupOriginalNS() dhcpServerStopCh, socketPath, originalNS, targetNS, err = dhcpSetupOriginalNS()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Move the container side to the container's NS // Move the container side to the container's NS
@ -515,7 +509,7 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
}) })
// Start the DHCP server // Start the DHCP server
dhcpServerDone, err = dhcpServerStart(originalNS, net.IPv4(192, 168, 1, 5), serverIP.IP, 1, dhcpServerStopCh) dhcpServerDone, err = dhcpServerStart(originalNS, 1, dhcpServerStopCh)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Start the DHCP client daemon // Start the DHCP client daemon

8
plugins/ipam/dhcp/lease.go
View File

@ -234,7 +234,7 @@ func (l *DHCPLease) getAllOptions() dhcp4.Options {
} }
func (l *DHCPLease) acquire() error { func (l *DHCPLease) acquire() error {
c, err := newDHCPClient(l.link, l.clientID, l.timeout, l.broadcast) c, err := newDHCPClient(l.link, l.timeout, l.broadcast)
if err != nil { if err != nil {
return err return err
} }
@ -362,7 +362,7 @@ func (l *DHCPLease) downIface() {
} }
func (l *DHCPLease) renew() error { func (l *DHCPLease) renew() error {
c, err := newDHCPClient(l.link, l.clientID, l.timeout, l.broadcast) c, err := newDHCPClient(l.link, l.timeout, l.broadcast)
if err != nil { if err != nil {
return err return err
} }
@ -391,7 +391,7 @@ func (l *DHCPLease) renew() error {
func (l *DHCPLease) release() error { func (l *DHCPLease) release() error {
log.Printf("%v: releasing lease", l.clientID) log.Printf("%v: releasing lease", l.clientID)
c, err := newDHCPClient(l.link, l.clientID, l.timeout, l.broadcast) c, err := newDHCPClient(l.link, l.timeout, l.broadcast)
if err != nil { if err != nil {
return err return err
} }
@ -485,7 +485,7 @@ func backoffRetry(resendMax time.Duration, f func() (*dhcp4.Packet, error)) (*dh
} }
func newDHCPClient( func newDHCPClient(
link netlink.Link, clientID string, link netlink.Link,
timeout time.Duration, timeout time.Duration,
broadcast bool, broadcast bool,
) (*dhcp4client.Client, error) { ) (*dhcp4client.Client, error) {

11
plugins/ipam/dhcp/main.go
View File

@ -118,10 +118,7 @@ func cmdAdd(args *skel.CmdArgs) error {
func cmdDel(args *skel.CmdArgs) error { func cmdDel(args *skel.CmdArgs) error {
result := struct{}{} result := struct{}{}
if err := rpcCall("DHCP.Release", args, &result); err != nil { return rpcCall("DHCP.Release", args, &result)
return err
}
return nil
} }
func cmdCheck(args *skel.CmdArgs) error { func cmdCheck(args *skel.CmdArgs) error {
@ -134,11 +131,7 @@ func cmdCheck(args *skel.CmdArgs) error {
} }
result := &current.Result{CNIVersion: current.ImplementedSpecVersion} result := &current.Result{CNIVersion: current.ImplementedSpecVersion}
if err := rpcCall("DHCP.Allocate", args, result); err != nil { return rpcCall("DHCP.Allocate", args, result)
return err
}
return nil
} }
func getSocketPath(stdinData []byte) (string, error) { func getSocketPath(stdinData []byte) (string, error) {

12
plugins/ipam/host-local/backend/disk/backend.go
View File

@ -95,7 +95,7 @@ func (s *Store) LastReservedIP(rangeID string) (net.IP, error) {
return net.ParseIP(string(data)), nil return net.ParseIP(string(data)), nil
} }
func (s *Store) FindByKey(id string, ifname string, match string) (bool, error) { func (s *Store) FindByKey(match string) (bool, error) {
found := false found := false
err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error { err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
@ -120,18 +120,18 @@ func (s *Store) FindByID(id string, ifname string) bool {
found := false found := false
match := strings.TrimSpace(id) + LineBreak + ifname match := strings.TrimSpace(id) + LineBreak + ifname
found, err := s.FindByKey(id, ifname, match) found, err := s.FindByKey(match)
// Match anything created by this id // Match anything created by this id
if !found && err == nil { if !found && err == nil {
match := strings.TrimSpace(id) match := strings.TrimSpace(id)
found, _ = s.FindByKey(id, ifname, match) found, _ = s.FindByKey(match)
} }
return found return found
} }
func (s *Store) ReleaseByKey(id string, ifname string, match string) (bool, error) { func (s *Store) ReleaseByKey(match string) (bool, error) {
found := false found := false
err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error { err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
if err != nil || info.IsDir() { if err != nil || info.IsDir() {
@ -157,12 +157,12 @@ func (s *Store) ReleaseByKey(id string, ifname string, match string) (bool, erro
func (s *Store) ReleaseByID(id string, ifname string) error { func (s *Store) ReleaseByID(id string, ifname string) error {
found := false found := false
match := strings.TrimSpace(id) + LineBreak + ifname match := strings.TrimSpace(id) + LineBreak + ifname
found, err := s.ReleaseByKey(id, ifname, match) found, err := s.ReleaseByKey(match)
// For backwards compatibility, look for files written by a previous version // For backwards compatibility, look for files written by a previous version
if !found && err == nil { if !found && err == nil {
match := strings.TrimSpace(id) match := strings.TrimSpace(id)
_, err = s.ReleaseByKey(id, ifname, match) _, err = s.ReleaseByKey(match)
} }
return err return err
} }

6
plugins/ipam/host-local/backend/testing/fake_store.go
View File

@ -45,7 +45,7 @@ func (s *FakeStore) Close() error {
return nil return nil
} }
func (s *FakeStore) Reserve(id string, ifname string, ip net.IP, rangeID string) (bool, error) { func (s *FakeStore) Reserve(id string, _ string, ip net.IP, rangeID string) (bool, error) {
key := ip.String() key := ip.String()
if _, ok := s.ipMap[key]; !ok { if _, ok := s.ipMap[key]; !ok {
s.ipMap[key] = id s.ipMap[key] = id
@ -63,7 +63,7 @@ func (s *FakeStore) LastReservedIP(rangeID string) (net.IP, error) {
return ip, nil return ip, nil
} }
func (s *FakeStore) ReleaseByID(id string, ifname string) error { func (s *FakeStore) ReleaseByID(id string, _ string) error {
toDelete := []string{} toDelete := []string{}
for k, v := range s.ipMap { for k, v := range s.ipMap {
if v == id { if v == id {
@ -76,7 +76,7 @@ func (s *FakeStore) ReleaseByID(id string, ifname string) error {
return nil return nil
} }
func (s *FakeStore) GetByID(id string, ifname string) []net.IP { func (s *FakeStore) GetByID(id string, _ string) []net.IP {
var ips []net.IP var ips []net.IP
for k, v := range s.ipMap { for k, v := range s.ipMap {
if v == id { if v == id {

2
plugins/ipam/static/main.go
View File

@ -276,7 +276,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return types.PrintResult(result, confVersion) return types.PrintResult(result, confVersion)
} }
func cmdDel(args *skel.CmdArgs) error { func cmdDel(_ *skel.CmdArgs) error {
// Nothing required because of no resource allocation in static plugin. // Nothing required because of no resource allocation in static plugin.
return nil return nil
} }

13
plugins/main/bridge/bridge.go
View File

@ -508,10 +508,7 @@ func cmdAdd(args *skel.CmdArgs) error {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1") _, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
// Add the IP to the interface // Add the IP to the interface
if err := ipam.ConfigureIface(args.IfName, result); err != nil { return ipam.ConfigureIface(args.IfName, result)
return err
}
return nil
}); err != nil { }); err != nil {
return err return err
} }
@ -953,7 +950,7 @@ func cmdCheck(args *skel.CmdArgs) error {
} }
// Check prevResults for ips, routes and dns against values found in the container // Check prevResults for ips, routes and dns against values found in the container
if err := netns.Do(func(_ ns.NetNS) error { return netns.Do(func(_ ns.NetNS) error {
err = ip.ValidateExpectedInterfaceIPs(args.IfName, result.IPs) err = ip.ValidateExpectedInterfaceIPs(args.IfName, result.IPs)
if err != nil { if err != nil {
return err return err
@ -964,11 +961,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return err return err
} }
return nil return nil
}); err != nil { })
return err
}
return nil
} }
func uniqueID(containerID, cniIface string) string { func uniqueID(containerID, cniIface string) string {

18
plugins/main/bridge/bridge_test.go
View File

@ -296,7 +296,7 @@ func (tc testCase) createCmdArgs(targetNS ns.NetNS, dataDir string) *skel.CmdArg
// createCheckCmdArgs generates network configuration and creates command // createCheckCmdArgs generates network configuration and creates command
// arguments for a Check test case. // arguments for a Check test case.
func (tc testCase) createCheckCmdArgs(targetNS ns.NetNS, config *Net, dataDir string) *skel.CmdArgs { func (tc testCase) createCheckCmdArgs(targetNS ns.NetNS, config *Net) *skel.CmdArgs {
conf, err := json.Marshal(config) conf, err := json.Marshal(config)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -660,9 +660,9 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
return result, nil return result, nil
} }
func (tester *testerV10x) cmdCheckTest(tc testCase, conf *Net, dataDir string) { func (tester *testerV10x) cmdCheckTest(tc testCase, conf *Net, _ string) {
// Generate network config and command arguments // Generate network config and command arguments
tester.args = tc.createCheckCmdArgs(tester.targetNS, conf, dataDir) tester.args = tc.createCheckCmdArgs(tester.targetNS, conf)
// Execute cmdCHECK on the plugin // Execute cmdCHECK on the plugin
err := tester.testNS.Do(func(ns.NetNS) error { err := tester.testNS.Do(func(ns.NetNS) error {
@ -960,9 +960,9 @@ func (tester *testerV04x) cmdAddTest(tc testCase, dataDir string) (types.Result,
return result, nil return result, nil
} }
func (tester *testerV04x) cmdCheckTest(tc testCase, conf *Net, dataDir string) { func (tester *testerV04x) cmdCheckTest(tc testCase, conf *Net, _ string) {
// Generate network config and command arguments // Generate network config and command arguments
tester.args = tc.createCheckCmdArgs(tester.targetNS, conf, dataDir) tester.args = tc.createCheckCmdArgs(tester.targetNS, conf)
// Execute cmdCHECK on the plugin // Execute cmdCHECK on the plugin
err := tester.testNS.Do(func(ns.NetNS) error { err := tester.testNS.Do(func(ns.NetNS) error {
@ -1258,10 +1258,10 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,
return result, nil return result, nil
} }
func (tester *testerV03x) cmdCheckTest(tc testCase, conf *Net, dataDir string) { func (tester *testerV03x) cmdCheckTest(_ testCase, _ *Net, _ string) {
} }
func (tester *testerV03x) cmdDelTest(tc testCase, dataDir string) { func (tester *testerV03x) cmdDelTest(_ testCase, _ string) {
err := tester.testNS.Do(func(ns.NetNS) error { err := tester.testNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
@ -1488,10 +1488,10 @@ func (tester *testerV01xOr02x) cmdAddTest(tc testCase, dataDir string) (types.Re
return nil, nil return nil, nil
} }
func (tester *testerV01xOr02x) cmdCheckTest(tc testCase, conf *Net, dataDir string) { func (tester *testerV01xOr02x) cmdCheckTest(_ testCase, _ *Net, _ string) {
} }
func (tester *testerV01xOr02x) cmdDelTest(tc testCase, dataDir string) { func (tester *testerV01xOr02x) cmdDelTest(tc testCase, _ string) {
err := tester.testNS.Do(func(ns.NetNS) error { err := tester.testNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()

9
plugins/main/dummy/dummy.go
View File

@ -40,7 +40,7 @@ func parseNetConf(bytes []byte) (*types.NetConf, error) {
return conf, nil return conf, nil
} }
func createDummy(conf *types.NetConf, ifName string, netns ns.NetNS) (*current.Interface, error) { func createDummy(ifName string, netns ns.NetNS) (*current.Interface, error) {
dummy := &current.Interface{} dummy := &current.Interface{}
dm := &netlink.Dummy{ dm := &netlink.Dummy{
@ -90,7 +90,7 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
defer netns.Close() defer netns.Close()
dummyInterface, err := createDummy(conf, args.IfName, netns) dummyInterface, err := createDummy(args.IfName, netns)
if err != nil { if err != nil {
return err return err
} }
@ -134,10 +134,7 @@ func cmdAdd(args *skel.CmdArgs) error {
result.Interfaces = []*current.Interface{dummyInterface} result.Interfaces = []*current.Interface{dummyInterface}
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
if err := ipam.ConfigureIface(args.IfName, result); err != nil { return ipam.ConfigureIface(args.IfName, result)
return err
}
return nil
}) })
if err != nil { if err != nil {

10
plugins/main/dummy/dummy_test.go
View File

@ -151,7 +151,7 @@ func (t *testerV03x) verifyResult(result types.Result, name string) string {
} }
// verifyResult minimally verifies the Result and returns the interface's MAC address // verifyResult minimally verifies the Result and returns the interface's MAC address
func (t *testerV01xOr02x) verifyResult(result types.Result, name string) string { func (t *testerV01xOr02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result) r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -210,17 +210,11 @@ var _ = Describe("dummy Operations", func() {
ver := ver ver := ver
It(fmt.Sprintf("[%s] creates an dummy link in a non-default namespace", ver), func() { It(fmt.Sprintf("[%s] creates an dummy link in a non-default namespace", ver), func() {
conf := &types.NetConf{
CNIVersion: ver,
Name: "testConfig",
Type: "dummy",
}
// Create dummy in other namespace // Create dummy in other namespace
err := originalNS.Do(func(ns.NetNS) error { err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := createDummy(conf, "foobar0", targetNS) _, err := createDummy("foobar0", targetNS)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
return nil return nil
}) })

5
plugins/main/host-device/host-device.go
View File

@ -158,10 +158,7 @@ func cmdAdd(args *skel.CmdArgs) error {
if !cfg.DPDKMode { if !cfg.DPDKMode {
err = containerNs.Do(func(_ ns.NetNS) error { err = containerNs.Do(func(_ ns.NetNS) error {
if err := ipam.ConfigureIface(args.IfName, newResult); err != nil { return ipam.ConfigureIface(args.IfName, newResult)
return err
}
return nil
}) })
if err != nil { if err != nil {
return err return err

14
plugins/main/ipvlan/ipvlan.go
View File

@ -294,10 +294,7 @@ func cmdAdd(args *skel.CmdArgs) error {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1") _, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
if err := ipam.ConfigureIface(args.IfName, result); err != nil { return ipam.ConfigureIface(args.IfName, result)
return err
}
return nil
}) })
if err != nil { if err != nil {
return err return err
@ -405,14 +402,13 @@ func cmdCheck(args *skel.CmdArgs) error {
contMap.Sandbox, args.Netns) contMap.Sandbox, args.Netns)
} }
var m netlink.Link
if n.LinkContNs { if n.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
m, err = netlink.LinkByName(n.Master) _, err = netlink.LinkByName(n.Master)
return err return err
}) })
} else { } else {
m, err = netlink.LinkByName(n.Master) _, err = netlink.LinkByName(n.Master)
} }
if err != nil { if err != nil {
@ -422,7 +418,7 @@ func cmdCheck(args *skel.CmdArgs) error {
// Check prevResults for ips, routes and dns against values found in the container // Check prevResults for ips, routes and dns against values found in the container
if err := netns.Do(func(_ ns.NetNS) error { if err := netns.Do(func(_ ns.NetNS) error {
// Check interface against values found in the container // Check interface against values found in the container
err := validateCniContainerInterface(contMap, m.Attrs().Index, n.Mode) err := validateCniContainerInterface(contMap, n.Mode)
if err != nil { if err != nil {
return err return err
} }
@ -444,7 +440,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return nil return nil
} }
func validateCniContainerInterface(intf current.Interface, masterIndex int, modeExpected string) error { func validateCniContainerInterface(intf current.Interface, modeExpected string) error {
var link netlink.Link var link netlink.Link
var err error var err error

2
plugins/main/ipvlan/ipvlan_test.go
View File

@ -250,7 +250,7 @@ func (t *testerV04x) verifyResult(result types.Result, name string) string {
} }
// verifyResult minimally verifies the Result and returns the interface's MAC address // verifyResult minimally verifies the Result and returns the interface's MAC address
func (t *testerV02x) verifyResult(result types.Result, name string) string { func (t *testerV02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result) r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

14
plugins/main/macvlan/macvlan.go
View File

@ -352,10 +352,7 @@ func cmdAdd(args *skel.CmdArgs) error {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1") _, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
if err := ipam.ConfigureIface(args.IfName, result); err != nil { return ipam.ConfigureIface(args.IfName, result)
return err
}
return nil
}) })
if err != nil { if err != nil {
return err return err
@ -484,14 +481,13 @@ func cmdCheck(args *skel.CmdArgs) error {
contMap.Sandbox, args.Netns) contMap.Sandbox, args.Netns)
} }
var m netlink.Link
if n.LinkContNs { if n.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
m, err = netlink.LinkByName(n.Master) _, err = netlink.LinkByName(n.Master)
return err return err
}) })
} else { } else {
m, err = netlink.LinkByName(n.Master) _, err = netlink.LinkByName(n.Master)
} }
if err != nil { if err != nil {
return fmt.Errorf("failed to lookup master %q: %v", n.Master, err) return fmt.Errorf("failed to lookup master %q: %v", n.Master, err)
@ -500,7 +496,7 @@ func cmdCheck(args *skel.CmdArgs) error {
// Check prevResults for ips, routes and dns against values found in the container // Check prevResults for ips, routes and dns against values found in the container
if err := netns.Do(func(_ ns.NetNS) error { if err := netns.Do(func(_ ns.NetNS) error {
// Check interface against values found in the container // Check interface against values found in the container
err := validateCniContainerInterface(contMap, m.Attrs().Index, n.Mode) err := validateCniContainerInterface(contMap, n.Mode)
if err != nil { if err != nil {
return err return err
} }
@ -522,7 +518,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return nil return nil
} }
func validateCniContainerInterface(intf current.Interface, parentIndex int, modeExpected string) error { func validateCniContainerInterface(intf current.Interface, modeExpected string) error {
var link netlink.Link var link netlink.Link
var err error var err error

2
plugins/main/macvlan/macvlan_test.go
View File

@ -168,7 +168,7 @@ func (t *testerV03x) verifyResult(result types.Result, err error, name string, n
} }
// verifyResult minimally verifies the Result and returns the interface's MAC address // verifyResult minimally verifies the Result and returns the interface's MAC address
func (t *testerV01xOr02x) verifyResult(result types.Result, err error, name string, numAddrs int) string { func (t *testerV01xOr02x) verifyResult(result types.Result, err error, _ string, numAddrs int) string {
if result == nil && numAddrs == 0 { if result == nil && numAddrs == 0 {
Expect(err).To(MatchError("cannot convert: no valid IP addresses")) Expect(err).To(MatchError("cannot convert: no valid IP addresses"))
return "" return ""

2
plugins/main/ptp/ptp_test.go
View File

@ -186,7 +186,7 @@ func (t *testerV03x) verifyResult(result types.Result, expectedIfName, expectedS
} }
// verifyResult minimally verifies the Result and returns the interface's IP addresses and MAC address // verifyResult minimally verifies the Result and returns the interface's IP addresses and MAC address
func (t *testerV01xOr02x) verifyResult(result types.Result, expectedIfName, expectedSandbox string, expectedDNS types.DNS) ([]resultIP, string) { func (t *testerV01xOr02x) verifyResult(result types.Result, _, _ string, _ types.DNS) ([]resultIP, string) {
r, err := types020.GetResult(result) r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

13
plugins/main/tap/tap.go
View File

@ -302,10 +302,7 @@ func cmdAdd(args *skel.CmdArgs) error {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1") _, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
if err := ipam.ConfigureIface(args.IfName, result); err != nil { return ipam.ConfigureIface(args.IfName, result)
return err
}
return nil
}) })
if err != nil { if err != nil {
return err return err
@ -433,7 +430,7 @@ func cmdCheck(args *skel.CmdArgs) error {
} }
// Check prevResults for ips, routes and dns against values found in the container // Check prevResults for ips, routes and dns against values found in the container
if err := netns.Do(func(_ ns.NetNS) error { return netns.Do(func(_ ns.NetNS) error {
err = ip.ValidateExpectedInterfaceIPs(args.IfName, result.IPs) err = ip.ValidateExpectedInterfaceIPs(args.IfName, result.IPs)
if err != nil { if err != nil {
return err return err
@ -444,9 +441,5 @@ func cmdCheck(args *skel.CmdArgs) error {
return err return err
} }
return nil return nil
}); err != nil { })
return err
}
return nil
} }

2
plugins/main/tap/tap_test.go
View File

@ -154,7 +154,7 @@ func (t *testerV03x) verifyResult(result types.Result, name string) string {
} }
// verifyResult minimally verifies the Result and returns the interface's MAC address // verifyResult minimally verifies the Result and returns the interface's MAC address
func (t *testerV01xOr02x) verifyResult(result types.Result, name string) string { func (t *testerV01xOr02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result) r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

10
plugins/main/vlan/vlan.go
View File

@ -308,14 +308,14 @@ func cmdCheck(args *skel.CmdArgs) error {
return fmt.Errorf("Sandbox in prevResult %s doesn't match configured netns: %s", return fmt.Errorf("Sandbox in prevResult %s doesn't match configured netns: %s",
contMap.Sandbox, args.Netns) contMap.Sandbox, args.Netns)
} }
var m netlink.Link
if conf.LinkContNs { if conf.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
m, err = netlink.LinkByName(conf.Master) _, err = netlink.LinkByName(conf.Master)
return err return err
}) })
} else { } else {
m, err = netlink.LinkByName(conf.Master) _, err = netlink.LinkByName(conf.Master)
} }
if err != nil { if err != nil {
@ -326,7 +326,7 @@ func cmdCheck(args *skel.CmdArgs) error {
// Check prevResults for ips, routes and dns against values found in the container // Check prevResults for ips, routes and dns against values found in the container
if err := netns.Do(func(_ ns.NetNS) error { if err := netns.Do(func(_ ns.NetNS) error {
// Check interface against values found in the container // Check interface against values found in the container
err := validateCniContainerInterface(contMap, m.Attrs().Index, conf.VlanID, conf.MTU) err := validateCniContainerInterface(contMap, conf.VlanID, conf.MTU)
if err != nil { if err != nil {
return err return err
} }
@ -348,7 +348,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return nil return nil
} }
func validateCniContainerInterface(intf current.Interface, masterIndex int, vlanID int, mtu int) error { func validateCniContainerInterface(intf current.Interface, vlanID int, mtu int) error {
var link netlink.Link var link netlink.Link
var err error var err error

2
plugins/main/vlan/vlan_test.go
View File

@ -158,7 +158,7 @@ func (t *testerV03x) verifyResult(result types.Result, name string) string {
} }
// verifyResult minimally verifies the Result and returns the interface's MAC address // verifyResult minimally verifies the Result and returns the interface's MAC address
func (t *testerV01xOr02x) verifyResult(result types.Result, name string) string { func (t *testerV01xOr02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result) r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
plugins/meta/bandwidth/bandwidth_linux_test.go
View File

@ -987,7 +987,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: newCheckBytes, StdinData: newCheckBytes,
} }
err = testutils.CmdCheck(containerWithTbfNS.Path(), args.ContainerID, "", newCheckBytes, func() error { return cmdCheck(args) }) err = testutils.CmdCheck(containerWithTbfNS.Path(), args.ContainerID, "", func() error { return cmdCheck(args) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }

6
plugins/meta/bandwidth/main.go
View File

@ -236,11 +236,7 @@ func cmdDel(args *skel.CmdArgs) error {
ifbDeviceName := getIfbDeviceName(conf.Name, args.ContainerID) ifbDeviceName := getIfbDeviceName(conf.Name, args.ContainerID)
if err := TeardownIfb(ifbDeviceName); err != nil { return TeardownIfb(ifbDeviceName)
return err
}
return nil
} }
func main() { func main() {

16
plugins/meta/firewall/firewall.go
View File

@ -116,12 +116,12 @@ func getBackend(conf *FirewallNetConf) (FirewallBackend, error) {
case "iptables": case "iptables":
return newIptablesBackend(conf) return newIptablesBackend(conf)
case "firewalld": case "firewalld":
return newFirewalldBackend(conf) return newFirewalldBackend()
} }
// Default to firewalld if it's running // Default to firewalld if it's running
if isFirewalldRunning() { if isFirewalldRunning() {
return newFirewalldBackend(conf) return newFirewalldBackend()
} }
// Otherwise iptables // Otherwise iptables
@ -175,11 +175,7 @@ func cmdDel(args *skel.CmdArgs) error {
return err return err
} }
if err := teardownIngressPolicy(conf, result); err != nil { return teardownIngressPolicy(conf)
return err
}
return nil
} }
func main() { func main() {
@ -202,9 +198,5 @@ func cmdCheck(args *skel.CmdArgs) error {
return err return err
} }
if err := backend.Check(conf, result); err != nil { return backend.Check(conf, result)
return err
}
return nil
} }

2
plugins/meta/firewall/firewalld.go
View File

@ -71,7 +71,7 @@ func isFirewalldRunning() bool {
return true return true
} }
func newFirewalldBackend(conf *FirewallNetConf) (FirewallBackend, error) { func newFirewalldBackend() (FirewallBackend, error) {
conn, err := getConn() conn, err := getConn()
if err != nil { if err != nil {
return nil, err return nil, err

8
plugins/meta/firewall/ingresspolicy.go
View File

@ -62,7 +62,7 @@ func setupIngressPolicySameBridge(conf *FirewallNetConf, prevResult *types100.Re
return nil return nil
} }
func teardownIngressPolicy(conf *FirewallNetConf, prevResult *types100.Result) error { func teardownIngressPolicy(conf *FirewallNetConf) error {
switch conf.IngressPolicy { switch conf.IngressPolicy {
case "", IngressPolicyOpen: case "", IngressPolicyOpen:
// NOP // NOP
@ -151,11 +151,7 @@ func setupIsolationChains(ipt *iptables.IPTables, bridgeName string) error {
return err return err
} }
stage2Return := withDefaultComment([]string{"-j", "RETURN"}) stage2Return := withDefaultComment([]string{"-j", "RETURN"})
if err := utils.InsertUnique(ipt, filterTableName, stage2Chain, false, stage2Return); err != nil { return utils.InsertUnique(ipt, filterTableName, stage2Chain, false, stage2Return)
return err
}
return nil
} }
func isolationStage1BridgeRule(bridgeName, stage2Chain string) []string { func isolationStage1BridgeRule(bridgeName, stage2Chain string) []string {

12
plugins/meta/firewall/iptables.go
View File

@ -74,11 +74,7 @@ func (ib *iptablesBackend) setupChains(ipt *iptables.IPTables) error {
} }
// Ensure our admin override chain rule exists in our private chain // Ensure our admin override chain rule exists in our private chain
if err := ensureFirstChainRule(ipt, ib.privChainName, adminRule); err != nil { return ensureFirstChainRule(ipt, ib.privChainName, adminRule)
return err
}
return nil
} }
func protoForIP(ip net.IPNet) iptables.Protocol { func protoForIP(ip net.IPNet) iptables.Protocol {
@ -88,7 +84,7 @@ func protoForIP(ip net.IPNet) iptables.Protocol {
return iptables.ProtocolIPv6 return iptables.ProtocolIPv6
} }
func (ib *iptablesBackend) addRules(conf *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error { func (ib *iptablesBackend) addRules(_ *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
rules := make([][]string, 0) rules := make([][]string, 0)
for _, ip := range result.IPs { for _, ip := range result.IPs {
if protoForIP(ip.Address) == proto { if protoForIP(ip.Address) == proto {
@ -120,7 +116,7 @@ func (ib *iptablesBackend) addRules(conf *FirewallNetConf, result *current.Resul
return nil return nil
} }
func (ib *iptablesBackend) delRules(conf *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error { func (ib *iptablesBackend) delRules(_ *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
rules := make([][]string, 0) rules := make([][]string, 0)
for _, ip := range result.IPs { for _, ip := range result.IPs {
if protoForIP(ip.Address) == proto { if protoForIP(ip.Address) == proto {
@ -135,7 +131,7 @@ func (ib *iptablesBackend) delRules(conf *FirewallNetConf, result *current.Resul
return nil return nil
} }
func (ib *iptablesBackend) checkRules(conf *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error { func (ib *iptablesBackend) checkRules(_ *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
rules := make([][]string, 0) rules := make([][]string, 0)
for _, ip := range result.IPs { for _, ip := range result.IPs {
if protoForIP(ip.Address) == proto { if protoForIP(ip.Address) == proto {

5
plugins/meta/portmap/main.go
View File

@ -130,10 +130,7 @@ func cmdDel(args *skel.CmdArgs) error {
// We don't need to parse out whether or not we're using v6 or snat, // We don't need to parse out whether or not we're using v6 or snat,
// deletion is idempotent // deletion is idempotent
if err := unforwardPorts(netConf); err != nil { return unforwardPorts(netConf)
return err
}
return nil
} }
func main() { func main() {

6
plugins/meta/sbr/main.go
View File

@ -164,7 +164,7 @@ func cmdAdd(args *skel.CmdArgs) error {
// Do the actual work. // Do the actual work.
err = withLockAndNetNS(args.Netns, func(_ ns.NetNS) error { err = withLockAndNetNS(args.Netns, func(_ ns.NetNS) error {
return doRoutes(ipCfgs, conf.PrevResult.Routes, args.IfName) return doRoutes(ipCfgs, args.IfName)
}) })
if err != nil { if err != nil {
return err return err
@ -203,7 +203,7 @@ func getNextTableID(rules []netlink.Rule, routes []netlink.Route, candidateID in
} }
// doRoutes does all the work to set up routes and rules during an add. // doRoutes does all the work to set up routes and rules during an add.
func doRoutes(ipCfgs []*current.IPConfig, origRoutes []*types.Route, iface string) error { func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
// Get a list of rules and routes ready. // Get a list of rules and routes ready.
rules, err := netlink.RuleList(netlink.FAMILY_ALL) rules, err := netlink.RuleList(netlink.FAMILY_ALL)
if err != nil { if err != nil {
@ -398,6 +398,6 @@ func main() {
skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("sbr")) skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("sbr"))
} }
func cmdCheck(args *skel.CmdArgs) error { func cmdCheck(_ *skel.CmdArgs) error {
return nil return nil
} }

2
plugins/sample/main.go
View File

@ -153,7 +153,7 @@ func main() {
skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("TODO")) skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("TODO"))
} }
func cmdCheck(args *skel.CmdArgs) error { func cmdCheck(_ *skel.CmdArgs) error {
// TODO: implement // TODO: implement
return fmt.Errorf("not implemented") return fmt.Errorf("not implemented")
} }