aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/nunnatsa
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2024-12-01 01:15:39 +0000
committerTaras Madan <tarasmadan@google.com>2024-12-05 09:05:33 +0000
commit7c3db81921ceea352412011ea6cd8961e7224fb0 (patch)
tree55979369fc4d3319619d0537bc0c1e83dfb7b98f /vendor/github.com/nunnatsa
parent29f61fceff5d68b408b9086bff96ca036b503584 (diff)
mod: bump github.com/golangci/golangci-lint from 1.62.0 to 1.62.2
Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.62.0 to 1.62.2. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/golangci/golangci-lint/compare/v1.62.0...v1.62.2) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to 'vendor/github.com/nunnatsa')
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/README.md6
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actual.go4
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actualarg.go27
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/expression/expression.go6
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/dothandler.go8
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/handler.go2
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/namedhandler.go7
-rw-r--r--vendor/github.com/nunnatsa/ginkgolinter/internal/rules/errorequalnilrule.go11
8 files changed, 51 insertions, 20 deletions
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/README.md b/vendor/github.com/nunnatsa/ginkgolinter/README.md
index 536a65e7b..012628ed7 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/README.md
+++ b/vendor/github.com/nunnatsa/ginkgolinter/README.md
@@ -249,7 +249,7 @@ This will probably happen when using the old format:
Eventually(aFunc, 500 * time.Millisecond /*timeout*/, 10 * time.Second /*polling*/).Should(Succeed())
```
-### Correct usage of the `Succeed()` matcher [Bug]
+### Prevent Wrong Actual Values with the Succeed() matcher [Bug]
The `Succeed()` matcher only accepts a single error value. this rule validates that.
For example:
@@ -271,6 +271,8 @@ a Gomega object as their first parameter, and returns nothing, e.g. this is a va
}).WithTimeout(10 * time.Millisecond).WithPolling(time.Millisecond).Should(Succeed())
```
+***Note***: This rule **does not** support auto-fix.
+
### Avoid Spec Pollution: Don't Initialize Variables in Container Nodes [BUG/STYLE]:
***Note***: Only applied when the `--forbid-spec-pollution=true` flag is set (disabled by default).
@@ -522,6 +524,8 @@ will trigger a warning with a suggestion to replace the mather to
```
***This rule is disabled by default***. Use the `--force-succeed=true` command line flag to enable it.
+***Note***: This rule **does** support auto-fix, when the `--fix` command line parameter is used.
+
## Suppress the linter
### Suppress warning from command line
* Use the `--suppress-len-assertion=true` flag to suppress the wrong length and cap assertions warning
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actual.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actual.go
index 8e3df5d3f..c289b24de 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actual.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actual.go
@@ -21,13 +21,13 @@ type Actual struct {
actualOffset int
}
-func New(origExpr, cloneExpr *ast.CallExpr, orig *ast.CallExpr, clone *ast.CallExpr, pass *analysis.Pass, handler gomegahandler.Handler, timePkg string) (*Actual, bool) {
+func New(origExpr, cloneExpr *ast.CallExpr, orig *ast.CallExpr, clone *ast.CallExpr, pass *analysis.Pass, handler gomegahandler.Handler, timePkg string, errMethodExists bool) (*Actual, bool) {
funcName, ok := handler.GetActualFuncName(orig)
if !ok {
return nil, false
}
- arg, actualOffset := getActualArgPayload(orig, clone, pass, funcName)
+ arg, actualOffset := getActualArgPayload(orig, clone, pass, funcName, errMethodExists)
if arg == nil {
return nil, false
}
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actualarg.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actualarg.go
index 9d251c468..541a22330 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actualarg.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/actual/actualarg.go
@@ -28,6 +28,7 @@ const (
ErrFuncActualArgType
GomegaParamArgType
MultiRetsArgType
+ ErrorMethodArgType
ErrorTypeArgType
@@ -39,7 +40,7 @@ func (a ArgType) Is(val ArgType) bool {
return a&val != 0
}
-func getActualArgPayload(origActualExpr, actualExprClone *ast.CallExpr, pass *analysis.Pass, actualMethodName string) (ArgPayload, int) {
+func getActualArgPayload(origActualExpr, actualExprClone *ast.CallExpr, pass *analysis.Pass, actualMethodName string, errMethodExists bool) (ArgPayload, int) {
origArgExpr, argExprClone, actualOffset, isGomegaExpr := getActualArg(origActualExpr, actualExprClone, actualMethodName, pass)
if !isGomegaExpr {
return nil, 0
@@ -47,7 +48,9 @@ func getActualArgPayload(origActualExpr, actualExprClone *ast.CallExpr, pass *an
var arg ArgPayload
- if value.IsExprError(pass, origArgExpr) {
+ if errMethodExists {
+ arg = &ErrorMethodPayload{}
+ } else if value.IsExprError(pass, origArgExpr) {
arg = newErrPayload(origArgExpr, argExprClone, pass)
} else {
switch expr := origArgExpr.(type) {
@@ -56,12 +59,6 @@ func getActualArgPayload(origActualExpr, actualExprClone *ast.CallExpr, pass *an
case *ast.BinaryExpr:
arg = parseBinaryExpr(expr, argExprClone.(*ast.BinaryExpr), pass)
-
- default:
- t := pass.TypesInfo.TypeOf(origArgExpr)
- if sig, ok := t.(*gotypes.Signature); ok {
- arg = getAsyncFuncArg(sig)
- }
}
}
@@ -70,6 +67,14 @@ func getActualArgPayload(origActualExpr, actualExprClone *ast.CallExpr, pass *an
return arg, actualOffset
}
+ t := pass.TypesInfo.TypeOf(origArgExpr)
+ if sig, ok := t.(*gotypes.Signature); ok {
+ arg = getAsyncFuncArg(sig)
+ if arg != nil {
+ return arg, actualOffset
+ }
+ }
+
return newRegularArgPayload(origArgExpr, argExprClone, pass), actualOffset
}
@@ -181,6 +186,12 @@ func (*ErrPayload) ArgType() ArgType {
return ErrActualArgType | ErrorTypeArgType
}
+type ErrorMethodPayload struct{}
+
+func (ErrorMethodPayload) ArgType() ArgType {
+ return ErrorMethodArgType | ErrorTypeArgType
+}
+
func parseBinaryExpr(origActualExpr, argExprClone *ast.BinaryExpr, pass *analysis.Pass) ArgPayload {
left, right, op := origActualExpr.X, origActualExpr.Y, origActualExpr.Op
replace := false
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/expression.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/expression.go
index 976e726fc..c2aa702b1 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/expression.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/expression/expression.go
@@ -52,7 +52,9 @@ func New(origExpr *ast.CallExpr, pass *analysis.Pass, handler gomegahandler.Hand
exprClone := astcopy.CallExpr(origExpr)
selClone := exprClone.Fun.(*ast.SelectorExpr)
- origActual := handler.GetActualExpr(origSel)
+ errMethodExists := false
+
+ origActual := handler.GetActualExpr(origSel, &errMethodExists)
if origActual == nil {
return nil, false
}
@@ -62,7 +64,7 @@ func New(origExpr *ast.CallExpr, pass *analysis.Pass, handler gomegahandler.Hand
return nil, false
}
- actl, ok := actual.New(origExpr, exprClone, origActual, actualClone, pass, handler, timePkg)
+ actl, ok := actual.New(origExpr, exprClone, origActual, actualClone, pass, handler, timePkg, errMethodExists)
if !ok {
return nil, false
}
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/dothandler.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/dothandler.go
index bd3b93992..c853ca906 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/dothandler.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/dothandler.go
@@ -51,7 +51,7 @@ func (dotHandler) GetNewWrapperMatcher(name string, existing *ast.CallExpr) *ast
}
}
-func (h dotHandler) GetActualExpr(assertionFunc *ast.SelectorExpr) *ast.CallExpr {
+func (h dotHandler) GetActualExpr(assertionFunc *ast.SelectorExpr, errMethodExists *bool) *ast.CallExpr {
actualExpr, ok := assertionFunc.X.(*ast.CallExpr)
if !ok {
return nil
@@ -66,7 +66,11 @@ func (h dotHandler) GetActualExpr(assertionFunc *ast.SelectorExpr) *ast.CallExpr
return actualExpr
}
} else {
- return h.GetActualExpr(fun)
+ if fun.Sel.Name == "Error" {
+ *errMethodExists = true
+ }
+
+ return h.GetActualExpr(fun, errMethodExists)
}
}
return nil
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/handler.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/handler.go
index 4dba604a4..414438ba6 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/handler.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/handler.go
@@ -18,7 +18,7 @@ type Handler interface {
// ReplaceFunction replaces the function with another one, for fix suggestions
ReplaceFunction(*ast.CallExpr, *ast.Ident)
- GetActualExpr(assertionFunc *ast.SelectorExpr) *ast.CallExpr
+ GetActualExpr(assertionFunc *ast.SelectorExpr, errMethodExists *bool) *ast.CallExpr
GetActualExprClone(origFunc, funcClone *ast.SelectorExpr) *ast.CallExpr
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/namedhandler.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/namedhandler.go
index 712442426..66d563311 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/namedhandler.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/gomegahandler/namedhandler.go
@@ -51,7 +51,7 @@ func (g nameHandler) isGomegaVar(x ast.Expr) bool {
return gomegainfo.IsGomegaVar(x, g.pass)
}
-func (g nameHandler) GetActualExpr(assertionFunc *ast.SelectorExpr) *ast.CallExpr {
+func (g nameHandler) GetActualExpr(assertionFunc *ast.SelectorExpr, errMethodExists *bool) *ast.CallExpr {
actualExpr, ok := assertionFunc.X.(*ast.CallExpr)
if !ok {
return nil
@@ -69,7 +69,10 @@ func (g nameHandler) GetActualExpr(assertionFunc *ast.SelectorExpr) *ast.CallExp
return actualExpr
}
} else {
- return g.GetActualExpr(fun)
+ if fun.Sel.Name == "Error" {
+ *errMethodExists = true
+ }
+ return g.GetActualExpr(fun, errMethodExists)
}
}
return nil
diff --git a/vendor/github.com/nunnatsa/ginkgolinter/internal/rules/errorequalnilrule.go b/vendor/github.com/nunnatsa/ginkgolinter/internal/rules/errorequalnilrule.go
index 7aaf7631b..81932cc2c 100644
--- a/vendor/github.com/nunnatsa/ginkgolinter/internal/rules/errorequalnilrule.go
+++ b/vendor/github.com/nunnatsa/ginkgolinter/internal/rules/errorequalnilrule.go
@@ -12,8 +12,15 @@ import (
type ErrorEqualNilRule struct{}
func (ErrorEqualNilRule) isApplied(gexp *expression.GomegaExpression, config types.Config) bool {
- return !bool(config.SuppressErr) &&
- gexp.ActualArgTypeIs(actual.ErrorTypeArgType) &&
+ if config.SuppressErr {
+ return false
+ }
+
+ if !gexp.IsAsync() && gexp.ActualArgTypeIs(actual.FuncSigArgType) {
+ return false
+ }
+
+ return gexp.ActualArgTypeIs(actual.ErrorTypeArgType) &&
gexp.MatcherTypeIs(matcher.BeNilMatcherType|matcher.EqualNilMatcherType)
}