Move mockgen to a go.mod managed tool

tobio · tobio · commit be99981a5099 · 2025-07-06T14:29:54.000+10:00
diff --git a/Makefile b/Makefile
@@ -250,7 +250,6 @@ tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs ge
 	@ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
 	@ cd tools && go install github.com/goreleaser/goreleaser/v2
 	@ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
-	@ cd tools && go install go.uber.org/mock/mockgen
 
 .PHONY: tools-golangci-lint
 tools-golangci-lint: ## Download golangci-lint locally if necessary.
diff --git a/generated/alerting/api_alerting_mocks.go b/generated/alerting/api_alerting_mocks.go
diff --git a/generated/alerting/mocks.go b/generated/alerting/mocks.go
@@ -0,0 +1,3 @@
+package alerting
+
+//go:generate go tool go.uber.org/mock/mockgen -destination=./api_alerting_mocks.go -package=alerting -source ./api_alerting.go AlertingAPI
diff --git a/go.mod b/go.mod
@@ -88,3 +88,5 @@ require (
 )
 
 replace github.com/disaster37/go-kibana-rest/v8 => ./libs/go-kibana-rest
+
+tool go.uber.org/mock/mockgen
diff --git a/internal/clients/kibana/alerting.go b/internal/clients/kibana/alerting.go
@@ -150,6 +150,7 @@ func ruleActionsToActionsInner(ruleActions []models.AlertingRuleAction) []alerti
 	return actions
 }
 
+//go:generate go tool go.uber.org/mock/mockgen -destination=./alerting_mocks.go -package=kibana -source ./alerting.go ApiClient
 type ApiClient interface {
 	GetAlertingClient() (alerting.AlertingAPI, error)
 	SetAlertingAuthContext(context.Context) context.Context
diff --git a/internal/clients/kibana/alerting_mocks.go b/internal/clients/kibana/alerting_mocks.go
diff --git a/tools/connectors_gen.go b/tools/connectors_gen.go
@@ -1,5 +1,3 @@
 //go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -package connectors -o ../generated/connectors/connectors.gen.go -generate "types,client" ../generated/connectors/bundled.yaml
-//go:generate go run go.uber.org/mock/mockgen -destination=../generated/alerting/api_alerting_mocks.go -package=alerting -source ../generated/alerting/api_alerting.go AlertingAPI
-//go:generate go run go.uber.org/mock/mockgen -destination=../internal/clients/kibana/alerting_mocks.go -package=kibana -source ../internal/clients/kibana/alerting.go ApiClient
 
 package tools
diff --git a/tools/go.mod b/tools/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/goreleaser/goreleaser/v2 v2.10.2
 	github.com/hashicorp/terraform-plugin-docs v0.21.0
 	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
-	go.uber.org/mock v0.5.2
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/tools/go.sum b/tools/go.sum
@@ -1057,8 +1057,6 @@ go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwE
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
-go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
diff --git a/tools/tools.go b/tools/tools.go
@@ -8,6 +8,5 @@ import (
 	_ "github.com/goreleaser/goreleaser/v2"
 	_ "github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs"
 	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
-	_ "go.uber.org/mock/mockgen"
 	_ "gopkg.in/yaml.v3"
 )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package alerting`
	`2`	`+`
	`3`	`+//go:generate go tool go.uber.org/mock/mockgen -destination=./api_alerting_mocks.go -package=alerting -source ./api_alerting.go AlertingAPI`
Original file line number	Diff line number	Diff line change
`@@ -88,3 +88,5 @@ require (`
`88`	`88`	`)`
`89`	`89`
`90`	`90`	`replace github.com/disaster37/go-kibana-rest/v8 => ./libs/go-kibana-rest`
	`91`	`+`
	`92`	`+tool go.uber.org/mock/mockgen`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ func ruleActionsToActionsInner(ruleActions []models.AlertingRuleAction) []alerti`
`150`	`150`	`return actions`
`151`	`151`	`}`
`152`	`152`
	`153`	`+//go:generate go tool go.uber.org/mock/mockgen -destination=./alerting_mocks.go -package=kibana -source ./alerting.go ApiClient`
`153`	`154`	`type ApiClient interface {`
`154`	`155`	`GetAlertingClient() (alerting.AlertingAPI, error)`
`155`	`156`	`SetAlertingAuthContext(context.Context) context.Context`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ require (`
`9`	`9`	`github.com/goreleaser/goreleaser/v2 v2.10.2`
`10`	`10`	`github.com/hashicorp/terraform-plugin-docs v0.21.0`
`11`	`11`	`github.com/oapi-codegen/oapi-codegen/v2 v2.4.1`
`12`		`- go.uber.org/mock v0.5.2`
`13`	`12`	`gopkg.in/yaml.v3 v3.0.1`
`14`	`13`	`)`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,5 @@ import (`
`8`	`8`	`_ "github.com/goreleaser/goreleaser/v2"`
`9`	`9`	`_ "github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs"`
`10`	`10`	`_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"`
`11`		`- _ "go.uber.org/mock/mockgen"`
`12`	`11`	`_ "gopkg.in/yaml.v3"`
`13`	`12`	`)`