From c263147180ffd3aea68fe813d44d40d5426e891d Mon Sep 17 00:00:00 2001
From: DanStough <dan.stough@hashicorp.com>
Date: Thu, 16 Feb 2023 16:55:25 -0500
Subject: [PATCH] fix mockery version for 1.20.1

---
 GNUmakefile                                       | 4 ++--
 proto-public/pbdns/mock_DNSServiceClient.go       | 7 +++++--
 proto-public/pbdns/mock_DNSServiceServer.go       | 7 +++++--
 proto-public/pbdns/mock_UnsafeDNSServiceServer.go | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 05fd748996138..ee765693f4a92 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -8,10 +8,10 @@ SHELL = bash
 # or the string @DEV to imply use what is currently installed locally.
 ###
 GOLANGCI_LINT_VERSION='v1.51.1'
-MOCKERY_VERSION='v2.15.0'
+MOCKERY_VERSION='v2.20.0'
 BUF_VERSION='v1.4.0'
 PROTOC_GEN_GO_GRPC_VERSION="v1.2.0"
-MOG_VERSION='v0.3.0'
+MOG_VERSION='v0.4.0'
 PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
 PROTOC_GEN_GO_BINARY_VERSION="v0.1.0"
 DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
diff --git a/proto-public/pbdns/mock_DNSServiceClient.go b/proto-public/pbdns/mock_DNSServiceClient.go
index 24906ab8547aa..d9fffda65aef6 100644
--- a/proto-public/pbdns/mock_DNSServiceClient.go
+++ b/proto-public/pbdns/mock_DNSServiceClient.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.15.0. DO NOT EDIT.
+// Code generated by mockery v2.20.0. DO NOT EDIT.
 
 package pbdns
 
@@ -27,6 +27,10 @@ func (_m *MockDNSServiceClient) Query(ctx context.Context, in *QueryRequest, opt
 	ret := _m.Called(_ca...)
 
 	var r0 *QueryResponse
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *QueryRequest, ...grpc.CallOption) (*QueryResponse, error)); ok {
+		return rf(ctx, in, opts...)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *QueryRequest, ...grpc.CallOption) *QueryResponse); ok {
 		r0 = rf(ctx, in, opts...)
 	} else {
@@ -35,7 +39,6 @@ func (_m *MockDNSServiceClient) Query(ctx context.Context, in *QueryRequest, opt
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *QueryRequest, ...grpc.CallOption) error); ok {
 		r1 = rf(ctx, in, opts...)
 	} else {
diff --git a/proto-public/pbdns/mock_DNSServiceServer.go b/proto-public/pbdns/mock_DNSServiceServer.go
index e9bd338daf120..e78c7d4c304b7 100644
--- a/proto-public/pbdns/mock_DNSServiceServer.go
+++ b/proto-public/pbdns/mock_DNSServiceServer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.15.0. DO NOT EDIT.
+// Code generated by mockery v2.20.0. DO NOT EDIT.
 
 package pbdns
 
@@ -18,6 +18,10 @@ func (_m *MockDNSServiceServer) Query(_a0 context.Context, _a1 *QueryRequest) (*
 	ret := _m.Called(_a0, _a1)
 
 	var r0 *QueryResponse
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *QueryRequest) (*QueryResponse, error)); ok {
+		return rf(_a0, _a1)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *QueryRequest) *QueryResponse); ok {
 		r0 = rf(_a0, _a1)
 	} else {
@@ -26,7 +30,6 @@ func (_m *MockDNSServiceServer) Query(_a0 context.Context, _a1 *QueryRequest) (*
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *QueryRequest) error); ok {
 		r1 = rf(_a0, _a1)
 	} else {
diff --git a/proto-public/pbdns/mock_UnsafeDNSServiceServer.go b/proto-public/pbdns/mock_UnsafeDNSServiceServer.go
index 0a6c47c2cb7b2..43a9e1e461aec 100644
--- a/proto-public/pbdns/mock_UnsafeDNSServiceServer.go
+++ b/proto-public/pbdns/mock_UnsafeDNSServiceServer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.15.0. DO NOT EDIT.
+// Code generated by mockery v2.20.0. DO NOT EDIT.
 
 package pbdns