From 11da2fc7c15311a70bfdd35ce1998ae373d9f897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 23:45:18 +0000 Subject: [PATCH] Bump github.com/gin-contrib/zap from 1.1.1 to 1.1.3 Bumps [github.com/gin-contrib/zap](https://github.com/gin-contrib/zap) from 1.1.1 to 1.1.3. - [Release notes](https://github.com/gin-contrib/zap/releases) - [Changelog](https://github.com/gin-contrib/zap/blob/master/.goreleaser.yaml) - [Commits](https://github.com/gin-contrib/zap/compare/v1.1.1...v1.1.3) --- updated-dependencies: - dependency-name: github.com/gin-contrib/zap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- .../gin-contrib/zap/.goreleaser.yaml | 57 +++++-------------- vendor/github.com/gin-contrib/zap/zap.go | 5 +- vendor/modules.txt | 2 +- 5 files changed, 20 insertions(+), 50 deletions(-) diff --git a/go.mod b/go.mod index 05902db6..a45f31ba 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/gin-contrib/cors v1.7.1 github.com/gin-contrib/requestid v1.0.0 - github.com/gin-contrib/zap v1.1.1 + github.com/gin-contrib/zap v1.1.3 github.com/gin-gonic/gin v1.10.0 github.com/go-rel/mysql v0.12.0 github.com/go-rel/rel v0.42.0 diff --git a/go.sum b/go.sum index 19ef6983..f0f28ecd 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/gin-contrib/requestid v1.0.0 h1:Ms19AcktabHdXDiMDvsR+PrkBEOtURWliX89n github.com/gin-contrib/requestid v1.0.0/go.mod h1:311ycyAmroVeV6hDO1Wojooq/jmWfrgqU33M1ncP/TI= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-contrib/zap v1.1.1 h1:DDyIF9YQorl3gZzAabIowRywHJuohDfiLnhwvWKl6SY= -github.com/gin-contrib/zap v1.1.1/go.mod h1:YW8KOko2kYLy8g6k9YgVNTj7SIcrUEzYiAd9IjiBPs0= +github.com/gin-contrib/zap v1.1.3 h1:9e/U9fYd4/OBfmSEBs5hHZq114uACn7bpuzvCkcJySA= +github.com/gin-contrib/zap v1.1.3/go.mod h1:+BD/6NYZKJyUpqVoJEvgeq9GLz8pINEQvak9LHNOTSE= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= diff --git a/vendor/github.com/gin-contrib/zap/.goreleaser.yaml b/vendor/github.com/gin-contrib/zap/.goreleaser.yaml index aa5453cf..dc3a01fb 100644 --- a/vendor/github.com/gin-contrib/zap/.goreleaser.yaml +++ b/vendor/github.com/gin-contrib/zap/.goreleaser.yaml @@ -1,57 +1,26 @@ -project_name: queue - builds: - - - # If true, skip the build. - # Useful for library projects. - # Default is false - skip: true + - skip: true changelog: - # Set it to true if you wish to skip the changelog generation. - # This may result in an empty release notes on GitHub/GitLab/Gitea. - skip: false - - # Changelog generation implementation to use. - # - # Valid options are: - # - `git`: uses `git log`; - # - `github`: uses the compare GitHub API, appending the author login to the changelog. - # - `gitlab`: uses the compare GitLab API, appending the author name and email to the changelog. - # - `github-native`: uses the GitHub release notes generation API, disables the groups feature. - # - # Defaults to `git`. - use: git - - # Sorts the changelog by the commit's messages. - # Could either be asc, desc or empty - # Default is empty - sort: asc - - # Group commits messages by given regex and title. - # Order value defines the order of the groups. - # Proving no regex means all commits will be grouped under the default group. - # Groups are disabled when using github-native, as it already groups things by itself. - # - # Default is no groups. + use: github groups: - title: Features regexp: "^.*feat[(\\w)]*:+.*$" order: 0 - - title: 'Bug fixes' + - title: "Bug fixes" regexp: "^.*fix[(\\w)]*:+.*$" order: 1 - - title: 'Enhancements' + - title: "Enhancements" regexp: "^.*chore[(\\w)]*:+.*$" order: 2 + - title: "Refactor" + regexp: "^.*refactor[(\\w)]*:+.*$" + order: 3 + - title: "Build process updates" + regexp: ^.*?(build|ci)(\(.+\))??!?:.+$ + order: 4 + - title: "Documentation updates" + regexp: ^.*?docs?(\(.+\))??!?:.+$ + order: 4 - title: Others order: 999 - - filters: - # Commit messages matching the regexp listed here will be removed from - # the changelog - # Default is empty - exclude: - - '^docs' - - 'CICD' - - typo diff --git a/vendor/github.com/gin-contrib/zap/zap.go b/vendor/github.com/gin-contrib/zap/zap.go index 52738cd1..34f9dbf5 100644 --- a/vendor/github.com/gin-contrib/zap/zap.go +++ b/vendor/github.com/gin-contrib/zap/zap.go @@ -113,9 +113,10 @@ func GinzapWithConfig(logger ZapLogger, conf *Config) gin.HandlerFunc { logger.Error(e, fields...) } } else { - zl, ok := logger.(*zap.Logger) - if ok { + if zl, ok := logger.(*zap.Logger); ok { zl.Log(conf.DefaultLevel, "", fields...) + } else if conf.DefaultLevel == zapcore.InfoLevel { + logger.Info(path, fields...) } else { logger.Error(path, fields...) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9bf57cfd..99d7129b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -54,7 +54,7 @@ github.com/gin-contrib/requestid # github.com/gin-contrib/sse v0.1.0 ## explicit; go 1.12 github.com/gin-contrib/sse -# github.com/gin-contrib/zap v1.1.1 +# github.com/gin-contrib/zap v1.1.3 ## explicit; go 1.19 github.com/gin-contrib/zap # github.com/gin-gonic/gin v1.10.0