From 9c016b5d1204f55a45ac085df21d6b00badb0d7d Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Sun, 11 Feb 2024 04:57:38 +0000 Subject: [PATCH 1/2] Rename unused variables to resolve lint warnings Signed-off-by: Austin Vazquez --- plugins/main/bridge/bridge.go | 1 - plugins/main/dummy/dummy.go | 2 -- plugins/main/dummy/dummy_test.go | 2 +- plugins/main/ipvlan/ipvlan.go | 1 - plugins/main/macvlan/macvlan.go | 1 - plugins/main/tap/tap.go | 1 - plugins/main/vlan/vlan.go | 1 - plugins/main/vlan/vlan_test.go | 4 +-- .../meta/bandwidth/bandwidth_linux_test.go | 32 +++++++++---------- plugins/meta/sbr/main.go | 1 - plugins/meta/vrf/main.go | 2 -- 11 files changed, 19 insertions(+), 29 deletions(-) diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index ad5f19638..4054f6176 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -790,7 +790,6 @@ func cmdDel(args *skel.CmdArgs) error { } return err }) - if err != nil { // 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. diff --git a/plugins/main/dummy/dummy.go b/plugins/main/dummy/dummy.go index b0b5e0d25..8b3fd2dc3 100644 --- a/plugins/main/dummy/dummy.go +++ b/plugins/main/dummy/dummy.go @@ -136,7 +136,6 @@ func cmdAdd(args *skel.CmdArgs) error { err = netns.Do(func(_ ns.NetNS) error { return ipam.ConfigureIface(args.IfName, result) }) - if err != nil { return err } @@ -165,7 +164,6 @@ func cmdDel(args *skel.CmdArgs) error { } return err }) - if err != nil { // 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. diff --git a/plugins/main/dummy/dummy_test.go b/plugins/main/dummy/dummy_test.go index f5b368086..6d7c0d0a2 100644 --- a/plugins/main/dummy/dummy_test.go +++ b/plugins/main/dummy/dummy_test.go @@ -371,7 +371,7 @@ var _ = Describe("dummy Operations", func() { StdinData: []byte(fmt.Sprintf(confFmt, ver)), } - _ = originalNS.Do(func(netNS ns.NetNS) error { + _ = originalNS.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, err = testutils.CmdAddWithArgs(args, func() error { diff --git a/plugins/main/ipvlan/ipvlan.go b/plugins/main/ipvlan/ipvlan.go index 5ab9e5a92..d3645ad13 100644 --- a/plugins/main/ipvlan/ipvlan.go +++ b/plugins/main/ipvlan/ipvlan.go @@ -334,7 +334,6 @@ func cmdDel(args *skel.CmdArgs) error { } return nil }) - if err != nil { // 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. diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go index 7f6380fda..2c6e9204b 100644 --- a/plugins/main/macvlan/macvlan.go +++ b/plugins/main/macvlan/macvlan.go @@ -411,7 +411,6 @@ func cmdDel(args *skel.CmdArgs) error { } return nil }) - if err != nil { // 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. diff --git a/plugins/main/tap/tap.go b/plugins/main/tap/tap.go index 5e2c03fac..48381b4e0 100644 --- a/plugins/main/tap/tap.go +++ b/plugins/main/tap/tap.go @@ -371,7 +371,6 @@ func cmdDel(args *skel.CmdArgs) error { } return nil }) - if err != nil { // 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. diff --git a/plugins/main/vlan/vlan.go b/plugins/main/vlan/vlan.go index ed7f401fe..3f2987a33 100644 --- a/plugins/main/vlan/vlan.go +++ b/plugins/main/vlan/vlan.go @@ -244,7 +244,6 @@ func cmdDel(args *skel.CmdArgs) error { } return err }) - if err != nil { // 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. diff --git a/plugins/main/vlan/vlan_test.go b/plugins/main/vlan/vlan_test.go index e2525000f..c0cd3ed30 100644 --- a/plugins/main/vlan/vlan_test.go +++ b/plugins/main/vlan/vlan_test.go @@ -499,7 +499,7 @@ var _ = Describe("vlan Operations", func() { 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() _, _, 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)), } - _ = originalNS.Do(func(netNS ns.NetNS) error { + _ = originalNS.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, err = testutils.CmdAddWithArgs(args, func() error { diff --git a/plugins/meta/bandwidth/bandwidth_linux_test.go b/plugins/meta/bandwidth/bandwidth_linux_test.go index bce274f2f..9d2aa9cbc 100644 --- a/plugins/meta/bandwidth/bandwidth_linux_test.go +++ b/plugins/meta/bandwidth/bandwidth_linux_test.go @@ -165,7 +165,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) Expect(err).NotTo(HaveOccurred(), string(out)) @@ -202,7 +202,7 @@ var _ = Describe("bandwidth test", func() { return nil })).To(Succeed()) - Expect(hostNs.Do(func(n ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() ifbLink, err := netlink.LinkByName(hostIfname) @@ -260,7 +260,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, 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 })).To(Succeed()) - Expect(hostNs.Do(func(n ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() containerIfLink, err := netlink.LinkByName(hostIfname) @@ -327,7 +327,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, 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 })).To(Succeed()) - Expect(hostNs.Do(func(n ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() containerIfLink, err := netlink.LinkByName(hostIfname) @@ -396,7 +396,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, 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), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) Expect(err).NotTo(HaveOccurred(), string(out)) @@ -485,7 +485,7 @@ var _ = Describe("bandwidth test", func() { return nil })).To(Succeed()) - Expect(hostNs.Do(func(n ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() ifbLink, err := netlink.LinkByName(hostIfname) @@ -551,7 +551,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, 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), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) Expect(err).NotTo(HaveOccurred(), string(out)) @@ -669,7 +669,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) Expect(err).NotTo(HaveOccurred(), string(out)) @@ -706,7 +706,7 @@ var _ = Describe("bandwidth test", func() { return nil })).To(Succeed()) - Expect(hostNs.Do(func(n ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() ifbLink, err := netlink.LinkByName(hostIfname) @@ -768,7 +768,7 @@ var _ = Describe("bandwidth test", func() { StdinData: []byte(conf), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, 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), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, 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), } - Expect(hostNs.Do(func(netNS ns.NetNS) error { + Expect(hostNs.Do(func(_ ns.NetNS) error { defer GinkgoRecover() _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) diff --git a/plugins/meta/sbr/main.go b/plugins/meta/sbr/main.go index 1f575f9ca..f07e7520f 100644 --- a/plugins/meta/sbr/main.go +++ b/plugins/meta/sbr/main.go @@ -66,7 +66,6 @@ func withLockAndNetNS(nspath string, toRun func(_ ns.NetNS) error) error { } err = ns.WithNetNSPath(nspath, toRun) - if err != nil { return err } diff --git a/plugins/meta/vrf/main.go b/plugins/meta/vrf/main.go index 8729bf9ef..c83234328 100644 --- a/plugins/meta/vrf/main.go +++ b/plugins/meta/vrf/main.go @@ -75,7 +75,6 @@ func cmdAdd(args *skel.CmdArgs) error { } return nil }) - if err != nil { return fmt.Errorf("cmdAdd failed: %v", err) } @@ -121,7 +120,6 @@ func cmdDel(args *skel.CmdArgs) error { } return nil }) - if err != nil { // 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. From 352e0512e82b5252ebd79cc8761557475899e1c2 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Sun, 11 Feb 2024 04:47:35 +0000 Subject: [PATCH 2/2] Update golangci-lint-action package to v4 This change updates golangci-lint-action package to v4 to resolve NodeJS 16 deprecation warnings. Signed-off-by: Austin Vazquez --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b81c6a1fe..86a7fc67b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -20,7 +20,7 @@ jobs: - uses: ibiqlik/action-yamllint@v3 with: format: auto - - uses: golangci/golangci-lint-action@v3 + - uses: golangci/golangci-lint-action@v4 with: version: v1.55.2 args: -v