From 5a7619c0196a72d45d56db627147540a0043a8dd Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <matthieu.morel35@gmail.com>
Date: Sat, 11 Mar 2023 22:43:45 +0100
Subject: [PATCH] enable gosimple linter

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
---
 .golangci.yml                          | 2 +-
 plugins/ipam/dhcp/lease.go             | 2 +-
 plugins/ipam/host-local/main.go        | 2 +-
 plugins/main/bridge/bridge_test.go     | 2 --
 plugins/meta/firewall/ingresspolicy.go | 2 +-
 plugins/meta/tuning/tuning.go          | 6 +++---
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index aa6c0355..c77f4cc9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,13 +3,13 @@ linters:
     - contextcheck
     - gci
     - gofumpt
+    - gosimple
     - ineffassign
     - misspell
     - nonamedreturns
     - staticcheck
   disable:
     - errcheck
-    - gosimple
 
 linters-settings:
   gci:
diff --git a/plugins/ipam/dhcp/lease.go b/plugins/ipam/dhcp/lease.go
index 9fbe6946..6420257b 100644
--- a/plugins/ipam/dhcp/lease.go
+++ b/plugins/ipam/dhcp/lease.go
@@ -305,7 +305,7 @@ func (l *DHCPLease) maintain() {
 
 		switch state {
 		case leaseStateBound:
-			sleepDur = l.renewalTime.Sub(time.Now())
+			sleepDur = time.Until(l.renewalTime)
 			if sleepDur <= 0 {
 				log.Printf("%v: renewing lease", l.clientID)
 				state = leaseStateRenewing
diff --git a/plugins/ipam/host-local/main.go b/plugins/ipam/host-local/main.go
index 202ed6f6..64305861 100644
--- a/plugins/ipam/host-local/main.go
+++ b/plugins/ipam/host-local/main.go
@@ -47,7 +47,7 @@ func cmdCheck(args *skel.CmdArgs) error {
 	defer store.Close()
 
 	containerIpFound := store.FindByID(args.ContainerID, args.IfName)
-	if containerIpFound == false {
+	if !containerIpFound {
 		return fmt.Errorf("host-local: Failed to find address added by container %v", args.ContainerID)
 	}
 
diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go
index 295592f2..d434df49 100644
--- a/plugins/main/bridge/bridge_test.go
+++ b/plugins/main/bridge/bridge_test.go
@@ -1258,7 +1258,6 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 }
 
 func (tester *testerV03x) cmdCheckTest(tc testCase, conf *Net, dataDir string) {
-	return
 }
 
 func (tester *testerV03x) cmdDelTest(tc testCase, dataDir string) {
@@ -1489,7 +1488,6 @@ func (tester *testerV01xOr02x) cmdAddTest(tc testCase, dataDir string) (types.Re
 }
 
 func (tester *testerV01xOr02x) cmdCheckTest(tc testCase, conf *Net, dataDir string) {
-	return
 }
 
 func (tester *testerV01xOr02x) cmdDelTest(tc testCase, dataDir string) {
diff --git a/plugins/meta/firewall/ingresspolicy.go b/plugins/meta/firewall/ingresspolicy.go
index 69a62ccd..8c27af04 100644
--- a/plugins/meta/firewall/ingresspolicy.go
+++ b/plugins/meta/firewall/ingresspolicy.go
@@ -167,7 +167,7 @@ func isolationStage2BridgeRule(bridgeName string) []string {
 }
 
 func withDefaultComment(rule []string) []string {
-	defaultComment := fmt.Sprintf("CNI firewall plugin rules (ingressPolicy: same-bridge)")
+	defaultComment := "CNI firewall plugin rules (ingressPolicy: same-bridge)"
 	return withComment(rule, defaultComment)
 }
 
diff --git a/plugins/meta/tuning/tuning.go b/plugins/meta/tuning/tuning.go
index 01f613cc..427b8a19 100644
--- a/plugins/meta/tuning/tuning.go
+++ b/plugins/meta/tuning/tuning.go
@@ -369,7 +369,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 			updateResultsMacAddr(tuningConf, args.IfName, tuningConf.Mac)
 		}
 
-		if tuningConf.Promisc != false {
+		if tuningConf.Promisc {
 			if err = changePromisc(args.IfName, true); err != nil {
 				return err
 			}
@@ -514,7 +514,7 @@ func validateSysctlConf(tuningConf *TuningConf) error {
 			return err
 		}
 		if !match {
-			return errors.New(fmt.Sprintf("Sysctl %s is not allowed. Only the following sysctls are allowed: %+v", sysctl, allowlist))
+			return fmt.Errorf("Sysctl %s is not allowed. Only the following sysctls are allowed: %+v", sysctl, allowlist)
 		}
 	}
 	return nil
@@ -579,7 +579,7 @@ func validateSysctlConflictingKeys(data []byte) error {
 
 func validateArgs(args *skel.CmdArgs) error {
 	if strings.Contains(args.IfName, string(os.PathSeparator)) {
-		return errors.New(fmt.Sprintf("Interface name (%s) contains an invalid character %s", args.IfName, string(os.PathSeparator)))
+		return fmt.Errorf("Interface name (%s) contains an invalid character %s", args.IfName, string(os.PathSeparator))
 	}
 	return nil
 }