Merge pull request #14 from aserto-dev/update-deps

Update deps

Author: ronenh

.github/workflows/ci.yaml

@@ -1,3 +1,4 @@
+---
 name: ci
 
 on:
@@ -13,16 +14,16 @@ on:
     branches:
       - main
       - release-*
-env:  
+env:
   PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'development' || '' }}
-  GO_VERSION: "1.22"
-  GO_LANGCI_LINT_VERSION: "v1.56.2"
+  GO_VERSION: "1.23"
+  GO_LANGCI_LINT_VERSION: "v1.61.0"
   GO_TESTSUM_VERSION: "1.11.0"
 
 jobs:
   test:
     runs-on: ubuntu-latest
-    steps:      
+    steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -32,7 +33,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       -
         name: Lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           version: ${{ env.GO_LANGCI_LINT_VERSION }}
           args: --timeout=30m

.golangci.yaml

@@ -3,20 +3,9 @@
 # https://github.com/golangci/golangci/wiki/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:
-    local-prefixes: github.com/golangci/golangci-lint
   goconst:
     min-len: 2
     min-occurrences: 2
@@ -28,133 +17,134 @@ linters-settings:
       - performance
       - style
     disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
+      - dupImport  #  https://github.com/go-critic/go-critic/issues/845
       - ifElseChain
       - octalLiteral
       - whyNoLint
       - wrapperFunc
   gocyclo:
-    min-complexity: 20
+    min-complexity: 18
   goimports:
     local-prefixes: github.com/golangci/golangci-lint
-  golint:
-    min-confidence: 0
-  gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks: 
-          - argument
-          - case
-          - condition
-          - return
+  mnd:
+    checks:
+      - argument
+      - case
+      - condition
+      - return
   govet:
-    check-shadowing: true
+    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
+  lll:
+    line-length: 140
   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
+    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
 
 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
+  disable-all: false
   enable:
+    - asasalint
     - asciicheck
+    - bidichk
     - bodyclose
+    - canonicalheader
+    - containedctx
+    - contextcheck
+    - copyloopvar
+    - cyclop
+    - decorder
     - dogsled
-    - errcheck
-    - exportloopref
+    - dupword
+    - durationcheck
+    - err113
+    - errchkjson
+    - errname
+    - errorlint
     - exhaustive
+    - fatcontext
+    - forcetypeassert
     - funlen
+    - gocheckcompilerdirectives
+    - gochecknoinits
+    - gochecknoglobals
     - gochecknoinits
+    - gocognit
     - goconst
     - gocritic
     - gocyclo
     - godot
-    # - goerr113 # temporary disabled
     - gofmt
     - goimports
     - goprintffuncname
     - gosec
-    - gosimple
-    - govet
-    - ineffassign
+    - gosmopolitan
+    - grouper
+    - importas
+    - inamedparam
+    - interfacebloat
+    - intrange
+    - lll
+    - makezero
+    - mirror
     - misspell
+    - mnd
+    - musttag
     - nakedret
+    - nestif
+    - nilerr
+    - nilnil
     - noctx
-    # - rowserrcheck # disable https://github.com/golangci/golangci-lint/issues/2649.
-    - staticcheck
+    - nolintlint
+    - nonamedreturns
+    - perfsprint
+    - prealloc
+    - predeclared
+    - reassign
+    - rowserrcheck
     - stylecheck
     - testpackage
-    - typecheck
     - unconvert
     - unparam
-    - unused
+    - usestdlibvars
+    - wastedassign
+    - whitespace
+    - zerologlint
 
-  # don't enable:
+    # don't enable:
     # - depguard
     # - dupl
+    # - exhaustruct
+    # - gci
+    # - ginkgolinter
     # - gochecknoglobals
     # - gocognit
     # - godox
-    # - gomnd
+    # - gofumpt
+    # - gomoddirectives
+    # - ireturn
     # - lll
-    # - nestif
+    # - nlreturn
     # - nolintlint # conflict with 1.19 gofmt changes
+    # - protogetter
     # - prealloc
     # - revive
     # - wsl
-    # - whitespace
+    # - wrapcheck
 
 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
-
-run:
-  timeout: 5m
-  skip-dirs:
-  - aserto/directory
+        - gocritic

context.go

@@ -10,7 +10,7 @@ import (
 // that can also encapsulate a context.
 type ContextError struct {
 	Err error
-	Ctx context.Context
+	Ctx context.Context //nolint:containedctx
 }
 
 func WithContext(err error, ctx context.Context) *ContextError {

custom_error_handler.go

@@ -15,7 +15,14 @@ const (
 	HTTPStatusErrorMetadata = "aserto-http-statuscode"
 )
 
-func CustomErrorHandler(ctx context.Context, gtw *runtime.ServeMux, runtimeMarshaler runtime.Marshaler, httpResponseWriter http.ResponseWriter, httpRequest *http.Request, err error) {
+func CustomErrorHandler(
+	ctx context.Context,
+	gtw *runtime.ServeMux,
+	runtimeMarshaler runtime.Marshaler,
+	httpResponseWriter http.ResponseWriter,
+	httpRequest *http.Request,
+	err error,
+) {
 	if err == nil {
 		runtime.DefaultHTTPErrorHandler(ctx, gtw, runtimeMarshaler, httpResponseWriter, httpRequest, err)
 	}

errors.go

@@ -24,7 +24,7 @@ const (
 var (
 	ErrUnknown = NewAsertoError("E00000", codes.Internal, http.StatusInternalServerError, "an unknown error has occurred")
 
-	asertoErrors = make(map[string]*AsertoError)
+	asertoErrors = make(map[string]*AsertoError) //nolint:gochecknoglobals
 )
 
 func NewAsertoError(code string, statusCode codes.Code, httpCode int, msg string) *AsertoError {
@@ -51,8 +51,8 @@ func (e *AsertoError) Data() map[string]string {
 // SameAs returns true if the provided error is an AsertoError
 // and has the same error code.
 func (e *AsertoError) SameAs(err error) bool {
-	aErr, ok := err.(*AsertoError)
-	if err == nil || !ok {
+	var aErr *AsertoError
+	if ok := errors.As(err, &aErr); err == nil || !ok {
 		return false
 	}
 
@@ -121,7 +121,8 @@ func (e *AsertoError) Err(err error) *AsertoError {
 
 	c.errs = append(c.errs, err)
 
-	if aErr, ok := err.(*AsertoError); ok {
+	var aErr *AsertoError
+	if ok := errors.As(err, &aErr); ok {
 		for k, v := range aErr.data {
 			if _, ok := c.data[k]; !ok {
 				c.data[k] = v
@@ -167,7 +168,7 @@ func (e *AsertoError) Str(key, value string) *AsertoError {
 
 func (e *AsertoError) Int(key string, value int) *AsertoError {
 	c := e.Copy()
-	c.data[key] = fmt.Sprintf("%d", value)
+	c.data[key] = strconv.Itoa(value)
 	return c
 }
 
@@ -185,7 +186,7 @@ func (e *AsertoError) Int64(key string, value int64) *AsertoError {
 
 func (e *AsertoError) Bool(key string, value bool) *AsertoError {
 	c := e.Copy()
-	c.data[key] = fmt.Sprintf("%t", value)
+	c.data[key] = strconv.FormatBool(value)
 
 	return c
 }
@@ -339,8 +340,8 @@ func UnwrapAsertoError(err error) *AsertoError {
 
 	// try to process Aserto error.
 	for {
-		aErr, ok := err.(*AsertoError)
-		if ok {
+		var aErr *AsertoError
+		if ok := errors.As(err, &aErr); ok {
 			return aErr
 		}
 

errors_test.go

@@ -194,7 +194,8 @@ func TestWithGrpcError(t *testing.T) {
 
 func TestWithHttpError(t *testing.T) {
 	assert := require.New(t)
-	aerr := cerr.NewAsertoError("E000001", codes.Unavailable, http.StatusServiceUnavailable, "failed to setup").WithHTTPStatus(http.StatusNotAcceptable)
+	aerr := cerr.NewAsertoError("E000001", codes.Unavailable, http.StatusServiceUnavailable, "failed to setup").
+		WithHTTPStatus(http.StatusNotAcceptable)
 
 	unAerr := cerr.UnwrapAsertoError(aerr)
 	assert.Equal(http.StatusNotAcceptable, unAerr.HTTPCode)

go.mod

@@ -1,14 +1,16 @@
 module github.com/aserto-dev/errors
 
-go 1.21
+go 1.22.10
+
+toolchain go1.23.4
 
 require (
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.33.0
-	github.com/stretchr/testify v1.9.0
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988
-	google.golang.org/grpc v1.65.0
+	github.com/stretchr/testify v1.10.0
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484
+	google.golang.org/grpc v1.68.1
 )
 
 require (
@@ -18,10 +20,10 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/protobuf v1.36.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )