Skip to content

Commit 019727a

Browse files
squeedsqueed
authored
Merge pull request #1005 from austinvazquez/update-golangci-lint-action-package
Update golangci-lint-action package to v4
2 parents 0729398 + 352e051 commit 019727a

File tree

12 files changed

+20
-30
lines changed

12 files changed

+20
-30
lines changed

‎.github/workflows/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: ibiqlik/action-yamllint@v3
2121
with:
2222
format: auto
23-
- uses: golangci/golangci-lint-action@v3
23+
- uses: golangci/golangci-lint-action@v4
2424
with:
2525
version: v1.55.2
2626
args: -v

‎plugins/main/bridge/bridge.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,6 @@ func cmdDel(args *skel.CmdArgs) error {
790790
}
791791
return err
792792
})
793-
794793
if err != nil {
795794
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
796795
// so don't return an error if the device is already removed.

‎plugins/main/dummy/dummy.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ func cmdAdd(args *skel.CmdArgs) error {
136136
err = netns.Do(func(_ ns.NetNS) error {
137137
return ipam.ConfigureIface(args.IfName, result)
138138
})
139-
140139
if err != nil {
141140
return err
142141
}
@@ -165,7 +164,6 @@ func cmdDel(args *skel.CmdArgs) error {
165164
}
166165
return err
167166
})
168-
169167
if err != nil {
170168
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
171169
// so don't return an error if the device is already removed.

‎plugins/main/dummy/dummy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ var _ = Describe("dummy Operations", func() {
371371
StdinData: []byte(fmt.Sprintf(confFmt, ver)),
372372
}
373373

374-
_ = originalNS.Do(func(netNS ns.NetNS) error {
374+
_ = originalNS.Do(func(_ ns.NetNS) error {
375375
defer GinkgoRecover()
376376

377377
_, _, err = testutils.CmdAddWithArgs(args, func() error {

‎plugins/main/ipvlan/ipvlan.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ func cmdDel(args *skel.CmdArgs) error {
334334
}
335335
return nil
336336
})
337-
338337
if err != nil {
339338
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
340339
// so don't return an error if the device is already removed.

‎plugins/main/macvlan/macvlan.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ func cmdDel(args *skel.CmdArgs) error {
411411
}
412412
return nil
413413
})
414-
415414
if err != nil {
416415
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
417416
// so don't return an error if the device is already removed.

‎plugins/main/tap/tap.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ func cmdDel(args *skel.CmdArgs) error {
371371
}
372372
return nil
373373
})
374-
375374
if err != nil {
376375
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
377376
// so don't return an error if the device is already removed.

‎plugins/main/vlan/vlan.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ func cmdDel(args *skel.CmdArgs) error {
244244
}
245245
return err
246246
})
247-
248247
if err != nil {
249248
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
250249
// so don't return an error if the device is already removed.

‎plugins/main/vlan/vlan_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ var _ = Describe("vlan Operations", func() {
499499
StdinData: []byte(fmt.Sprintf(confFmt, ver, masterInterface, 1600, isInContainer, dataDir)),
500500
}
501501

502-
_ = originalNS.Do(func(netNS ns.NetNS) error {
502+
_ = originalNS.Do(func(_ ns.NetNS) error {
503503
defer GinkgoRecover()
504504

505505
_, _, err = testutils.CmdAddWithArgs(args, func() error {
@@ -520,7 +520,7 @@ var _ = Describe("vlan Operations", func() {
520520
StdinData: []byte(fmt.Sprintf(confFmt, ver, masterInterface, -100, isInContainer, dataDir)),
521521
}
522522

523-
_ = originalNS.Do(func(netNS ns.NetNS) error {
523+
_ = originalNS.Do(func(_ ns.NetNS) error {
524524
defer GinkgoRecover()
525525

526526
_, _, err = testutils.CmdAddWithArgs(args, func() error {

‎plugins/meta/bandwidth/bandwidth_linux_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ var _ = Describe("bandwidth test", func() {
165165
StdinData: []byte(conf),
166166
}
167167

168-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
168+
Expect(hostNs.Do(func(_ ns.NetNS) error {
169169
defer GinkgoRecover()
170170
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
171171
Expect(err).NotTo(HaveOccurred(), string(out))
@@ -202,7 +202,7 @@ var _ = Describe("bandwidth test", func() {
202202
return nil
203203
})).To(Succeed())
204204

205-
Expect(hostNs.Do(func(n ns.NetNS) error {
205+
Expect(hostNs.Do(func(_ ns.NetNS) error {
206206
defer GinkgoRecover()
207207

208208
ifbLink, err := netlink.LinkByName(hostIfname)
@@ -260,7 +260,7 @@ var _ = Describe("bandwidth test", func() {
260260
StdinData: []byte(conf),
261261
}
262262

263-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
263+
Expect(hostNs.Do(func(_ ns.NetNS) error {
264264
defer GinkgoRecover()
265265

266266
_, 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() {
271271
return nil
272272
})).To(Succeed())
273273

274-
Expect(hostNs.Do(func(n ns.NetNS) error {
274+
Expect(hostNs.Do(func(_ ns.NetNS) error {
275275
defer GinkgoRecover()
276276

277277
containerIfLink, err := netlink.LinkByName(hostIfname)
@@ -327,7 +327,7 @@ var _ = Describe("bandwidth test", func() {
327327
StdinData: []byte(conf),
328328
}
329329

330-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
330+
Expect(hostNs.Do(func(_ ns.NetNS) error {
331331
defer GinkgoRecover()
332332

333333
_, 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() {
338338
return nil
339339
})).To(Succeed())
340340

341-
Expect(hostNs.Do(func(n ns.NetNS) error {
341+
Expect(hostNs.Do(func(_ ns.NetNS) error {
342342
defer GinkgoRecover()
343343

344344
containerIfLink, err := netlink.LinkByName(hostIfname)
@@ -396,7 +396,7 @@ var _ = Describe("bandwidth test", func() {
396396
StdinData: []byte(conf),
397397
}
398398

399-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
399+
Expect(hostNs.Do(func(_ ns.NetNS) error {
400400
defer GinkgoRecover()
401401

402402
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@@ -448,7 +448,7 @@ var _ = Describe("bandwidth test", func() {
448448
StdinData: []byte(conf),
449449
}
450450

451-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
451+
Expect(hostNs.Do(func(_ ns.NetNS) error {
452452
defer GinkgoRecover()
453453
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
454454
Expect(err).NotTo(HaveOccurred(), string(out))
@@ -485,7 +485,7 @@ var _ = Describe("bandwidth test", func() {
485485
return nil
486486
})).To(Succeed())
487487

488-
Expect(hostNs.Do(func(n ns.NetNS) error {
488+
Expect(hostNs.Do(func(_ ns.NetNS) error {
489489
defer GinkgoRecover()
490490

491491
ifbLink, err := netlink.LinkByName(hostIfname)
@@ -551,7 +551,7 @@ var _ = Describe("bandwidth test", func() {
551551
StdinData: []byte(conf),
552552
}
553553

554-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
554+
Expect(hostNs.Do(func(_ ns.NetNS) error {
555555
defer GinkgoRecover()
556556

557557
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@@ -601,7 +601,7 @@ var _ = Describe("bandwidth test", func() {
601601
StdinData: []byte(conf),
602602
}
603603

604-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
604+
Expect(hostNs.Do(func(_ ns.NetNS) error {
605605
defer GinkgoRecover()
606606
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
607607
Expect(err).NotTo(HaveOccurred(), string(out))
@@ -669,7 +669,7 @@ var _ = Describe("bandwidth test", func() {
669669
StdinData: []byte(conf),
670670
}
671671

672-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
672+
Expect(hostNs.Do(func(_ ns.NetNS) error {
673673
defer GinkgoRecover()
674674
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
675675
Expect(err).NotTo(HaveOccurred(), string(out))
@@ -706,7 +706,7 @@ var _ = Describe("bandwidth test", func() {
706706
return nil
707707
})).To(Succeed())
708708

709-
Expect(hostNs.Do(func(n ns.NetNS) error {
709+
Expect(hostNs.Do(func(_ ns.NetNS) error {
710710
defer GinkgoRecover()
711711

712712
ifbLink, err := netlink.LinkByName(hostIfname)
@@ -768,7 +768,7 @@ var _ = Describe("bandwidth test", func() {
768768
StdinData: []byte(conf),
769769
}
770770

771-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
771+
Expect(hostNs.Do(func(_ ns.NetNS) error {
772772
defer GinkgoRecover()
773773

774774
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@@ -801,7 +801,7 @@ var _ = Describe("bandwidth test", func() {
801801
StdinData: []byte(conf),
802802
}
803803

804-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
804+
Expect(hostNs.Do(func(_ ns.NetNS) error {
805805
defer GinkgoRecover()
806806

807807
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@@ -853,7 +853,7 @@ var _ = Describe("bandwidth test", func() {
853853
StdinData: []byte(conf),
854854
}
855855

856-
Expect(hostNs.Do(func(netNS ns.NetNS) error {
856+
Expect(hostNs.Do(func(_ ns.NetNS) error {
857857
defer GinkgoRecover()
858858

859859
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })

0 commit comments

Comments
 (0)