diff --git a/go.mod b/go.mod index 780b571c77..b041b755d4 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.6.0 github.com/itchyny/gojq v0.12.17 - github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0 + github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 github.com/mitchellh/hashstructure v1.1.0 github.com/mitchellh/mapstructure v1.5.0 github.com/onsi/ginkgo/v2 v2.22.2 diff --git a/go.sum b/go.sum index a5d0d4bdc2..e107441036 100644 --- a/go.sum +++ b/go.sum @@ -1781,8 +1781,8 @@ github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0 h1:ERhc+PJKEyqWQnKu7/K0frSVGFihYYImqNdqP5r0cN0= -github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0/go.mod h1:tU2wQdIyJ7fib/YXxFR0dgLlFz3yl4p275UfUKmDFjk= +github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 h1:yVCLo4+ACVroOEr4iFU1iH46Ldlzz2rTuu18Ra7M8sU= +github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2/go.mod h1:VzB2VoMh1Y32/QqDfg9ZJYHj99oM4LiGtqPZydTiQSQ= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0= diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/arguments/parser.go b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/arguments/parser.go index 557d4959f1..7b1ec82a31 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/arguments/parser.go +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/arguments/parser.go @@ -91,7 +91,7 @@ func New(args []string, workingDir string, evaler Evaler, stater Stater) (*Parse } func (a *ParsedArguments) PrettyPrint() { - b, _ := json.Marshal(a) + b, _ := json.MarshalIndent(a, "", " ") fmt.Println(string(b)) } diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/fake.go b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/fake.go index bf88f18d79..5c2a6fd1ac 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/fake.go +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/fake.go @@ -25,19 +25,22 @@ const ( // Fake is used to generate a Fake implementation of an interface. type Fake struct { - Packages []*packages.Package - Package *packages.Package - Target *types.TypeName - Mode FakeMode - DestinationPackage string - Name string - TargetAlias string - TargetName string - TargetPackage string - Imports Imports - Methods []Method - Function Method - Header string + Packages []*packages.Package + Package *packages.Package + Target *types.TypeName + Mode FakeMode + DestinationPackage string + Name string + GenericTypeParametersAndConstraints string + GenericTypeParameters string + GenericTypeConstraints string + TargetAlias string + TargetName string + TargetPackage string + Imports Imports + Methods []Method + Function Method + Header string } // Method is a method of the interface. diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go index 1a8fde9b46..3be9c1a5c3 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go @@ -27,7 +27,7 @@ import ( {{- end}} ) -type {{.Name}} struct { +type {{.Name}}{{.GenericTypeParametersAndConstraints}} struct { {{- range .Methods}} {{.Name}}Stub func({{.Params.AsArgs}}) {{.Returns.AsReturnSignature}} {{UnExport .Name}}Mutex sync.RWMutex @@ -54,7 +54,7 @@ type {{.Name}} struct { } {{range .Methods -}} -func (fake *{{$.Name}}) {{.Name}}({{.Params.AsNamedArgsWithTypes}}) {{.Returns.AsReturnSignature}} { +func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{.Name}}({{.Params.AsNamedArgsWithTypes}}) {{.Returns.AsReturnSignature}} { {{- range .Params.Slices}} var {{UnExport .Name}}Copy {{.Type}} if {{UnExport .Name}} != nil { @@ -90,20 +90,20 @@ func (fake *{{$.Name}}) {{.Name}}({{.Params.AsNamedArgsWithTypes}}) {{.Returns.A {{- end}} } -func (fake *{{$.Name}}) {{Title .Name}}CallCount() int { +func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{Title .Name}}CallCount() int { fake.{{UnExport .Name}}Mutex.RLock() defer fake.{{UnExport .Name}}Mutex.RUnlock() return len(fake.{{UnExport .Name}}ArgsForCall) } -func (fake *{{$.Name}}) {{Title .Name}}Calls(stub func({{.Params.AsArgs}}) {{.Returns.AsReturnSignature}}) { +func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{Title .Name}}Calls(stub func({{.Params.AsArgs}}) {{.Returns.AsReturnSignature}}) { fake.{{UnExport .Name}}Mutex.Lock() defer fake.{{UnExport .Name}}Mutex.Unlock() fake.{{.Name}}Stub = stub } {{if .Params.HasLength -}} -func (fake *{{$.Name}}) {{Title .Name}}ArgsForCall(i int) {{.Params.AsReturnSignature}} { +func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{Title .Name}}ArgsForCall(i int) {{.Params.AsReturnSignature}} { fake.{{UnExport .Name}}Mutex.RLock() defer fake.{{UnExport .Name}}Mutex.RUnlock() argsForCall := fake.{{UnExport .Name}}ArgsForCall[i] @@ -112,7 +112,7 @@ func (fake *{{$.Name}}) {{Title .Name}}ArgsForCall(i int) {{.Params.AsReturnSign {{- end}} {{if .Returns.HasLength -}} -func (fake *{{$.Name}}) {{Title .Name}}Returns({{.Returns.AsNamedArgsWithTypes}}) { +func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{Title .Name}}Returns({{.Returns.AsNamedArgsWithTypes}}) { fake.{{UnExport .Name}}Mutex.Lock() defer fake.{{UnExport .Name}}Mutex.Unlock() fake.{{.Name}}Stub = nil @@ -123,7 +123,7 @@ func (fake *{{$.Name}}) {{Title .Name}}Returns({{.Returns.AsNamedArgsWithTypes}} }{ {{- .Returns.AsNamedArgs -}} } } -func (fake *{{$.Name}}) {{Title .Name}}ReturnsOnCall(i int, {{.Returns.AsNamedArgsWithTypes}}) { +func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{Title .Name}}ReturnsOnCall(i int, {{.Returns.AsNamedArgsWithTypes}}) { fake.{{UnExport .Name}}Mutex.Lock() defer fake.{{UnExport .Name}}Mutex.Unlock() fake.{{.Name}}Stub = nil @@ -144,7 +144,7 @@ func (fake *{{$.Name}}) {{Title .Name}}ReturnsOnCall(i int, {{.Returns.AsNamedAr {{end -}} {{end}} -func (fake *{{.Name}}) Invocations() map[string][][]interface{} { +func (fake *{{.Name}}{{$.GenericTypeParameters}}) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() {{- range .Methods}} @@ -158,7 +158,7 @@ func (fake *{{.Name}}) Invocations() map[string][][]interface{} { return copiedInvocations } -func (fake *{{.Name}}) recordInvocation(key string, args []interface{}) { +func (fake *{{.Name}}{{$.GenericTypeParameters}}) recordInvocation(key string, args []interface{}) { fake.invocationsMutex.Lock() defer fake.invocationsMutex.Unlock() if fake.invocations == nil { @@ -171,6 +171,6 @@ func (fake *{{.Name}}) recordInvocation(key string, args []interface{}) { } {{if IsExported .TargetName -}} -var _ {{.TargetAlias}}.{{.TargetName}} = new({{.Name}}) +var _ {{.TargetAlias}}.{{.TargetName}}{{.GenericTypeConstraints}} = new({{.Name}}{{.GenericTypeConstraints}}) {{- end}} ` diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/loader.go b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/loader.go index 4a8695b1ed..106ddfbd58 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/loader.go +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/loader.go @@ -57,9 +57,34 @@ func (f *Fake) loadPackages(c Cacher, workingDir string) error { return nil } +func (f *Fake) getGenericTypeData(typeName *types.TypeName) (paramNames []string, constraintNames []string, paramAndConstraintNames []string, found bool) { + if named, ok := typeName.Type().(*types.Named); ok { + if _, ok := named.Underlying().(*types.Interface); ok { + typeParams := named.TypeParams() + if typeParams.Len() > 0 { + for i := 0; i < typeParams.Len(); i++ { + param := typeParams.At(i) + paramName := param.Obj().Name() + constraint := param.Constraint() + constraintSections := strings.Split(constraint.String(), "/") + constraintName := constraintSections[len(constraintSections)-1] + paramNames = append(paramNames, paramName) + constraintNames = append(constraintNames, constraintName) + paramAndConstraintNames = append(paramAndConstraintNames, fmt.Sprintf("%s %s", paramName, constraintName)) + found = true + } + } + } + } + return +} + func (f *Fake) findPackage() error { var target *types.TypeName var pkg *packages.Package + genericTypeParametersAndConstraints := []string{} + genericTypeConstraints := []string{} + genericTypeParameters := []string{} for i := range f.Packages { if f.Packages[i].Types == nil || f.Packages[i].Types.Scope() == nil { continue @@ -72,6 +97,15 @@ func (f *Fake) findPackage() error { raw := pkg.Types.Scope().Lookup(f.TargetName) if raw != nil { if typeName, ok := raw.(*types.TypeName); ok { + if paramNames, constraintNames, paramAndConstraintNames, found := f.getGenericTypeData(typeName); found { + genericTypeParameters = append(genericTypeParameters, paramNames...) + genericTypeConstraints = append(genericTypeConstraints, constraintNames...) + genericTypeParametersAndConstraints = append( + genericTypeParametersAndConstraints, + paramAndConstraintNames..., + ) + } + target = typeName break } @@ -89,6 +123,11 @@ func (f *Fake) findPackage() error { f.Target = target f.Package = pkg f.TargetPackage = imports.VendorlessPath(pkg.PkgPath) + if len(genericTypeParameters) > 0 { + f.GenericTypeParametersAndConstraints = fmt.Sprintf("[%s]", strings.Join(genericTypeParametersAndConstraints, ", ")) + f.GenericTypeParameters = fmt.Sprintf("[%s]", strings.Join(genericTypeParameters, ", ")) + f.GenericTypeConstraints = fmt.Sprintf("[%s]", strings.Join(genericTypeConstraints, ", ")) + } t := f.Imports.Add(pkg.Name, f.TargetPackage) f.TargetAlias = t.Alias if f.Mode != Package { @@ -97,7 +136,7 @@ func (f *Fake) findPackage() error { if f.Mode == InterfaceOrFunction { if !f.IsInterface() && !f.IsFunction() { - return fmt.Errorf("cannot generate an fake for %s because it is not an interface or function", f.TargetName) + return fmt.Errorf("cannot generate a fake for %s because it is not an interface or function", f.TargetName) } } @@ -130,14 +169,10 @@ func (f *Fake) addImportsFor(typ types.Type) { f.addImportsFor(t.Elem()) case *types.Chan: f.addImportsFor(t.Elem()) + case *types.Alias: + f.addImportsForNamedType(t) case *types.Named: - if t.Obj() != nil && t.Obj().Pkg() != nil { - typeArgs := t.TypeArgs() - for i := 0; i < typeArgs.Len(); i++ { - f.addImportsFor(typeArgs.At(i)) - } - f.Imports.Add(t.Obj().Pkg().Name(), t.Obj().Pkg().Path()) - } + f.addImportsForNamedType(t) case *types.Slice: f.addImportsFor(t.Elem()) case *types.Array: @@ -154,3 +189,16 @@ func (f *Fake) addImportsFor(typ types.Type) { log.Printf("!!! WARNING: Missing case for type %s\n", reflect.TypeOf(typ).String()) } } + +func (f *Fake) addImportsForNamedType(t interface { + Obj() *types.TypeName + TypeArgs() *types.TypeList +}) { + if t.Obj() != nil && t.Obj().Pkg() != nil { + typeArgs := t.TypeArgs() + for i := 0; i < typeArgs.Len(); i++ { + f.addImportsFor(typeArgs.At(i)) + } + f.Imports.Add(t.Obj().Pkg().Name(), t.Obj().Pkg().Path()) + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt index ce984e28a6..526345a1c6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -435,8 +435,8 @@ github.com/mattn/go-isatty # github.com/mattn/go-sqlite3 v1.14.24 ## explicit; go 1.19 github.com/mattn/go-sqlite3 -# github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0 -## explicit; go 1.22.0 +# github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 +## explicit; go 1.23 github.com/maxbrunsfeld/counterfeiter/v6 github.com/maxbrunsfeld/counterfeiter/v6/arguments github.com/maxbrunsfeld/counterfeiter/v6/command