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
Download Patch File Download Diff File Expand all files Collapse all files

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")
// Add the IP to the interface
if err := ipam.ConfigureIface(args.IfName, result); err != nil {
return err
}
return nil
return ipam.ConfigureIface(args.IfName, result)
}); err != nil {
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
if err := netns.Do(func(_ ns.NetNS) error {
return netns.Do(func(_ ns.NetNS) error {
err = ip.ValidateExpectedInterfaceIPs(args.IfName, result.IPs)
if err != nil {
return err
@ -964,11 +961,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return err
}
return nil
}); err != nil {
return err
}
return nil
})
}
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
// 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)
Expect(err).NotTo(HaveOccurred())
@ -660,9 +660,9 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
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
tester.args = tc.createCheckCmdArgs(tester.targetNS, conf, dataDir)
tester.args = tc.createCheckCmdArgs(tester.targetNS, conf)
// Execute cmdCHECK on the plugin
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
}
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
tester.args = tc.createCheckCmdArgs(tester.targetNS, conf, dataDir)
tester.args = tc.createCheckCmdArgs(tester.targetNS, conf)
// Execute cmdCHECK on the plugin
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
}
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 {
defer GinkgoRecover()
@ -1488,10 +1488,10 @@ func (tester *testerV01xOr02x) cmdAddTest(tc testCase, dataDir string) (types.Re
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 {
defer GinkgoRecover()

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

@ -40,7 +40,7 @@ func parseNetConf(bytes []byte) (*types.NetConf, error) {
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{}
dm := &netlink.Dummy{
@ -90,7 +90,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
defer netns.Close()
dummyInterface, err := createDummy(conf, args.IfName, netns)
dummyInterface, err := createDummy(args.IfName, netns)
if err != nil {
return err
}
@ -134,10 +134,7 @@ func cmdAdd(args *skel.CmdArgs) error {
result.Interfaces = []*current.Interface{dummyInterface}
err = netns.Do(func(_ ns.NetNS) error {
if err := ipam.ConfigureIface(args.IfName, result); err != nil {
return err
}
return nil
return ipam.ConfigureIface(args.IfName, result)
})
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
func (t *testerV01xOr02x) verifyResult(result types.Result, name string) string {
func (t *testerV01xOr02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred())
@ -210,17 +210,11 @@ var _ = Describe("dummy Operations", func() {
ver := ver
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
err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
_, err := createDummy(conf, "foobar0", targetNS)
_, err := createDummy("foobar0", targetNS)
Expect(err).NotTo(HaveOccurred())
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 {
err = containerNs.Do(func(_ ns.NetNS) error {
if err := ipam.ConfigureIface(args.IfName, newResult); err != nil {
return err
}
return nil
return ipam.ConfigureIface(args.IfName, newResult)
})
if err != nil {
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 {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
if err := ipam.ConfigureIface(args.IfName, result); err != nil {
return err
}
return nil
return ipam.ConfigureIface(args.IfName, result)
})
if err != nil {
return err
@ -405,14 +402,13 @@ func cmdCheck(args *skel.CmdArgs) error {
contMap.Sandbox, args.Netns)
}
var m netlink.Link
if n.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error {
m, err = netlink.LinkByName(n.Master)
_, err = netlink.LinkByName(n.Master)
return err
})
} else {
m, err = netlink.LinkByName(n.Master)
_, err = netlink.LinkByName(n.Master)
}
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
if err := netns.Do(func(_ ns.NetNS) error {
// Check interface against values found in the container
err := validateCniContainerInterface(contMap, m.Attrs().Index, n.Mode)
err := validateCniContainerInterface(contMap, n.Mode)
if err != nil {
return err
}
@ -444,7 +440,7 @@ func cmdCheck(args *skel.CmdArgs) error {
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 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
func (t *testerV02x) verifyResult(result types.Result, name string) string {
func (t *testerV02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result)
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 {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
if err := ipam.ConfigureIface(args.IfName, result); err != nil {
return err
}
return nil
return ipam.ConfigureIface(args.IfName, result)
})
if err != nil {
return err
@ -484,14 +481,13 @@ func cmdCheck(args *skel.CmdArgs) error {
contMap.Sandbox, args.Netns)
}
var m netlink.Link
if n.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error {
m, err = netlink.LinkByName(n.Master)
_, err = netlink.LinkByName(n.Master)
return err
})
} else {
m, err = netlink.LinkByName(n.Master)
_, err = netlink.LinkByName(n.Master)
}
if err != nil {
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
if err := netns.Do(func(_ ns.NetNS) error {
// Check interface against values found in the container
err := validateCniContainerInterface(contMap, m.Attrs().Index, n.Mode)
err := validateCniContainerInterface(contMap, n.Mode)
if err != nil {
return err
}
@ -522,7 +518,7 @@ func cmdCheck(args *skel.CmdArgs) error {
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 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
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 {
Expect(err).To(MatchError("cannot convert: no valid IP addresses"))
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
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)
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 {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
if err := ipam.ConfigureIface(args.IfName, result); err != nil {
return err
}
return nil
return ipam.ConfigureIface(args.IfName, result)
})
if err != nil {
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
if err := netns.Do(func(_ ns.NetNS) error {
return netns.Do(func(_ ns.NetNS) error {
err = ip.ValidateExpectedInterfaceIPs(args.IfName, result.IPs)
if err != nil {
return err
@ -444,9 +441,5 @@ func cmdCheck(args *skel.CmdArgs) error {
return err
}
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
func (t *testerV01xOr02x) verifyResult(result types.Result, name string) string {
func (t *testerV01xOr02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result)
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",
contMap.Sandbox, args.Netns)
}
var m netlink.Link
if conf.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error {
m, err = netlink.LinkByName(conf.Master)
_, err = netlink.LinkByName(conf.Master)
return err
})
} else {
m, err = netlink.LinkByName(conf.Master)
_, err = netlink.LinkByName(conf.Master)
}
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
if err := netns.Do(func(_ ns.NetNS) error {
// 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 {
return err
}
@ -348,7 +348,7 @@ func cmdCheck(args *skel.CmdArgs) error {
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 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
func (t *testerV01xOr02x) verifyResult(result types.Result, name string) string {
func (t *testerV01xOr02x) verifyResult(result types.Result, _ string) string {
r, err := types020.GetResult(result)
Expect(err).NotTo(HaveOccurred())