From 5fcc7f6675c043f97ec2374e407d4d5220c99331 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 11 Sep 2022 11:01:31 +0000 Subject: [PATCH 1/3] build(deps): bump github.com/sashamelentyev/usestdlibvars Bumps [github.com/sashamelentyev/usestdlibvars](https://github.com/sashamelentyev/usestdlibvars) from 1.17.1 to 1.19.0. - [Release notes](https://github.com/sashamelentyev/usestdlibvars/releases) - [Commits](https://github.com/sashamelentyev/usestdlibvars/compare/v1.17.1...v1.19.0) --- updated-dependencies: - dependency-name: github.com/sashamelentyev/usestdlibvars dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fbc5431af432..3595685eef60 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( github.com/ryanrolds/sqlclosecheck v0.3.0 github.com/sanposhiho/wastedassign/v2 v2.0.6 github.com/sashamelentyev/interfacebloat v1.1.0 - github.com/sashamelentyev/usestdlibvars v1.17.1 + github.com/sashamelentyev/usestdlibvars v1.19.0 github.com/securego/gosec/v2 v2.13.1 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c github.com/shirou/gopsutil/v3 v3.22.8 diff --git a/go.sum b/go.sum index 1d2acb46edd6..43cacb68aaa2 100644 --- a/go.sum +++ b/go.sum @@ -466,8 +466,8 @@ github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3 github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= -github.com/sashamelentyev/usestdlibvars v1.17.1 h1:a9SrXLLCVY49g9hAEMfjpcN4sKV4SZ0rWABOAeRJBh0= -github.com/sashamelentyev/usestdlibvars v1.17.1/go.mod h1:EuR3x44678JCCOUOLGCc6/XeU5BFEYjcFO+in3qLyLM= +github.com/sashamelentyev/usestdlibvars v1.19.0 h1:xbpkUOXSd0TWpmSSqV4D+iky/oYGqzknSwBs5Nd1CNs= +github.com/sashamelentyev/usestdlibvars v1.19.0/go.mod h1:EuR3x44678JCCOUOLGCc6/XeU5BFEYjcFO+in3qLyLM= github.com/securego/gosec/v2 v2.13.1 h1:7mU32qn2dyC81MH9L2kefnQyRMUarfDER3iQyMHcjYM= github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= From a78c1b1c228c4f5d5827c9dbb287981e49616647 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 11 Sep 2022 13:20:22 +0200 Subject: [PATCH 2/3] update configuration --- pkg/config/linters_settings.go | 1 + pkg/golinters/usestdlibvars.go | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go index 0822862e90c4..6b81f3adf344 100644 --- a/pkg/config/linters_settings.go +++ b/pkg/config/linters_settings.go @@ -648,6 +648,7 @@ type UseStdlibVarsSettings struct { OSDevNullFlag bool `mapstructure:"os-dev-null-flag"` SQLIsolationLevelFlag bool `mapstructure:"sql-isolation-level-flag"` TLSSignatureSchemeFlag bool `mapstructure:"tls-signature-scheme-flag"` + ConstantKind bool `mapstructure:"constant-kind"` } type UnparamSettings struct { diff --git a/pkg/golinters/usestdlibvars.go b/pkg/golinters/usestdlibvars.go index 56389aeecc99..8c4858d84bea 100644 --- a/pkg/golinters/usestdlibvars.go +++ b/pkg/golinters/usestdlibvars.go @@ -14,15 +14,16 @@ func NewUseStdlibVars(cfg *config.UseStdlibVarsSettings) *goanalysis.Linter { cfgMap := make(map[string]map[string]interface{}) if cfg != nil { cfgMap[a.Name] = map[string]interface{}{ + analyzer.ConstantKindFlag: cfg.ConstantKind, + analyzer.CryptoHashFlag: cfg.CryptoHash, analyzer.HTTPMethodFlag: cfg.HTTPMethod, analyzer.HTTPStatusCodeFlag: cfg.HTTPStatusCode, - analyzer.TimeWeekdayFlag: cfg.TimeWeekday, - analyzer.TimeMonthFlag: cfg.TimeMonth, - analyzer.TimeLayoutFlag: cfg.TimeLayout, - analyzer.CryptoHashFlag: cfg.CryptoHash, - analyzer.RPCDefaultPathFlag: cfg.DefaultRPCPathFlag, analyzer.OSDevNullFlag: cfg.OSDevNullFlag, + analyzer.RPCDefaultPathFlag: cfg.DefaultRPCPathFlag, analyzer.SQLIsolationLevelFlag: cfg.SQLIsolationLevelFlag, + analyzer.TimeLayoutFlag: cfg.TimeLayout, + analyzer.TimeMonthFlag: cfg.TimeMonth, + analyzer.TimeWeekdayFlag: cfg.TimeWeekday, analyzer.TLSSignatureSchemeFlag: cfg.TLSSignatureSchemeFlag, } } From 3df07570783ffe3825a5a80fe5a36571fd9c03aa Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 11 Sep 2022 13:28:03 +0200 Subject: [PATCH 3/3] update configuration --- .golangci.reference.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.golangci.reference.yml b/.golangci.reference.yml index 19cd49ad6cad..4f031c2f5853 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -1749,6 +1749,9 @@ linters-settings: # Suggest the use of tls.SignatureScheme.String() # Default: false tls-signature-scheme: true + # suggest the use of constant.Kind.String() + # Default: false + constant-kind: true unparam: # Inspect exported functions.