Migrate to new Mockery config

[harshil1973]

Closes #5564.

[github-actions]

Hi @harshil1973! Welcome to our community and thank you for opening your first Pull Request. Someone will review it soon. Thank you for committing to making Contour better. You can also join us on our mailing list and in our channel in the Kubernetes Slack Workspace

[codecov]

Codecov Report

Merging #5684 (c39d302) into main (a991c9c) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #5684   +/-   ##
=======================================
  Coverage   78.59%   78.59%           
=======================================
  Files         138      138           
  Lines       19150    19150           
=======================================
  Hits        15051    15051           
  Misses       3812     3812           
  Partials      287      287           

[skriss]

Thanks @harshil1973, this looks like a great start. We'll also need to change how we invoke the mock generation -- currently, we're calling go generate (

contour/Makefile

Lines 271 to 274 in acc15db

	.PHONY: generate-go
	generate-go:
	@echo "Generating mocks..."
	@go generate ./...

), but now we'll need to use the mockery binary instead (ref. https://vektra.github.io/mockery/v2.31/running/). Typically for these cases we'll do e.g. go run github.com/vektra/mockery/v2.

A good way to test this is to delete the existing mock Go files, then run make generate, and ensure they're recreated with no changes.

[sunjayBhatia]

I think we need to add an invocation of mockery in our generate-go make target, go generate doesn't actually run it anymore

[sunjayBhatia]

Thanks @harshil1973, this looks like a great start. We'll also need to change how we invoke the mock generation -- currently, we're calling go generate (

contour/Makefile

Lines 271 to 274 in acc15db

	.PHONY: generate-go
	generate-go:
	@echo "Generating mocks..."
	@go generate ./...

), but now we'll need to use the mockery binary instead (ref. https://vektra.github.io/mockery/v2.31/running/). Typically for these cases we'll do e.g. go run github.com/vektra/mockery/v2.
A good way to test this is to delete the existing mock Go files, then run make generate, and ensure they're recreated with no changes.

jinx!

[skriss]

nice, LGTM!