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

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

@ -987,7 +987,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: newCheckBytes,
}
err = testutils.CmdCheck(containerWithTbfNS.Path(), args.ContainerID, "", newCheckBytes, func() error { return cmdCheck(args) })
err = testutils.CmdCheck(containerWithTbfNS.Path(), args.ContainerID, "", func() error { return cmdCheck(args) })
Expect(err).NotTo(HaveOccurred())
}

6
plugins/meta/bandwidth/main.go
View File

@ -236,11 +236,7 @@ func cmdDel(args *skel.CmdArgs) error {
ifbDeviceName := getIfbDeviceName(conf.Name, args.ContainerID)
if err := TeardownIfb(ifbDeviceName); err != nil {
return err
}
return nil
return TeardownIfb(ifbDeviceName)
}
func main() {

16
plugins/meta/firewall/firewall.go
View File

@ -116,12 +116,12 @@ func getBackend(conf *FirewallNetConf) (FirewallBackend, error) {
case "iptables":
return newIptablesBackend(conf)
case "firewalld":
return newFirewalldBackend(conf)
return newFirewalldBackend()
}
// Default to firewalld if it's running
if isFirewalldRunning() {
return newFirewalldBackend(conf)
return newFirewalldBackend()
}
// Otherwise iptables
@ -175,11 +175,7 @@ func cmdDel(args *skel.CmdArgs) error {
return err
}
if err := teardownIngressPolicy(conf, result); err != nil {
return err
}
return nil
return teardownIngressPolicy(conf)
}
func main() {
@ -202,9 +198,5 @@ func cmdCheck(args *skel.CmdArgs) error {
return err
}
if err := backend.Check(conf, result); err != nil {
return err
}
return nil
return backend.Check(conf, result)
}

2
plugins/meta/firewall/firewalld.go
View File

@ -71,7 +71,7 @@ func isFirewalldRunning() bool {
return true
}
func newFirewalldBackend(conf *FirewallNetConf) (FirewallBackend, error) {
func newFirewalldBackend() (FirewallBackend, error) {
conn, err := getConn()
if err != nil {
return nil, err

8
plugins/meta/firewall/ingresspolicy.go
View File

@ -62,7 +62,7 @@ func setupIngressPolicySameBridge(conf *FirewallNetConf, prevResult *types100.Re
return nil
}
func teardownIngressPolicy(conf *FirewallNetConf, prevResult *types100.Result) error {
func teardownIngressPolicy(conf *FirewallNetConf) error {
switch conf.IngressPolicy {
case "", IngressPolicyOpen:
// NOP
@ -151,11 +151,7 @@ func setupIsolationChains(ipt *iptables.IPTables, bridgeName string) error {
return err
}
stage2Return := withDefaultComment([]string{"-j", "RETURN"})
if err := utils.InsertUnique(ipt, filterTableName, stage2Chain, false, stage2Return); err != nil {
return err
}
return nil
return utils.InsertUnique(ipt, filterTableName, stage2Chain, false, stage2Return)
}
func isolationStage1BridgeRule(bridgeName, stage2Chain string) []string {

12
plugins/meta/firewall/iptables.go
View File

@ -74,11 +74,7 @@ func (ib *iptablesBackend) setupChains(ipt *iptables.IPTables) error {
}
// Ensure our admin override chain rule exists in our private chain
if err := ensureFirstChainRule(ipt, ib.privChainName, adminRule); err != nil {
return err
}
return nil
return ensureFirstChainRule(ipt, ib.privChainName, adminRule)
}
func protoForIP(ip net.IPNet) iptables.Protocol {
@ -88,7 +84,7 @@ func protoForIP(ip net.IPNet) iptables.Protocol {
return iptables.ProtocolIPv6
}
func (ib *iptablesBackend) addRules(conf *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
func (ib *iptablesBackend) addRules(_ *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
rules := make([][]string, 0)
for _, ip := range result.IPs {
if protoForIP(ip.Address) == proto {
@ -120,7 +116,7 @@ func (ib *iptablesBackend) addRules(conf *FirewallNetConf, result *current.Resul
return nil
}
func (ib *iptablesBackend) delRules(conf *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
func (ib *iptablesBackend) delRules(_ *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
rules := make([][]string, 0)
for _, ip := range result.IPs {
if protoForIP(ip.Address) == proto {
@ -135,7 +131,7 @@ func (ib *iptablesBackend) delRules(conf *FirewallNetConf, result *current.Resul
return nil
}
func (ib *iptablesBackend) checkRules(conf *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
func (ib *iptablesBackend) checkRules(_ *FirewallNetConf, result *current.Result, ipt *iptables.IPTables, proto iptables.Protocol) error {
rules := make([][]string, 0)
for _, ip := range result.IPs {
if protoForIP(ip.Address) == proto {

5
plugins/meta/portmap/main.go
View File

@ -130,10 +130,7 @@ func cmdDel(args *skel.CmdArgs) error {
// We don't need to parse out whether or not we're using v6 or snat,
// deletion is idempotent
if err := unforwardPorts(netConf); err != nil {
return err
}
return nil
return unforwardPorts(netConf)
}
func main() {

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

@ -164,7 +164,7 @@ func cmdAdd(args *skel.CmdArgs) error {
// Do the actual work.
err = withLockAndNetNS(args.Netns, func(_ ns.NetNS) error {
return doRoutes(ipCfgs, conf.PrevResult.Routes, args.IfName)
return doRoutes(ipCfgs, args.IfName)
})
if err != nil {
return err
@ -203,7 +203,7 @@ func getNextTableID(rules []netlink.Rule, routes []netlink.Route, candidateID in
}
// doRoutes does all the work to set up routes and rules during an add.
func doRoutes(ipCfgs []*current.IPConfig, origRoutes []*types.Route, iface string) error {
func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
// Get a list of rules and routes ready.
rules, err := netlink.RuleList(netlink.FAMILY_ALL)
if err != nil {
@ -398,6 +398,6 @@ func main() {
skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("sbr"))
}
func cmdCheck(args *skel.CmdArgs) error {
func cmdCheck(_ *skel.CmdArgs) error {
return nil
}