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

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
})