Remove dependency of generated client part 3

Replace generated discovery client with client-go client.
Remove generated client from PVR action.
Remove generated client from pkg/cmd directory.
Delete velero generate client from client factory.

Signed-off-by: Xun Jiang <jxun@vmware.com>
This commit is contained in:
Xun Jiang
2023-11-06 11:34:39 +08:00
parent d6146ecff4
commit 56b5e982d9
19 changed files with 121 additions and 261 deletions
+6 -86
View File
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.20.0. DO NOT EDIT.
package mocks
@@ -140,12 +140,13 @@ func (_m *Helper) ServerVersion() *version.Info {
return r0
}
// NewHelper creates a new instance of Helper. 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 NewHelper(t interface {
type mockConstructorTestingTNewHelper interface {
mock.TestingT
Cleanup(func())
}) *Helper {
}
// NewHelper creates a new instance of Helper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
func NewHelper(t mockConstructorTestingTNewHelper) *Helper {
mock := &Helper{}
mock.Mock.Test(t)
@@ -153,84 +154,3 @@ func NewHelper(t interface {
return mock
}
// serverResourcesInterface is an autogenerated mock type for the serverResourcesInterface type
type serverResourcesInterface struct {
mock.Mock
}
// ServerGroupsAndResources provides a mock function with given fields:
func (_m *serverResourcesInterface) ServerGroupsAndResources() ([]*v1.APIGroup, []*v1.APIResourceList, error) {
ret := _m.Called()
var r0 []*v1.APIGroup
var r1 []*v1.APIResourceList
var r2 error
if rf, ok := ret.Get(0).(func() ([]*v1.APIGroup, []*v1.APIResourceList, error)); ok {
return rf()
}
if rf, ok := ret.Get(0).(func() []*v1.APIGroup); ok {
r0 = rf()
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]*v1.APIGroup)
}
}
if rf, ok := ret.Get(1).(func() []*v1.APIResourceList); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).([]*v1.APIResourceList)
}
}
if rf, ok := ret.Get(2).(func() error); ok {
r2 = rf()
} else {
r2 = ret.Error(2)
}
return r0, r1, r2
}
// ServerPreferredResources provides a mock function with given fields:
func (_m *serverResourcesInterface) ServerPreferredResources() ([]*v1.APIResourceList, error) {
ret := _m.Called()
var r0 []*v1.APIResourceList
var r1 error
if rf, ok := ret.Get(0).(func() ([]*v1.APIResourceList, error)); ok {
return rf()
}
if rf, ok := ret.Get(0).(func() []*v1.APIResourceList); ok {
r0 = rf()
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]*v1.APIResourceList)
}
}
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
} else {
r1 = ret.Error(1)
}
return r0, r1
}
type mockConstructorTestingTnewServerResourcesInterface interface {
mock.TestingT
Cleanup(func())
}
// NewServerResourcesInterface creates a new instance of serverResourcesInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
func NewServerResourcesInterface(t mockConstructorTestingTnewServerResourcesInterface) *serverResourcesInterface {
mock := &serverResourcesInterface{}
mock.Mock.Test(t)
t.Cleanup(func() { mock.AssertExpectations(t) })
return mock
}