From a65c9492058d5c652f85e6b03185b569eae6873d Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Thu, 27 Mar 2025 14:52:30 +0100
Subject: all: use mockery config instead of go:generate

---
 .mockery.yaml                            | 37 ++++++++++++++++++++++++++++++++
 Makefile                                 |  5 +----
 pkg/coveragedb/coveragedb_mock_test.go   |  5 -----
 pkg/covermerger/provider_monorepo.go     |  2 --
 pkg/gcs/gcs.go                           |  2 --
 pkg/rpcserver/rpcserver.go               |  1 -
 tools/mockery.sh                         |  5 -----
 vm/proxyapp/proxyappclient_mocks_test.go |  3 ---
 8 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 .mockery.yaml
 delete mode 100755 tools/mockery.sh

diff --git a/.mockery.yaml b/.mockery.yaml
new file mode 100644
index 000000000..6f7123013
--- /dev/null
+++ b/.mockery.yaml
@@ -0,0 +1,37 @@
+# Copyright 2025 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+dir: "{{.InterfaceDir}}/mocks"
+outpkg: "mocks"
+mockname: "{{.InterfaceName}}"
+filename: "{{.InterfaceName}}.go"
+resolve-type-alias: False # TODO: remove in mockery 3
+issue-845-fix: True       # TODO: remove in mockery 3
+packages:
+  github.com/google/syzkaller/pkg/gcs:
+    interfaces:
+      Client:
+  github.com/google/syzkaller/pkg/covermerger:
+    interfaces:
+      FileVersProvider:
+  github.com/google/syzkaller/pkg/coveragedb/spannerclient:
+    config:
+      dir: "{{.InterfaceDir}}/../mocks"
+    interfaces:
+      SpannerClient:
+      ReadOnlyTransaction:
+      RowIterator:
+      Row:
+  github.com/google/syzkaller/pkg/rpcserver:
+    interfaces:
+      Manager:
+  github.com/google/syzkaller/vm/proxyapp/proxyrpc:
+    config:
+      dir: "{{.InterfaceDir}}/../mocks"
+    interfaces:
+      ProxyAppInterface:
+  github.com/google/syzkaller/vm/proxyapp:
+    config:
+      mockname: "SubProcessCmd"
+    interfaces:
+      subProcessCmd:
diff --git a/Makefile b/Makefile
index bdcaba6c1..df6535885 100644
--- a/Makefile
+++ b/Makefile
@@ -237,10 +237,7 @@ generate:
 
 generate_go: format_cpp
 	$(GO) generate ./executor ./pkg/ifuzz ./pkg/build ./pkg/rpcserver
-	$(GO) generate ./vm/proxyapp
-	$(GO) generate ./pkg/coveragedb
-	$(GO) generate ./pkg/covermerger
-	$(GO) generate ./pkg/gcs
+	$(GO) run github.com/vektra/mockery/v2@v2.52.1 --log-level="error"
 
 generate_rpc:
 	flatc -o pkg/flatrpc --warnings-as-errors --gen-object-api --filename-suffix "" --go --gen-onefile --go-namespace flatrpc pkg/flatrpc/flatrpc.fbs
diff --git a/pkg/coveragedb/coveragedb_mock_test.go b/pkg/coveragedb/coveragedb_mock_test.go
index dac6fe777..23676d31f 100644
--- a/pkg/coveragedb/coveragedb_mock_test.go
+++ b/pkg/coveragedb/coveragedb_mock_test.go
@@ -18,11 +18,6 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-//go:generate ../../tools/mockery.sh --name SpannerClient -r
-//go:generate ../../tools/mockery.sh --name ReadOnlyTransaction -r
-//go:generate ../../tools/mockery.sh --name RowIterator -r
-//go:generate ../../tools/mockery.sh --name Row -r
-
 type spannerMockTune func(*testing.T, *mocks.SpannerClient)
 
 func TestSaveMergeResult(t *testing.T) {
diff --git a/pkg/covermerger/provider_monorepo.go b/pkg/covermerger/provider_monorepo.go
index 73a08786a..7979d00d3 100644
--- a/pkg/covermerger/provider_monorepo.go
+++ b/pkg/covermerger/provider_monorepo.go
@@ -3,8 +3,6 @@
 
 package covermerger
 
-//go:generate ../../tools/mockery.sh --name FileVersProvider -r
-
 import (
 	"fmt"
 	"path/filepath"
diff --git a/pkg/gcs/gcs.go b/pkg/gcs/gcs.go
index b97e9c77a..dcdd45f5a 100644
--- a/pkg/gcs/gcs.go
+++ b/pkg/gcs/gcs.go
@@ -8,8 +8,6 @@
 // https://cloud.google.com/go/getting-started/using-cloud-storage
 // https://godoc.org/cloud.google.com/go/storage
 
-//go:generate ../../tools/mockery.sh --name Client -r
-
 package gcs
 
 import (
diff --git a/pkg/rpcserver/rpcserver.go b/pkg/rpcserver/rpcserver.go
index 43761b651..57b851001 100644
--- a/pkg/rpcserver/rpcserver.go
+++ b/pkg/rpcserver/rpcserver.go
@@ -64,7 +64,6 @@ type RemoteConfig struct {
 	Debug   bool
 }
 
-//go:generate ../../tools/mockery.sh --name Manager --output ./mocks
 type Manager interface {
 	MaxSignal() signal.Signal
 	BugFrames() (leaks []string, races []string)
diff --git a/tools/mockery.sh b/tools/mockery.sh
deleted file mode 100755
index cc29cb8f6..000000000
--- a/tools/mockery.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2022 syzkaller project authors. All rights reserved.
-# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-go run github.com/vektra/mockery/v2@v2.52.1 --log-level=error "$@"
diff --git a/vm/proxyapp/proxyappclient_mocks_test.go b/vm/proxyapp/proxyappclient_mocks_test.go
index 49166a767..cfd8fcf16 100644
--- a/vm/proxyapp/proxyappclient_mocks_test.go
+++ b/vm/proxyapp/proxyappclient_mocks_test.go
@@ -3,9 +3,6 @@
 
 package proxyapp
 
-//go:generate ../../tools/mockery.sh --name subProcessCmd --exported
-//go:generate ../../tools/mockery.sh --name ProxyAppInterface -r
-
 import (
 	"context"
 	"testing"
-- 
cgit mrf-deployment