Merge branch 'master' into exclude-not-path

.golangci.reference.yml

@@ -171,49 +171,38 @@ linters-settings:
  disable-dec-num-check: false
 
  depguard:
- # Kind of list is passed in.
- # Allowed values: allowlist|denylist
- # Default: denylist
- list-type: allowlist
-
- # Check the list against standard lib.
- # Default: false
- include-go-root: true
-
- # A list of packages for the list type specified.
- # Can accept both string prefixes and string glob patterns.
- # Default: []
- packages:
- - github.com/sirupsen/logrus
- - allow/**/pkg
-
- # A list of packages for the list type specified.
- # Specify an error message to output when a denied package is used.
- # Default: []
- packages-with-error-message:
- - github.com/sirupsen/logrus: 'logging is allowed only by logutils.Log'
-
- # Specify rules by which the linter ignores certain files for consideration.
- # Can accept both string prefixes and string glob patterns.
- # The ! character in front of the rule is a special character
- # which signals that the linter should negate the rule.
- # This allows for more precise control, but it is only available for glob patterns.
- # Default: []
- ignore-file-rules:
- - "ignore/**/*.go"
- - "!**/*_test.go"
-
- # Create additional guards that follow the same configuration pattern.
- # Results from all guards are aggregated together.
- additional-guards:
- - list-type: denylist
- include-go-root: false
- packages:
- - github.com/stretchr/testify
- # Specify rules by which the linter ignores certain files for consideration.
- ignore-file-rules:
- - "**/*_test.go"
- - "**/mock/**/*.go"
+ # Rules to apply.
+ #
+ # Variables:
+ # - File Variables
+ # you can still use and exclamation mark ! in front of a variable to say not to use it.
+ # Example !$test will match any file that is not a go test file.
+ #
+ # `$all` - matches all go files
+ # `$test` - matches all go test files
+ #
+ # - Package Variables
+ #
+ # `$gostd` - matches all of go's standard library (Pulled from `GOROOT`)
+ #
+ # Default: no rules.
+ rules:
+ # Name of a rule.
+ main:
+ # List of file globs that will match this list of settings to compare against.
+ # Default: $all
+ files:
+ - "!**/*_a _file.go"
+ # List of allowed packages.
+ allow:
+ - $gostd
+ - github.com/OpenPeeDeeP
+ # Packages that are not allowed where the value is a suggestion.
+ deny:
+ - pkg: "github.com/sirupsen/logrus"
+ desc: not allowed
+ - pkg: "github.com/pkg/errors"
+ desc: Should be replaced by standard lib errors package
 
  dogsled:
  # Checks assignments with too many blank identifiers.

.golangci.yml

@@ -1,12 +1,21 @@
 linters-settings:
  depguard:
+ # old configuration. TODO(ldez): must be removed
  list-type: denylist
  packages:
  # logging is allowed only by logutils.Log, logrus
  # is allowed to use only in logutils package
  - github.com/sirupsen/logrus
  packages-with-error-message:
  - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
+ # new configuration
+ rules:
+ logger:
+ deny:
+ # logging is allowed only by logutils.Log,
+ # logrus is allowed to use only in logutils package.
+ - pkg: "github.com/sirupsen/logrus"
+ desc: logging is allowed only by logutils.Log
  dupl:
  threshold: 100
  funlen:

go.mod

@@ -12,7 +12,7 @@ require (
  github.com/BurntSushi/toml v1.2.1
  github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
  github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0
- github.com/OpenPeeDeeP/depguard v1.1.1
+ github.com/OpenPeeDeeP/depguard/v2 v2.0.1
  github.com/alexkohler/nakedret/v2 v2.0.1
  github.com/alexkohler/prealloc v1.0.0
  github.com/alingse/asasalint v0.0.11

pkg/commands/run.go

@@ -191,15 +191,6 @@ func initFlagSet(fs *pflag.FlagSet, cfg *config.Config, m *lintersdb.Manager, is
  true, "Goconst: ignore when constant is not used as function argument")
  hideFlag("goconst.ignore-calls")
 
- // (@dixonwille) These flag is only used for testing purposes.
- fs.StringSliceVar(&lsc.Depguard.Packages, "depguard.packages", nil,
- "Depguard: packages to add to the list")
- hideFlag("depguard.packages")
-
- fs.BoolVar(&lsc.Depguard.IncludeGoRoot, "depguard.include-go-root", false,
- "Depguard: check list against standard lib")
- hideFlag("depguard.include-go-root")
-
  fs.IntVar(&lsc.Lll.TabWidth, "lll.tab-width", 1,
  "Lll: tab width in spaces")
  hideFlag("lll.tab-width")

pkg/config/linters_settings.go

@@ -122,6 +122,10 @@ var defaultLintersSettings = LintersSettings{
  Unparam: UnparamSettings{
  Algo: "cha",
  },
+ UseStdlibVars: UseStdlibVarsSettings{
+ HTTPMethod: true,
+ HTTPStatusCode: true,
+ },
  Varnamelen: VarnamelenSettings{
  MaxDistance: 5,
  MinNameLength: 3,
@@ -249,12 +253,18 @@ type Cyclop struct {
 }
 
 type DepGuardSettings struct {
- ListType string `mapstructure:"list-type"`
- Packages []string
- IncludeGoRoot bool `mapstructure:"include-go-root"`
- PackagesWithErrorMessage map[string]string `mapstructure:"packages-with-error-message"`
- IgnoreFileRules []string `mapstructure:"ignore-file-rules"`
- AdditionalGuards []DepGuardSettings `mapstructure:"additional-guards"`
+ Rules map[string]*DepGuardList `mapstructure:"rules"`
+}
+
+type DepGuardList struct {
+ Files []string `mapstructure:"files"`
+ Allow []string `mapstructure:"allow"`
+ Deny []DepGuardDeny `mapstructure:"deny"`
+}
+
+type DepGuardDeny struct {
+ Pkg string `mapstructure:"pkg"`
+ Desc string `mapstructure:"desc"`
 }
 
 type DecorderSettings struct {