Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: automate mock generation v2 #18371

Merged
merged 6 commits into from
May 23, 2024
Merged

chore: automate mock generation v2 #18371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
610be0c
Add go:generate statements for mockery
WillAbides Nov 21, 2022
b0cfce0
revert whitespace change
WillAbides Nov 21, 2022
4095eda
go generate everything
WillAbides Nov 21, 2022
dc0e1f7
make gogen
WillAbides Nov 21, 2022
5952b54
chore: upgrade to mockery v2.40.2
blakepettersson May 22, 2024
51c4197
Merge branch 'master' into mockery-v2
blakepettersson May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ all: cli image
.PHONY: gogen
gogen:
export GO111MODULE=off
go generate ./util/argo/...
go generate ./...

.PHONY: protogen
protogen: mod-vendor-local protogen-fast
Expand Down
19 changes: 13 additions & 6 deletions applicationset/services/mocks/Repos.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions applicationset/services/mocks/RepositoryDB.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions applicationset/services/repo_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/argoproj/argo-cd/v2/util/io"
)

//go:generate go run github.com/vektra/mockery/v2@v2.25.1 --name=RepositoryDB
//go:generate go run github.com/vektra/mockery/v2@v2.40.2 --name=RepositoryDB

// RepositoryDB Is a lean facade for ArgoDB,
// Using a lean interface makes it easier to test the functionality of the git generator
Expand All @@ -27,7 +27,7 @@ type argoCDService struct {
newFileGlobbingEnabled bool
}

//go:generate go run github.com/vektra/mockery/v2@v2.25.1 --name=Repos
//go:generate go run github.com/vektra/mockery/v2@v2.40.2 --name=Repos

type Repos interface {

Expand Down
Loading
Loading