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

Rename unused variables to resolve lint warnings

Browse Source 
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
This commit is contained in:
Austin Vazquez 2024-02-11 04:57:38 +00:00 committed by Casey Callendrello
parent 0729398940
commit 9c016b5d12
11 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -790,7 +790,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return err return err
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.

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

@ -136,7 +136,6 @@ func cmdAdd(args *skel.CmdArgs) error {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
return ipam.ConfigureIface(args.IfName, result) return ipam.ConfigureIface(args.IfName, result)
}) })
if err != nil { if err != nil {
return err return err
} }
@ -165,7 +164,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return err return err
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.

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

@ -371,7 +371,7 @@ var _ = Describe("dummy Operations", func() {
StdinData: []byte(fmt.Sprintf(confFmt, ver)), StdinData: []byte(fmt.Sprintf(confFmt, ver)),
} }
_ = originalNS.Do(func(netNS ns.NetNS) error { _ = originalNS.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err = testutils.CmdAddWithArgs(args, func() error { _, _, err = testutils.CmdAddWithArgs(args, func() error {

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

@ -334,7 +334,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return nil return nil
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.

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

@ -411,7 +411,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return nil return nil
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.

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

@ -371,7 +371,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return nil return nil
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.

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

@ -244,7 +244,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return err return err
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.

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

@ -499,7 +499,7 @@ var _ = Describe("vlan Operations", func() {
StdinData: []byte(fmt.Sprintf(confFmt, ver, masterInterface, 1600, isInContainer, dataDir)), StdinData: []byte(fmt.Sprintf(confFmt, ver, masterInterface, 1600, isInContainer, dataDir)),
} }
_ = originalNS.Do(func(netNS ns.NetNS) error { _ = originalNS.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err = testutils.CmdAddWithArgs(args, func() error { _, _, err = testutils.CmdAddWithArgs(args, func() error {
@ -520,7 +520,7 @@ var _ = Describe("vlan Operations", func() {
StdinData: []byte(fmt.Sprintf(confFmt, ver, masterInterface, -100, isInContainer, dataDir)), StdinData: []byte(fmt.Sprintf(confFmt, ver, masterInterface, -100, isInContainer, dataDir)),
} }
_ = originalNS.Do(func(netNS ns.NetNS) error { _ = originalNS.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err = testutils.CmdAddWithArgs(args, func() error { _, _, err = testutils.CmdAddWithArgs(args, func() error {

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

@ -165,7 +165,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -202,7 +202,7 @@ var _ = Describe("bandwidth test", func() {
return nil return nil
})).To(Succeed()) })).To(Succeed())
Expect(hostNs.Do(func(n ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
ifbLink, err := netlink.LinkByName(hostIfname) ifbLink, err := netlink.LinkByName(hostIfname)
@ -260,7 +260,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) }) _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) })
@ -271,7 +271,7 @@ var _ = Describe("bandwidth test", func() {
return nil return nil
})).To(Succeed()) })).To(Succeed())
Expect(hostNs.Do(func(n ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
containerIfLink, err := netlink.LinkByName(hostIfname) containerIfLink, err := netlink.LinkByName(hostIfname)
@ -327,7 +327,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) }) _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) })
@ -338,7 +338,7 @@ var _ = Describe("bandwidth test", func() {
return nil return nil
})).To(Succeed()) })).To(Succeed())
Expect(hostNs.Do(func(n ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
containerIfLink, err := netlink.LinkByName(hostIfname) containerIfLink, err := netlink.LinkByName(hostIfname)
@ -396,7 +396,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -448,7 +448,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -485,7 +485,7 @@ var _ = Describe("bandwidth test", func() {
return nil return nil
})).To(Succeed()) })).To(Succeed())
Expect(hostNs.Do(func(n ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
ifbLink, err := netlink.LinkByName(hostIfname) ifbLink, err := netlink.LinkByName(hostIfname)
@ -551,7 +551,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -601,7 +601,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -669,7 +669,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -706,7 +706,7 @@ var _ = Describe("bandwidth test", func() {
return nil return nil
})).To(Succeed()) })).To(Succeed())
Expect(hostNs.Do(func(n ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
ifbLink, err := netlink.LinkByName(hostIfname) ifbLink, err := netlink.LinkByName(hostIfname)
@ -768,7 +768,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -801,7 +801,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -853,7 +853,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })

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

@ -66,7 +66,6 @@ func withLockAndNetNS(nspath string, toRun func(_ ns.NetNS) error) error {
} }
err = ns.WithNetNSPath(nspath, toRun) err = ns.WithNetNSPath(nspath, toRun)
if err != nil { if err != nil {
return err return err
} }

2
plugins/meta/vrf/main.go
View File

@ -75,7 +75,6 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
return nil return nil
}) })
if err != nil { if err != nil {
return fmt.Errorf("cmdAdd failed: %v", err) return fmt.Errorf("cmdAdd failed: %v", err)
} }
@ -121,7 +120,6 @@ func cmdDel(args *skel.CmdArgs) error {
} }
return nil return nil
}) })
if err != nil { if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times // if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed. // so don't return an error if the device is already removed.