Bump to mockery v3

mockery has introduced breaking changes and switched to a v3 branch,
this migrates to that, mostly using the built-in migration tool. Mocks
are now generated in single files per package, except in packages
containing mocks for multiple interface packages (in
pkg/kubelet/container/testing).

Signed-off-by: Stephen Kitt <skitt@redhat.com>

Kubernetes-commit: 81cec6df1d0b6393ff25195aa3be65e79d341197

rest/.mockery.yaml

@@ -1,10 +1,11 @@
 ---
 dir: .
-filename: "mock_{{.InterfaceName | snakecase}}_test.go"
+pkgname: rest
+template: testify
+template-data:
   boilerplate-file: ../../../../../hack/boilerplate/boilerplate.generatego.txt
-outpkg: rest
+  unroll-variadic: true
-with-expecter: true
 packages:
   k8s.io/client-go/rest:
     interfaces:
-      BackoffManager:
+      BackoffManager: {}

rest/mocks_test.go

@@ -14,18 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
 
 package rest
 
 import (
+	"net/url"
+	"time"
+
 	mock "github.com/stretchr/testify/mock"
-
-	time "time"
-
-	url "net/url"
 )
 
+// NewMockBackoffManager creates a new instance of MockBackoffManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockBackoffManager(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockBackoffManager {
+	mock := &MockBackoffManager{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
 // MockBackoffManager is an autogenerated mock type for the BackoffManager type
 type MockBackoffManager struct {
 	mock.Mock
@@ -39,21 +54,20 @@ func (_m *MockBackoffManager) EXPECT() *MockBackoffManager_Expecter {
 	return &MockBackoffManager_Expecter{mock: &_m.Mock}
 }
 
-// CalculateBackoff provides a mock function with given fields: actualURL
+// CalculateBackoff provides a mock function for the type MockBackoffManager
-func (_m *MockBackoffManager) CalculateBackoff(actualURL *url.URL) time.Duration {
+func (_mock *MockBackoffManager) CalculateBackoff(actualURL *url.URL) time.Duration {
-	ret := _m.Called(actualURL)
+	ret := _mock.Called(actualURL)
 
 	if len(ret) == 0 {
 		panic("no return value specified for CalculateBackoff")
 	}
 
 	var r0 time.Duration
-	if rf, ok := ret.Get(0).(func(*url.URL) time.Duration); ok {
+	if returnFunc, ok := ret.Get(0).(func(*url.URL) time.Duration); ok {
-		r0 = rf(actualURL)
+		r0 = returnFunc(actualURL)
 	} else {
 		r0 = ret.Get(0).(time.Duration)
 	}
-
 	return r0
 }
 
@@ -70,24 +84,31 @@ func (_e *MockBackoffManager_Expecter) CalculateBackoff(actualURL interface{}) *
 
 func (_c *MockBackoffManager_CalculateBackoff_Call) Run(run func(actualURL *url.URL)) *MockBackoffManager_CalculateBackoff_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*url.URL))
+		var arg0 *url.URL
+		if args[0] != nil {
+			arg0 = args[0].(*url.URL)
+		}
+		run(
+			arg0,
+		)
 	})
 	return _c
 }
 
-func (_c *MockBackoffManager_CalculateBackoff_Call) Return(_a0 time.Duration) *MockBackoffManager_CalculateBackoff_Call {
+func (_c *MockBackoffManager_CalculateBackoff_Call) Return(duration time.Duration) *MockBackoffManager_CalculateBackoff_Call {
-	_c.Call.Return(_a0)
+	_c.Call.Return(duration)
 	return _c
 }
 
-func (_c *MockBackoffManager_CalculateBackoff_Call) RunAndReturn(run func(*url.URL) time.Duration) *MockBackoffManager_CalculateBackoff_Call {
+func (_c *MockBackoffManager_CalculateBackoff_Call) RunAndReturn(run func(actualURL *url.URL) time.Duration) *MockBackoffManager_CalculateBackoff_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
-// Sleep provides a mock function with given fields: d
+// Sleep provides a mock function for the type MockBackoffManager
-func (_m *MockBackoffManager) Sleep(d time.Duration) {
+func (_mock *MockBackoffManager) Sleep(d time.Duration) {
-	_m.Called(d)
+	_mock.Called(d)
+	return
 }
 
 // MockBackoffManager_Sleep_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Sleep'
@@ -103,7 +124,13 @@ func (_e *MockBackoffManager_Expecter) Sleep(d interface{}) *MockBackoffManager_
 
 func (_c *MockBackoffManager_Sleep_Call) Run(run func(d time.Duration)) *MockBackoffManager_Sleep_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(time.Duration))
+		var arg0 time.Duration
+		if args[0] != nil {
+			arg0 = args[0].(time.Duration)
+		}
+		run(
+			arg0,
+		)
 	})
 	return _c
 }
@@ -113,14 +140,15 @@ func (_c *MockBackoffManager_Sleep_Call) Return() *MockBackoffManager_Sleep_Call
 	return _c
 }
 
-func (_c *MockBackoffManager_Sleep_Call) RunAndReturn(run func(time.Duration)) *MockBackoffManager_Sleep_Call {
+func (_c *MockBackoffManager_Sleep_Call) RunAndReturn(run func(d time.Duration)) *MockBackoffManager_Sleep_Call {
 	_c.Run(run)
 	return _c
 }
 
-// UpdateBackoff provides a mock function with given fields: actualURL, err, responseCode
+// UpdateBackoff provides a mock function for the type MockBackoffManager
-func (_m *MockBackoffManager) UpdateBackoff(actualURL *url.URL, err error, responseCode int) {
+func (_mock *MockBackoffManager) UpdateBackoff(actualURL *url.URL, err error, responseCode int) {
-	_m.Called(actualURL, err, responseCode)
+	_mock.Called(actualURL, err, responseCode)
+	return
 }
 
 // MockBackoffManager_UpdateBackoff_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateBackoff'
@@ -138,7 +166,23 @@ func (_e *MockBackoffManager_Expecter) UpdateBackoff(actualURL interface{}, err
 
 func (_c *MockBackoffManager_UpdateBackoff_Call) Run(run func(actualURL *url.URL, err error, responseCode int)) *MockBackoffManager_UpdateBackoff_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*url.URL), args[1].(error), args[2].(int))
+		var arg0 *url.URL
+		if args[0] != nil {
+			arg0 = args[0].(*url.URL)
+		}
+		var arg1 error
+		if args[1] != nil {
+			arg1 = args[1].(error)
+		}
+		var arg2 int
+		if args[2] != nil {
+			arg2 = args[2].(int)
+		}
+		run(
+			arg0,
+			arg1,
+			arg2,
+		)
 	})
 	return _c
 }
@@ -148,21 +192,7 @@ func (_c *MockBackoffManager_UpdateBackoff_Call) Return() *MockBackoffManager_Up
 	return _c
 }
 
-func (_c *MockBackoffManager_UpdateBackoff_Call) RunAndReturn(run func(*url.URL, error, int)) *MockBackoffManager_UpdateBackoff_Call {
+func (_c *MockBackoffManager_UpdateBackoff_Call) RunAndReturn(run func(actualURL *url.URL, err error, responseCode int)) *MockBackoffManager_UpdateBackoff_Call {
 	_c.Run(run)
 	return _c
 }
-
-// NewMockBackoffManager creates a new instance of MockBackoffManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockBackoffManager(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockBackoffManager {
-	mock := &MockBackoffManager{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}