From 8b713fe618d268dca256ec51811eeef68e5b9e38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:44:02 +0000 Subject: [PATCH] chore(deps): Bump github.com/vektra/mockery/v2 from 2.49.0 to 2.49.1 (#72) --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/vektra/mockery/v2/.gitignore | 3 ++- .../github.com/vektra/mockery/v2/.mockery.yaml | 6 ++++++ vendor/github.com/vektra/mockery/v2/Taskfile.yml | 16 ++++++++++++++++ .../github.com/vektra/mockery/v2/cmd/mockery.go | 10 ++++++++++ .../vektra/mockery/v2/mockery-tools.env | 1 + .../vektra/mockery/v2/pkg/generator.go | 3 +-- vendor/modules.txt | 2 +- 9 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 vendor/github.com/vektra/mockery/v2/mockery-tools.env diff --git a/go.mod b/go.mod index 22587df..d30dcd8 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/prometheus/client_golang v1.20.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - github.com/vektra/mockery/v2 v2.49.0 + github.com/vektra/mockery/v2 v2.49.1 golang.org/x/crypto v0.29.0 ) diff --git a/go.sum b/go.sum index eed4dd9..748411b 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/temoto/robotstxt v1.1.1 h1:Gh8RCs8ouX3hRSxxK7B1mO5RFByQ4CmJZDwgom++JaA= github.com/temoto/robotstxt v1.1.1/go.mod h1:+1AmkuG3IYkh1kv0d2qEB9Le88ehNO0zwOr3ujewlOo= -github.com/vektra/mockery/v2 v2.49.0 h1:KFJKqRa0zd4h+ntM+JFr9Z6fIz++CUgAAogPWnwTwJY= -github.com/vektra/mockery/v2 v2.49.0/go.mod h1:xO2DeYemEPC2tCzIZ+a1tifZ/7Laf/Chxg3vlc+oDsI= +github.com/vektra/mockery/v2 v2.49.1 h1:P33NkpxL5QNsteqdtOAEOJ94kKXaqdsTHeD6GtVuNUc= +github.com/vektra/mockery/v2 v2.49.1/go.mod h1:xO2DeYemEPC2tCzIZ+a1tifZ/7Laf/Chxg3vlc+oDsI= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/vendor/github.com/vektra/mockery/v2/.gitignore b/vendor/github.com/vektra/mockery/v2/.gitignore index 118bda4..ce357ea 100644 --- a/vendor/github.com/vektra/mockery/v2/.gitignore +++ b/vendor/github.com/vektra/mockery/v2/.gitignore @@ -6,4 +6,5 @@ ve .cache coverage.txt site/ -.task/ \ No newline at end of file +.task/ +tools/tools diff --git a/vendor/github.com/vektra/mockery/v2/.mockery.yaml b/vendor/github.com/vektra/mockery/v2/.mockery.yaml index f359041..56b7299 100644 --- a/vendor/github.com/vektra/mockery/v2/.mockery.yaml +++ b/vendor/github.com/vektra/mockery/v2/.mockery.yaml @@ -108,4 +108,10 @@ packages: mockname: InterfaceWithUnresolvedAlias - resolve-type-alias: True mockname: InterfaceWithResolvedAlias + Interface2: + configs: + - resolve-type-alias: False + mockname: Interface2WithUnresolvedAlias + - resolve-type-alias: True + mockname: Interface2WithResolvedAlias diff --git a/vendor/github.com/vektra/mockery/v2/Taskfile.yml b/vendor/github.com/vektra/mockery/v2/Taskfile.yml index 315fa29..1802699 100644 --- a/vendor/github.com/vektra/mockery/v2/Taskfile.yml +++ b/vendor/github.com/vektra/mockery/v2/Taskfile.yml @@ -81,3 +81,19 @@ tasks: default: deps: [test.ci] + + build-tools: + desc: Build tools directory + cmds: + - cd ./tools && go build -o tools . + + tag: + desc: Tag the git repo with the version specified. + deps: [build-tools] + cmds: + - ./tools/tools tag --dry-run=false + + tag.push: + desc: Push tags to origin + cmds: + - git push origin --tags diff --git a/vendor/github.com/vektra/mockery/v2/cmd/mockery.go b/vendor/github.com/vektra/mockery/v2/cmd/mockery.go index 7e22db4..cc2d3ac 100644 --- a/vendor/github.com/vektra/mockery/v2/cmd/mockery.go +++ b/vendor/github.com/vektra/mockery/v2/cmd/mockery.go @@ -225,6 +225,16 @@ func (r *RootApp) Run() error { boilerplate = string(data) } + if !r.Config.WithExpecter { + logging.WarnDeprecated( + ctx, + "with-expecter will be permanently set to True in v3", + map[string]any{ + "url": logging.DocsURL("/deprecations/#with-expecter"), + }, + ) + } + configuredPackages, err := r.Config.GetPackages(ctx) if err != nil && !errors.Is(err, os.ErrNotExist) { return fmt.Errorf("failed to determine configured packages: %w", err) diff --git a/vendor/github.com/vektra/mockery/v2/mockery-tools.env b/vendor/github.com/vektra/mockery/v2/mockery-tools.env new file mode 100644 index 0000000..9abcce5 --- /dev/null +++ b/vendor/github.com/vektra/mockery/v2/mockery-tools.env @@ -0,0 +1 @@ +VERSION=v2.49.1 \ No newline at end of file diff --git a/vendor/github.com/vektra/mockery/v2/pkg/generator.go b/vendor/github.com/vektra/mockery/v2/pkg/generator.go index ae2ca81..7058796 100644 --- a/vendor/github.com/vektra/mockery/v2/pkg/generator.go +++ b/vendor/github.com/vektra/mockery/v2/pkg/generator.go @@ -547,8 +547,7 @@ func (g *Generator) renderType(ctx context.Context, typ types.Type) string { "url": logging.DocsURL("/deprecations/#resolve-type-alias"), }, ) - log.Debug().Msg("resolving type alias to underlying type") - return g.renderType(ctx, t.Underlying()) + return g.renderType(ctx, t.Rhs()) } log.Debug().Msg("not resolving type alias to underlying type") return g.renderNamedType(ctx, t) diff --git a/vendor/modules.txt b/vendor/modules.txt index 03c0af3..23769a7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -301,7 +301,7 @@ github.com/subosito/gotenv # github.com/temoto/robotstxt v1.1.1 ## explicit; go 1.11 github.com/temoto/robotstxt -# github.com/vektra/mockery/v2 v2.49.0 +# github.com/vektra/mockery/v2 v2.49.1 ## explicit; go 1.23 github.com/vektra/mockery/v2 github.com/vektra/mockery/v2/cmd