remove mage (#204)

* remove mage, update makefile
* fix linter issues
* rm linter exclusions
* fix naked errors

Author: gertd

.github/workflows/ci.yaml

@@ -18,25 +18,25 @@ on:
       - release-*
 env:
   PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'development' || '' }}
-  GO_VERSION: "1.23"
-  GO_RELEASER_VERSION: "v2.3.2"
-  GO_LANGCI_LINT_VERSION: "v1.61.0"
-  GO_TESTSUM_VERSION: "1.11.0"
+  GO_VERSION: "1.25"
+  GO_RELEASER_VERSION: "v2.8.2"
+  GO_LANGCI_LINT_VERSION: "v2.4.0"
+  GO_TESTSUM_VERSION: "1.12.3"
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - 
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - 
         name: Setup Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
       -
         name: Build
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -45,7 +45,7 @@ jobs:
           args: build --clean --snapshot --single-target
       -
         name: Lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v8
         with:
           version: ${{ env.GO_LANGCI_LINT_VERSION }}
           args: --timeout=30m
@@ -58,6 +58,8 @@ jobs:
         name: Test
         run: |
           gotestsum --format short-verbose -- -count=1 -parallel=1 -v -timeout=240s -coverprofile=cover.out -coverpkg=./... ./...
+          gotestsum --format short-verbose -- -count=1 -parallel=1 -v -timeout=240s -coverprofile=cover.out -coverpkg=./oci/... ./oci/...
+          gotestsum --format short-verbose -- -count=1 -parallel=1 -v -timeout=240s -coverprofile=cover.out -coverpkg=./parser/... ./parser/...
       -
         name: Upload code coverage
         uses: shogo82148/actions-goveralls@v1
@@ -73,7 +75,7 @@ jobs:
     if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') )
     steps:
       - 
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - 
@@ -100,7 +102,7 @@ jobs:
           eval `ssh-agent`
       -
         name: Push image to GitHub Container Registry
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -115,7 +117,7 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
       - 
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - 
@@ -143,7 +145,7 @@ jobs:
       - 
         name: Pre-release
         if: github.event_name == 'push'  && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-rc')
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ROOT_TOKEN }}
           ASERTO_TAP: ${{ secrets.GH_ASERTO_TAP_TOKEN }}
@@ -154,7 +156,7 @@ jobs:
       - 
         name: Release
         if: github.event_name == 'push'  && startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-rc')
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ROOT_TOKEN }}
           ASERTO_TAP: ${{ secrets.GH_ASERTO_TAP_TOKEN }}
@@ -169,7 +171,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0    
       - 

.github/workflows/codeql-analysis.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/gitleaks-check.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - 
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - 

.golangci.yaml

@@ -1,147 +1,96 @@
 ---
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
+# Configuration
+# https://golangci-lint.run/usage/configuration/
 
-linters-settings:
-  depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by zerolog
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by zerolog"
-  dupl:
-    threshold: 100
-  funlen:
-    lines: 100
-    statements: 80
-  gci:
-    prefix: github.com/golangci/golangci-lint
-  goconst:
-    min-len: 2
-    min-occurrences: 2
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-    disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-      - wrapperFunc
-  gocyclo:
-    min-complexity: 18
-  goimports:
-    prefix: github.com/golangci/golangci-lint
-  golint:
-    min-confidence: 0  
-  govet:
-    shadow: true
-    settings:
-      printf:
-        funcs:
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-  maligned:
-    suggest-new: true
-  misspell:
-    locale: US
-  nolintlint:
-    allow-unused: false # report any unused nolint directives
-    require-explanation: false # don't require an explanation for nolint directives
-    require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+version: "2"
 
 linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
-  enable:
-    - asciicheck
-    - bodyclose
-    - dogsled
-    - errcheck    
+  # https://golangci-lint.run/usage/configuration/#linters-configuration
+  default: all
+
+  # explicitly disabled linters
+  disable:
+    - containedctx
+    - contextcheck
+    - cyclop
+    - depguard
+    - errcheck
+    - exhaustruct
     - exhaustive
-    - funlen
-    - gochecknoinits
-    - goconst
-    - gocritic
-    - gocyclo
-    - godot
-    - err113
-    - gofmt
-    - goimports
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - misspell
-    - nakedret
-    - noctx
-    # - rowserrcheck disabled https://github.com/golangci/golangci-lint/issues/2649.
-    - staticcheck
-    - stylecheck
-    - testpackage
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
+    - forbidigo
+    - gochecknoglobals  # no configuration options
+    - nilnil
+    - nlreturn          # redundant with wsl
+    - noinlineerr
+    - paralleltest
+    - revive
+    - tagalign
+    - thelper
+    - varnamelen
+    - wrapcheck
+    - wsl
+
+  settings:
+    cyclop:
+      max-complexity: 12
+
+    errcheck:
+      exclude-functions:
+        - fmt.Fprint
+        - fmt.Fprintf
+        - fmt.Fprintln
+        - os.Close
+
+    funlen:
+      lines: 80
+      statements: 60
+      ignore-comments: true
+
+    gomoddirectives:
+      replace-allow-list:
+        - github.com/slok/go-http-metrics
 
-  # don't enable:
-    # - dupl
-    # - gochecknoglobals
-    # - gocognit
-    # - godox
-    # - gomnd
-    # - lll
-    # - nestif
-    # - nolintlint # conflict with 1.19 gofmt changes
-    # - prealloc
-    # - revive
-    # - wsl
-    # - whitespace
+    gosec:
+      excludes:
+        - G104  # Errors unhandled
+        - G304  # Potential file inclusion via variable (see https://github.com/golang/go/issues/67002)
 
-issues:
-  # List of regexps of issue texts to exclude, empty list by default.
-  # But independently from this option we use default exclude patterns,
-  # it can be disabled by `exclude-use-default: false`. To list all
-  # excluded by default patterns execute `golangci-lint run --help`
-  exclude:
-  - declaration of "(err|ctx)" shadows declaration at
-  - shadow of imported from 'github.com/stretchr/testify/assert' package 'assert'
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    - path: _test\.go
-      linters:
-      - gomnd
-    # https://github.com/go-critic/go-critic/issues/926
-    - text: "unnecessaryDefer:"
-      linters:
-      - gocritic
-    - text: "unnamedResult:"
-      linters:
-      - gocritic
-    - path: \.resolvers\.go
-      text: "typeDefFirst:"
-      linters:
-      - gocritic
-    - path: \.resolvers\.go
-      text: "paramTypeCombine:"
-      linters:
-      - gocritic
-    - path: \.resolvers\.go
-      text: "hugeParam:"
-      linters:
-      - gocritic
-    - text: "G404"
-      linters:
-      - gosec
+    ireturn:
+      allow:
+        - error
+        - empty
+        - stdlib
+        - generic
+        - kong.Resolver
 
-run:
-  timeout: 5m
+    lll:
+      line-length: 150
+
+    recvcheck:
+      exclusions:
+        - "*.Map"
+
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+          yaml: snake
+
+        overrides:
+          - pkg: pkg/app
+            rules:
+              json: camel
+              
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2 
+
+  exclusions:
+    generated: lax
+
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports

.goreleaser-pre.yml

@@ -40,8 +40,9 @@ builds:
 
 archives:
   # https://goreleaser.com/customization/archive/
-  - format: zip
-    builds:
+  - formats: 
+      - zip
+    ids:
     - build
     files:
       - LICENSE

.goreleaser.yml

@@ -1,4 +1,5 @@
 version: 2
+
 project_name: policy
 
 env:
@@ -40,8 +41,9 @@ builds:
 
 archives:
   # https://goreleaser.com/customization/archive/
-  - format: zip
-    builds:
+  - formats: 
+      - zip
+    ids:
     - build
     files:
       - LICENSE