upgrade: mockery and proto-gen, and regen files (#22634)

* update: mockery to v3 and generate mocks

* update: protoc-gen to v1.5.1 and regen proto go files

* fix: use InterfaceName_mock.go for filename in mockery

* update: generate mock files with mockery v3

* fix: case in structname in mockery config

* update: testcase errMsg in TestPatchStruct

* update: increase timeout for context in TestSubscribeBackend_IntegrationWithServer_TLSReload

Author: sreeram77

.grpcmocks.yaml

@@ -1,21 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-with-expecter: true
+dir: grpcmocks/{{.InterfaceDirRelative}}
+exclude-interface-regex: (serverStream|Is(Inmem|Cloning).*Client)
+include-interface-regex: .*
+structname: '{{.InterfaceName}}'
+pkgname: mock{{.SrcPackageName}}
 recursive: true
-include-regex: ".*"
-exclude-regex: "(serverStream|Is(Inmem|Cloning).*Client)"
-# We don't want the mocks within proto-public to prevent forcing a dependency
-# of the testify library on the modules usage. The mocks are only for
-# internal testing purposes. Other consumers can generated the mocks into
-# their own code base.
-dir: "grpcmocks/{{.InterfaceDirRelative}}"
-outpkg: "mock{{.PackageName}}"
-mockname: "{{.InterfaceName}}"
+template: testify
+filename: 'mock_{{.InterfaceName}}.go'
+template-data:
+  unroll-variadic: true
 packages:
-  github.com/hashicorp/consul/proto-public/pbacl:
-  github.com/hashicorp/consul/proto-public/pbconnectca:
-  github.com/hashicorp/consul/proto-public/pbdataplane:
-  github.com/hashicorp/consul/proto-public/pbserverdiscovery:
-  github.com/hashicorp/consul/proto-public/pbresource:
-  github.com/hashicorp/consul/proto-public/pbdns:
+  github.com/hashicorp/consul/proto-public/pbacl: {}
+  github.com/hashicorp/consul/proto-public/pbconnectca: {}
+  github.com/hashicorp/consul/proto-public/pbdataplane: {}
+  github.com/hashicorp/consul/proto-public/pbdns: {}
+  github.com/hashicorp/consul/proto-public/pbresource: {}
+  github.com/hashicorp/consul/proto-public/pbserverdiscovery: {}

Makefile

@@ -11,10 +11,10 @@ GO_MODULES := $(shell find . -name go.mod -exec dirname {} \; | grep -v "proto-g
 # or the string @DEV to imply use what is currently installed locally.
 ###
 GOLANGCI_LINT_VERSION='v1.64.8'
-MOCKERY_VERSION='v2.53.4'
+MOCKERY_VERSION='v3.5.2'
 BUF_VERSION='v1.26.0'
 
-PROTOC_GEN_GO_GRPC_VERSION='v1.2.0'
+PROTOC_GEN_GO_GRPC_VERSION='v1.5.1'
 MOG_VERSION='74a24e5f2782c2421cc6335c478686f62e9a0688'
 PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
 PROTOC_GEN_GO_BINARY_VERSION='v0.1.0'

agent/consul/reporting/.mockery.yaml

@@ -0,0 +1,14 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: BUSL-1.1
+
+all: true
+dir: reportingmock
+structname: '{{.InterfaceName}}'
+pkgname: reportingmock
+filename: 'mock_{{.InterfaceName}}.go'
+recursive: false
+template: testify
+template-data:
+  unroll-variadic: true
+packages:
+  github.com/hashicorp/consul/agent/consul/reporting: {}