Bump linter version (#2888)

* Bump linter version * Fix lint error * Use new config for exclude-dirs
openshift-knative · Sep 24, 2024 · de5836e · de5836e
1 parent c8d8f95
commit de5836e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -161,7 +161,7 @@ jobs:
       - name: Go Lint - knative-operator
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.55.2
+          version: v1.61.0
           args: --timeout=10m0s --verbose 
           working-directory: ./src/github.com/${{ github.repository }}
 

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -4,9 +4,6 @@ run:
   build-tags:
     - upgrade
 
-  skip-dirs:
-    - pkg/client
-
 linters:
   enable:
     - asciicheck
@@ -49,6 +46,9 @@ linters-settings:
         alias: $1$2
 
 issues:
+  exclude-dirs:
+    - pkg/client
+
   exclude-rules:
     - path: test # Excludes /test, *_test.go etc.
       linters:

diff --git a/test/installplan.go b/test/installplan.go
@@ -34,8 +34,7 @@ func WaitForInstallPlan(ctx *Context, namespace string, csvName, olmSource strin
 }
 
 func installsCSVFromSource(installPlan operatorsv1alpha1.InstallPlan, csvName, olmSource string) bool {
-	if installPlan.Status.BundleLookups == nil ||
-		len(installPlan.Status.BundleLookups) == 0 ||
+	if len(installPlan.Status.BundleLookups) == 0 ||
 		installPlan.Status.BundleLookups[0].CatalogSourceRef == nil ||
 		installPlan.Status.BundleLookups[0].CatalogSourceRef.Name != olmSource {
 		return false