ci: Fix golangci (#500)

* ci: Bump Go to 1.22.x

* Bump golangci-lint to v1.59

... and fix issues reported by the new version.

Signed-off-by: James Alseth <[email protected]>

.github/workflows/cron_e2e.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
 
       - name: checkout source
         uses: actions/checkout@v4

.github/workflows/pull_request.yaml

@@ -9,15 +9,15 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
 
       - name: checkout
         uses: actions/checkout@v4
 
       - name: lint go
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.52
+          version: v1.59
           args: --timeout=5m --color=always --max-same-issues=0 --max-issues-per-linter=0
 
   acceptance:
@@ -31,7 +31,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
 
       - name: checkout source
         uses: actions/checkout@v4

.github/workflows/push_container.yaml

@@ -12,7 +12,7 @@ jobs:
     - name: setup go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20.x
+        go-version: 1.22.x
 
     - name: checkout
       uses: actions/checkout@v4

.github/workflows/update_cli_docs.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
 
       - name: checkout source
         uses: actions/checkout@v4

.golangci.yaml

@@ -6,7 +6,6 @@ linter-settings:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - goconst
     - gofmt
@@ -20,10 +19,8 @@ linters:
     - predeclared
     - revive
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - wastedassign

go.mod

@@ -1,6 +1,6 @@
 module github.com/plexsystems/konstraint
 
-go 1.21
+go 1.22
 
 require (
 	github.com/open-policy-agent/frameworks/constraint v0.0.0-20220218180203-c2a0d8cdf85a

internal/commands/convert.go

@@ -20,7 +20,7 @@ func newConvertCommand() *cobra.Command {
 
 konstraint convert examples`,
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) error {
 			path := "."
 			if len(args) > 0 {
 				path = args[0]

internal/rego/rego.go

@@ -657,17 +657,19 @@ func (r Rego) SkipConstraint() bool {
 
 func parseDirectory(directory string, parseImports bool) ([]Rego, error) {
 	// Recursively find all rego files (ignoring test files), starting at the given directory.
-	result, err := loader.NewFileLoader().WithProcessAnnotation(true).Filtered([]string{directory}, func(abspath string, info os.FileInfo, depth int) bool {
-		if strings.HasSuffix(info.Name(), "_test.rego") {
-			return true
-		}
+	result, err := loader.NewFileLoader().
+		WithProcessAnnotation(true).
+		Filtered([]string{directory}, func(_ string, info os.FileInfo, _ int) bool {
+			if strings.HasSuffix(info.Name(), "_test.rego") {
+				return true
+			}
 
-		if !info.IsDir() && filepath.Ext(info.Name()) != ".rego" {
-			return true
-		}
+			if !info.IsDir() && filepath.Ext(info.Name()) != ".rego" {
+				return true
+			}
 
-		return false
-	})
+			return false
+		})
 	if err != nil {
 		return nil, fmt.Errorf("filter rego files: %w", err)
 	}