Bumps (#143)

Author: mbilski

.github/workflows/build.yaml

@@ -6,9 +6,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.25'
+          cache: true
       - name: Build
         run: go build ./...
       - name: Test

.github/workflows/codeql.yml

@@ -15,7 +15,12 @@ jobs:
   golangci:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: '1.25'
+          cache: true
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.8

.github/workflows/lint.yaml

@@ -2,7 +2,6 @@ name: release
 
 on:
   push:
-    # run only against tags
     tags:
       - '*'
 
@@ -13,13 +12,13 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - run: git fetch --force --tags
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v6
         with:
-          go-version: '>=1.24'
+          go-version: '1.25'
           cache: true
       - uses: goreleaser/goreleaser-action@v4
         with:

.github/workflows/release.yaml

@@ -0,0 +1,8 @@
+version: "2"
+
+linters:
+  exclusions:
+    rules:
+      - linters:
+          - errcheck
+        source: "^\\s*defer\\s+"

.golangci.yml

@@ -0,0 +1,3 @@
+[tools]
+go = '1.25'
+golangci-lint = '2.8.0'

.mise.toml

@@ -0,0 +1 @@
+* @mbilski @ikawalec @jdabrowski

CODEOWNERS

@@ -8,6 +8,6 @@ test:
 	go test ./...
 
 lint:
-	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.64.5 golangci-lint run
+	golangci-lint run
 
 all: build test lint

Makefile

@@ -14,7 +14,7 @@ import (
 
 	"github.com/cli/browser"
 	"github.com/cloudentity/oauth2c/internal/oauth2"
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 	"github.com/spf13/cobra"
 )
 
@@ -227,16 +227,16 @@ func (c *OAuth2Cmd) Authorize(
 		return c.DeviceGrantFlow(clientConfig, serverConfig, hc)
 	}
 
-	return fmt.Errorf("Unknown grant type: %s", clientConfig.GrantType)
+	return fmt.Errorf("unknown grant type: %s", clientConfig.GrantType)
 }
 
 func (c *OAuth2Cmd) PrintResult(result interface{}) {
 	output, err := json.Marshal(result)
 	if err != nil {
-		fmt.Fprintf(c.ErrOrStderr(), "%+v", err)
-		fmt.Fprintln(c.ErrOrStderr())
+		_, _ = fmt.Fprintf(c.ErrOrStderr(), "%+v", err)
+		_, _ = fmt.Fprintln(c.ErrOrStderr())
 		return
 	}
 
-	fmt.Fprintln(c.OutOrStdout(), string(output))
+	_, _ = fmt.Fprintln(c.OutOrStdout(), string(output))
 }

cmd/oauth2.go

@@ -3,21 +3,20 @@ module github.com/cloudentity/oauth2c
 go 1.24.0
 
 require (
+	dario.cat/mergo v1.0.2
 	github.com/cli/browser v1.3.1-0.20231006085632-b393df5d7bfa
 	github.com/go-jose/go-jose/v3 v3.0.4
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1
-	github.com/go-playground/validator/v10 v10.28.0
-	github.com/golang-jwt/jwt/v4 v4.5.2
+	github.com/go-playground/validator/v10 v10.30.1
 	github.com/google/uuid v1.6.0
 	github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/imdario/mergo v0.3.16
 	github.com/itchyny/gojq v0.12.10
 	github.com/lithammer/shortuuid/v4 v4.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/pterm/pterm v0.12.82
-	github.com/spf13/cobra v1.10.1
+	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.8.4
 	github.com/tidwall/pretty v1.2.1
 )
@@ -27,10 +26,10 @@ require (
 	atomicgo.dev/keyboard v0.2.9 // indirect
 	atomicgo.dev/schedule v0.1.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.1 // indirect
 	github.com/containerd/console v1.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
 	github.com/gookit/color v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -41,9 +40,9 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/term v0.39.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )