Merge pull request #8 from aserto-dev/upd-deps

upd deps

Author: gertd

.github/workflows/ci.yaml

@@ -15,36 +15,38 @@ on:
       - release-*
 env:  
   PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'development' || '' }}
-  GO_VERSION: "1.17"
+  GO_VERSION: "1.22"
+  GO_LANGCI_LINT_VERSION: "v1.56.2"
+  GO_TESTSUM_VERSION: "1.11.0"
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:      
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-      - name: Setup caching
-        uses: actions/cache@v1
+      -
+        name: Lint
+        uses: golangci/golangci-lint-action@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Install Tools
-        run: |          
-          go run mage.go deps
-      - name: Lint
-        run: |
-          go run mage.go lint
-      - name: Test
+          version: ${{ env.GO_LANGCI_LINT_VERSION }}
+          args: --timeout=30m
+      -
+        name: Test Setup
+        uses: autero1/action-gotestsum@v2.0.0
+        with:
+          gotestsum_version: ${{ env.GO_TESTSUM_VERSION }}
+      -
+        name: Test
         run: |
-          go run mage.go test
-      - name: Upload code coverage
+          gotestsum --format short-verbose -- -count=1 -parallel=1 -v -timeout=240s -coverprofile=cover.out -coverpkg=./... ./...
+      -
+        name: Upload code coverage
         uses: shogo82148/actions-goveralls@v1
         continue-on-error: true
         with:

.github/workflows/gitleaks-check.yml

@@ -6,7 +6,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: gitleaks-check

.golangci.yaml

@@ -14,7 +14,7 @@ linters-settings:
     threshold: 100
   funlen:
     lines: 100
-    statements: 50
+    statements: 80
   gci:
     local-prefixes: github.com/golangci/golangci-lint
   goconst:
@@ -31,6 +31,7 @@ linters-settings:
       - dupImport # https://github.com/go-critic/go-critic/issues/845
       - ifElseChain
       - octalLiteral
+      - whyNoLint
       - wrapperFunc
   gocyclo:
     min-complexity: 20
@@ -42,7 +43,11 @@ linters-settings:
     settings:
       mnd:
         # don't include the "operation" and "assign"
-        checks: argument,case,condition,return
+        checks: 
+          - argument
+          - case
+          - condition
+          - return
   govet:
     check-shadowing: true
     settings:
@@ -57,7 +62,6 @@ linters-settings:
   misspell:
     locale: US
   nolintlint:
-    allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
     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
@@ -67,33 +71,52 @@ linters:
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
+    - asciicheck
     - bodyclose
-    - deadcode
-    - depguard
+    - dogsled
     - errcheck
     - exportloopref
+    - exhaustive
     - funlen
     - gochecknoinits
     - goconst
     - gocritic
     - gocyclo
+    - godot
+    # - goerr113 # temporary disabled
     - gofmt
     - goimports
+    - goprintffuncname
     - gosec
     - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
-    - revive
+    - noctx
+    # - rowserrcheck # disable https://github.com/golangci/golangci-lint/issues/2649.
     - staticcheck
-    - structcheck
     - stylecheck
+    - testpackage
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
+
+  # don't enable:
+    # - depguard
+    # - dupl
+    # - gochecknoglobals
+    # - gocognit
+    # - godox
+    # - gomnd
+    # - lll
+    # - nestif
+    # - nolintlint # conflict with 1.19 gofmt changes
+    # - prealloc
+    # - revive
+    # - wsl
+    # - whitespace
 
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
@@ -114,7 +137,24 @@ issues:
       - gocritic
     - text: "unnamedResult:"
       linters:
-      - gocritic      
+      - 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
 
 run:
-  timeout: 5m
+  timeout: 5m
+  skip-dirs:
+  - aserto/directory

Depfile

@@ -17,6 +17,7 @@ import (
 
 const (
 	MessageKey = "msg"
+	colon      = ": "
 )
 
 var (
@@ -81,14 +82,14 @@ func (e *AsertoError) Error() string {
 		innerMessage = e.errs[0].Error()
 
 		for _, err := range e.errs[1:] {
-			innerMessage = innerMessage + ": " + err.Error()
+			innerMessage = innerMessage + colon + err.Error()
 		}
 	}
 	if len(e.data) > 0 {
 		for k, v := range e.data {
 			if k == "msg" {
 				if innerMessage != "" {
-					innerMessage += ": "
+					innerMessage += colon
 				}
 				innerMessage += v
 			}
@@ -135,7 +136,7 @@ func (e *AsertoError) Msg(message string) *AsertoError {
 
 	if message != "" {
 		if existingMsg, ok := c.data[MessageKey]; ok {
-			c.data[MessageKey] = existingMsg + ": " + message
+			c.data[MessageKey] = existingMsg + colon + message
 		} else {
 			c.data[MessageKey] = message
 		}
@@ -150,7 +151,7 @@ func (e *AsertoError) Msgf(message string, args ...interface{}) *AsertoError {
 	message = fmt.Sprintf(message, args...)
 
 	if existingMsg, ok := c.data[MessageKey]; ok {
-		c.data[MessageKey] = existingMsg + ": " + message
+		c.data[MessageKey] = existingMsg + colon + message
 	} else {
 		c.data[MessageKey] = message
 	}

errors.go

@@ -1,27 +1,28 @@
 module github.com/aserto-dev/errors
 
-go 1.17
+go 1.19
 
 require (
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0
-	github.com/magefile/mage v1.14.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
 	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.28.0
-	github.com/stretchr/testify v1.8.0
-	google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1
-	google.golang.org/grpc v1.50.1
+	github.com/rs/zerolog v1.32.0
+	github.com/stretchr/testify v1.9.0
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7
+	google.golang.org/grpc v1.62.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.2.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )