eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

importas: new option no-extra-aliases (#2494)

Browse Source
This commit is contained in:
Oleg Butuzov 2022-01-19 17:33:12 +02:00 committed by GitHub
parent 68f530a81a
commit 59c6d296ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.golangci.example.yml
View File

@ -554,8 +554,10 @@ linters-settings:
max-decl-chars: 30 max-decl-chars: 30
importas: importas:
# if set to `true`, force to use alias. # Do not allow unaliased imports of aliased packages.
no-unaliased: true no-unaliased: true
# Do not allow non-required aliases.
no-extra-aliases: true
# List of aliases # List of aliases
alias: alias:
# using `servingv1` alias for `knative.dev/serving/pkg/apis/serving/v1` package # using `servingv1` alias for `knative.dev/serving/pkg/apis/serving/v1` package

2
go.mod
View File

@ -43,7 +43,7 @@ require (
github.com/jgautheron/goconst v1.5.1 github.com/jgautheron/goconst v1.5.1
github.com/jingyugao/rowserrcheck v1.1.1 github.com/jingyugao/rowserrcheck v1.1.1
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d github.com/julz/importas v0.1.0
github.com/kisielk/errcheck v1.6.0 github.com/kisielk/errcheck v1.6.0
github.com/kulti/thelper v0.5.0 github.com/kulti/thelper v0.5.0
github.com/kunwardeep/paralleltest v1.0.3 github.com/kunwardeep/paralleltest v1.0.3

4
go.sum generated
View File

@ -455,6 +455,10 @@ github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSg
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d h1:XeSMXURZPtUffuWAaq90o6kLgZdgu+QA8wk4MPC8ikI= github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d h1:XeSMXURZPtUffuWAaq90o6kLgZdgu+QA8wk4MPC8ikI=
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0=
github.com/julz/importas v0.0.0-20210922140945-27e0a5d4dee2 h1:3sSu9gZvOTazWE4B4wsND7ofCsn75BD8Iz1OCBUZISs=
github.com/julz/importas v0.0.0-20210922140945-27e0a5d4dee2/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0=
github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY=
github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=

5
pkg/config/linters_settings.go
View File

@ -382,8 +382,9 @@ type IfshortSettings struct {
} }
type ImportAsSettings struct { type ImportAsSettings struct {
Alias []ImportAsAlias Alias []ImportAsAlias
NoUnaliased bool `mapstructure:"no-unaliased"` NoUnaliased bool `mapstructure:"no-unaliased"`
NoExtraAliases bool `mapstructure:"no-extra-aliases"`
} }
type ImportAsAlias struct { type ImportAsAlias struct {

7
pkg/golinters/importas.go
View File

@ -28,8 +28,11 @@ func NewImportAs(settings *config.ImportAsSettings) *goanalysis.Linter {
lintCtx.Log.Infof("importas settings found, but no aliases listed. List aliases under alias: key.") // nolint: misspell lintCtx.Log.Infof("importas settings found, but no aliases listed. List aliases under alias: key.") // nolint: misspell
} }
err := analyzer.Flags.Set("no-unaliased", strconv.FormatBool(settings.NoUnaliased)) if err := analyzer.Flags.Set("no-unaliased", strconv.FormatBool(settings.NoUnaliased)); err != nil {
if err != nil { lintCtx.Log.Errorf("failed to parse configuration: %v", err)
}
if err := analyzer.Flags.Set("no-extra-aliases", strconv.FormatBool(settings.NoUnaliased)); err != nil {
lintCtx.Log.Errorf("failed to parse configuration: %v", err) lintCtx.Log.Errorf("failed to parse configuration: %v", err)
} }