Merge branch 'main' into feat/upgrade-202505

Author: stonedu1011

.github/actions/prepare/action.yml

@@ -25,7 +25,7 @@ runs:
       with:
         ref: ${{ github.head_ref || inputs.branch || 'main' }}
     - name: "Setup Go"
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
 #        go-version: '~1.21.5' # go 1.20 has issues: `go test -covermode=atomic` fails when files doesn't have empty line at the end
         go-version-file: 'go.mod'

.github/actions/verify/action.yml

@@ -24,13 +24,12 @@ runs:
         go tool cover -func=dist/coverage.out -o dist/coverage-func.out
 
     - name: "Code Quality Analysis"
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.59.1
+        version: v1.64.8
         args: -c=build/ci/golangci.yml --timeout=10m --issues-exit-code=${{ inputs.fail_on_lint_issues == 'true' && 1 || 0 }}
         # if fail_on_lint_issues == true, we assume it's a PR verification
         only-new-issues: ${{ inputs.fail_on_lint_issues == 'true' && 'true' || 'false' }}
-        # ~/go/pkg cache conflict with actions/setup-go@v4
-        skip-pkg-cache: true
+
 
 

.github/workflows/ci.yml

@@ -35,8 +35,10 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   main:
-    name: Test, Analyze Code & Report
+    name: "Test, Analyze Code & Report"
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: "Context"
         shell: bash
@@ -77,20 +79,31 @@ jobs:
           format: markdown
           output: both
           thresholds: "${{ inputs.low_cov }} ${{ inputs.high_cov }}"
-      - name: "Upload Badges"
+      - name: "Collect Reports"
         if: ${{ !cancelled() && github.event_name != 'pull_request' }}
-        uses: exuanbo/actions-deploy-gist@v1
-        with:
-          token: ${{ secrets.COVERAGE_BADGE_GIST_TOKEN }}
-          gist_id: 82b48469578014fc69d5aa64ef0a443f
-          gist_file_name: go-lanai-${{ github.head_ref || inputs.branch || 'main' }}-coverage.svg
-          file_path: dist/coverage-badge.svg
-      - name: "Upload Reports"
-        if: ${{ !cancelled() && github.event_name != 'pull_request' }}
-        uses: exuanbo/actions-deploy-gist@v1
+        run: |
+          cat > dist/code-coverage-results.md <<EOF
+          ---
+          layout: report
+          title: "Test Coverage Summary"
+          report:
+            source: "irongut/[email protected]"
+          ---
+          [![Coverage Details](https://img.shields.io/badge/Coverage%20Details-grey?style=flat)](coverage.html)
+          EOF
+          cat code-coverage-results.md >> dist/code-coverage-results.md
+      - name: "Upload Badges and Reports"
+        if: ${{ !cancelled() && github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+        uses: peaceiris/actions-gh-pages@v4
         with:
-          token: ${{ secrets.COVERAGE_BADGE_GIST_TOKEN }}
-          gist_id: 82b48469578014fc69d5aa64ef0a443f
-          gist_file_name: go-lanai-${{ github.head_ref || inputs.branch || 'main' }}-coverage.md
-          file_path: code-coverage-results.md
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: dist
+          destination_dir: reports/${{ github.ref_name }}
+          exclude_assets: '.github,coverage.out,tests.json'
+          enable_jekyll: true
+          keep_files: true
+          commit_message: "Upload badges & reports from CI - ${{ github.job }}"
+
+
 

.gitignore

@@ -33,4 +33,9 @@ vendor/
 
 
 # Codegen
-output
+output
+
+# gh-pages jekyll
+Gemfile
+Gemfile.*
+_site/**

README.md

@@ -1,7 +1,7 @@
 # go-lanai
 
 ![Tests](https://github.com/cisco-open/go-lanai/actions/workflows/ci.yml/badge.svg?branch=main)
-[![Coverage](https://gist.githubusercontent.com/stonedu1011/82b48469578014fc69d5aa64ef0a443f/raw/go-lanai-main-coverage.svg)](https://gist.githubusercontent.com/stonedu1011/82b48469578014fc69d5aa64ef0a443f/#file-go-lanai-main-coverage-md)
+[![Coverage](https://cisco-open.github.io/go-lanai/reports/main/coverage-badge.svg)](https://cisco-open.github.io/go-lanai/reports/main/code-coverage-results.html)
 [![Apache 2.0](https://img.shields.io/badge/License-Apache_2.0-green.svg)](https://opensource.org/license/apache-2-0/)
 
 go-lanai is an application frameworks and a set of modules that make writing applications easy. It provides

examples/auth/go.mod

@@ -1,22 +1,22 @@
 module github.com/cisco-open/go-lanai/examples/auth-service
 
-go 1.22
+go 1.23.8
 
-toolchain go1.22.4
+toolchain go1.24.3
 
 replace github.com/cisco-open/go-lanai => ./../../../go-lanai
 
 require (
 	github.com/cisco-open/go-lanai v0.15.0
 	github.com/pkg/errors v0.9.1
-	go.uber.org/fx v1.22.2
+	go.uber.org/fx v1.24.0
 )
 
 require (
-	dario.cat/mergo v1.0.0 // indirect
+	dario.cat/mergo v1.0.2 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/beevik/etree v1.4.1 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
+	github.com/beevik/etree v1.5.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
 	github.com/bytedance/sonic v1.11.6 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
@@ -25,22 +25,22 @@ require (
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/crewjam/httperr v0.2.0 // indirect
-	github.com/crewjam/saml v0.4.14 // indirect
+	github.com/crewjam/saml v0.5.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.10.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.1 // indirect
+	github.com/gin-gonic/gin v1.10.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.0 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/hashicorp/consul/api v1.30.0 // indirect
+	github.com/hashicorp/consul/api v1.32.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -54,10 +54,10 @@ require (
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-3 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/hashicorp/vault/api v1.14.0 // indirect
-	github.com/hashicorp/vault/api/auth/kubernetes v0.7.0 // indirect
+	github.com/hashicorp/vault/api v1.16.0 // indirect
+	github.com/hashicorp/vault/api/auth/kubernetes v0.9.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jonboulle/clockwork v0.2.2 // indirect
+	github.com/jonboulle/clockwork v0.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
@@ -69,30 +69,30 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
-	github.com/pquerna/otp v1.4.0 // indirect
-	github.com/rs/cors v1.11.0 // indirect
-	github.com/russellhaering/goxmldsig v1.4.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pquerna/otp v1.5.0 // indirect
+	github.com/rs/cors v1.11.1 // indirect
+	github.com/russellhaering/goxmldsig v1.5.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/cobra v1.9.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/dig v1.18.0 // indirect
+	go.uber.org/dig v1.19.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )