Replace golint with revive and fix a revive error (#932)

* Replace golint with revive and fix a revive error * github: bump golangci-lint version
FoundationDB · Sep 24, 2021 · caba2d1 · caba2d1
1 parent 6c2bf3c
commit caba2d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.31
+          version: v1.42
   build:
     name: Build
     runs-on: ubuntu-latest

diff --git a/.golangci.yml b/.golangci.yml
@@ -20,7 +20,7 @@ linters:
     #- gocyclo
     - gofmt
     - goimports
-    - golint
+    - revive
     #- gosec
     - gosimple
     - govet

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -134,7 +134,7 @@ func reconcileRestore(restore *fdbtypes.FoundationDBRestore) (reconcile.Result,
 func reconcileObject(reconciler reconcile.Reconciler, metadata metav1.ObjectMeta, requeueLimit int) (reconcile.Result, error) {
 	attempts := requeueLimit + 1
 	result := reconcile.Result{Requeue: true}
-	var err error = nil
+	var err error
 	for result.Requeue && attempts > 0 {
 		log.Info("Running test reconciliation")
 		attempts--