Skip to content

Commit

Permalink
Bump golangci-lint to v1.59
Browse files Browse the repository at this point in the history
... and fix issues reported by the new version.

Signed-off-by: James Alseth <james@jalseth.me>
  • Loading branch information
jalseth committed Jun 13, 2024
1 parent 44c2c7d commit 22b963a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- 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:
Expand Down
3 changes: 0 additions & 3 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ linter-settings:
linters:
disable-all: true
enable:
- deadcode
- errcheck
- goconst
- gofmt
Expand All @@ -20,10 +19,8 @@ linters:
- predeclared
- revive
- staticcheck
- structcheck
- typecheck
- unconvert
- unparam
- unused
- varcheck
- wastedassign
2 changes: 1 addition & 1 deletion internal/commands/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
20 changes: 11 additions & 9 deletions internal/rego/rego.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 22b963a

Please sign in to comment.