diff --git a/flyteadmin/pkg/clusterresource/controller_test.go b/flyteadmin/pkg/clusterresource/controller_test.go index f6a966d6ef..8ef62a1850 100644 --- a/flyteadmin/pkg/clusterresource/controller_test.go +++ b/flyteadmin/pkg/clusterresource/controller_test.go @@ -121,7 +121,7 @@ func TestPopulateDefaultTemplateValues(t *testing.T) { func TestGetCustomTemplateValues(t *testing.T) { adminDataProvider := mocks.FlyteAdminDataProvider{} - adminDataProvider.OnGetClusterResourceAttributesMatch(mock.Anything, proj, domain).Return(&admin.ClusterResourceAttributes{ + adminDataProvider.EXPECT().GetClusterResourceAttributes(mock.Anything, mock.Anything, mock.Anything).Return(&admin.ClusterResourceAttributes{ Attributes: map[string]string{ "var1": "val1", "var2": "val2", @@ -148,7 +148,7 @@ func TestGetCustomTemplateValues(t *testing.T) { func TestGetCustomTemplateValues_NothingToOverride(t *testing.T) { adminDataProvider := mocks.FlyteAdminDataProvider{} - adminDataProvider.OnGetClusterResourceAttributesMatch(mock.Anything, proj, domain).Return( + adminDataProvider.EXPECT().GetClusterResourceAttributes(mock.Anything, mock.Anything, mock.Anything).Return( nil, errors.NewFlyteAdminError(codes.NotFound, "foo")) testController := controller{ adminDataProvider: &adminDataProvider, @@ -332,7 +332,7 @@ imagePullSecrets: for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { adminDataProvider := mocks.FlyteAdminDataProvider{} - adminDataProvider.OnGetClusterResourceAttributesMatch(mock.Anything, mock.Anything, mock.Anything).Return(&admin.ClusterResourceAttributes{}, nil) + adminDataProvider.EXPECT().GetClusterResourceAttributes(mock.Anything, mock.Anything, mock.Anything).Return(&admin.ClusterResourceAttributes{}, nil) mockPromScope := mockScope.NewTestScope() c := NewClusterResourceController(&adminDataProvider, &execClusterMocks.ListTargetsInterface{}, mockPromScope) diff --git a/flyteadmin/pkg/clusterresource/interfaces/admin.go b/flyteadmin/pkg/clusterresource/interfaces/admin.go index fe63687aa0..df2f4e8750 100644 --- a/flyteadmin/pkg/clusterresource/interfaces/admin.go +++ b/flyteadmin/pkg/clusterresource/interfaces/admin.go @@ -6,7 +6,7 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) -//go:generate mockery -name FlyteAdminDataProvider -output=../mocks -case=underscore +//go:generate mockery-v2 --name=FlyteAdminDataProvider --output=../mocks --case=underscore --with-expecter type FlyteAdminDataProvider interface { GetClusterResourceAttributes(ctx context.Context, project, domain string) (*admin.ClusterResourceAttributes, error) diff --git a/flyteadmin/pkg/clusterresource/mocks/flyte_admin_data_provider.go b/flyteadmin/pkg/clusterresource/mocks/flyte_admin_data_provider.go index 087426a895..f4aa5468f6 100644 --- a/flyteadmin/pkg/clusterresource/mocks/flyte_admin_data_provider.go +++ b/flyteadmin/pkg/clusterresource/mocks/flyte_admin_data_provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.1. DO NOT EDIT. +// Code generated by mockery v2.40.3. DO NOT EDIT. package mocks @@ -15,29 +15,27 @@ type FlyteAdminDataProvider struct { mock.Mock } -type FlyteAdminDataProvider_GetClusterResourceAttributes struct { - *mock.Call -} - -func (_m FlyteAdminDataProvider_GetClusterResourceAttributes) Return(_a0 *admin.ClusterResourceAttributes, _a1 error) *FlyteAdminDataProvider_GetClusterResourceAttributes { - return &FlyteAdminDataProvider_GetClusterResourceAttributes{Call: _m.Call.Return(_a0, _a1)} -} - -func (_m *FlyteAdminDataProvider) OnGetClusterResourceAttributes(ctx context.Context, project string, domain string) *FlyteAdminDataProvider_GetClusterResourceAttributes { - c_call := _m.On("GetClusterResourceAttributes", ctx, project, domain) - return &FlyteAdminDataProvider_GetClusterResourceAttributes{Call: c_call} +type FlyteAdminDataProvider_Expecter struct { + mock *mock.Mock } -func (_m *FlyteAdminDataProvider) OnGetClusterResourceAttributesMatch(matchers ...interface{}) *FlyteAdminDataProvider_GetClusterResourceAttributes { - c_call := _m.On("GetClusterResourceAttributes", matchers...) - return &FlyteAdminDataProvider_GetClusterResourceAttributes{Call: c_call} +func (_m *FlyteAdminDataProvider) EXPECT() *FlyteAdminDataProvider_Expecter { + return &FlyteAdminDataProvider_Expecter{mock: &_m.Mock} } // GetClusterResourceAttributes provides a mock function with given fields: ctx, project, domain func (_m *FlyteAdminDataProvider) GetClusterResourceAttributes(ctx context.Context, project string, domain string) (*admin.ClusterResourceAttributes, error) { ret := _m.Called(ctx, project, domain) + if len(ret) == 0 { + panic("no return value specified for GetClusterResourceAttributes") + } + var r0 *admin.ClusterResourceAttributes + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*admin.ClusterResourceAttributes, error)); ok { + return rf(ctx, project, domain) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) *admin.ClusterResourceAttributes); ok { r0 = rf(ctx, project, domain) } else { @@ -46,7 +44,6 @@ func (_m *FlyteAdminDataProvider) GetClusterResourceAttributes(ctx context.Conte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, project, domain) } else { @@ -56,29 +53,49 @@ func (_m *FlyteAdminDataProvider) GetClusterResourceAttributes(ctx context.Conte return r0, r1 } -type FlyteAdminDataProvider_GetProjects struct { +// FlyteAdminDataProvider_GetClusterResourceAttributes_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetClusterResourceAttributes' +type FlyteAdminDataProvider_GetClusterResourceAttributes_Call struct { *mock.Call } -func (_m FlyteAdminDataProvider_GetProjects) Return(_a0 *admin.Projects, _a1 error) *FlyteAdminDataProvider_GetProjects { - return &FlyteAdminDataProvider_GetProjects{Call: _m.Call.Return(_a0, _a1)} +// GetClusterResourceAttributes is a helper method to define mock.On call +// - ctx context.Context +// - project string +// - domain string +func (_e *FlyteAdminDataProvider_Expecter) GetClusterResourceAttributes(ctx interface{}, project interface{}, domain interface{}) *FlyteAdminDataProvider_GetClusterResourceAttributes_Call { + return &FlyteAdminDataProvider_GetClusterResourceAttributes_Call{Call: _e.mock.On("GetClusterResourceAttributes", ctx, project, domain)} +} + +func (_c *FlyteAdminDataProvider_GetClusterResourceAttributes_Call) Run(run func(ctx context.Context, project string, domain string)) *FlyteAdminDataProvider_GetClusterResourceAttributes_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(context.Context), args[1].(string), args[2].(string)) + }) + return _c } -func (_m *FlyteAdminDataProvider) OnGetProjects(ctx context.Context) *FlyteAdminDataProvider_GetProjects { - c_call := _m.On("GetProjects", ctx) - return &FlyteAdminDataProvider_GetProjects{Call: c_call} +func (_c *FlyteAdminDataProvider_GetClusterResourceAttributes_Call) Return(_a0 *admin.ClusterResourceAttributes, _a1 error) *FlyteAdminDataProvider_GetClusterResourceAttributes_Call { + _c.Call.Return(_a0, _a1) + return _c } -func (_m *FlyteAdminDataProvider) OnGetProjectsMatch(matchers ...interface{}) *FlyteAdminDataProvider_GetProjects { - c_call := _m.On("GetProjects", matchers...) - return &FlyteAdminDataProvider_GetProjects{Call: c_call} +func (_c *FlyteAdminDataProvider_GetClusterResourceAttributes_Call) RunAndReturn(run func(context.Context, string, string) (*admin.ClusterResourceAttributes, error)) *FlyteAdminDataProvider_GetClusterResourceAttributes_Call { + _c.Call.Return(run) + return _c } // GetProjects provides a mock function with given fields: ctx func (_m *FlyteAdminDataProvider) GetProjects(ctx context.Context) (*admin.Projects, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetProjects") + } + var r0 *admin.Projects + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) (*admin.Projects, error)); ok { + return rf(ctx) + } if rf, ok := ret.Get(0).(func(context.Context) *admin.Projects); ok { r0 = rf(ctx) } else { @@ -87,7 +104,6 @@ func (_m *FlyteAdminDataProvider) GetProjects(ctx context.Context) (*admin.Proje } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(ctx) } else { @@ -96,3 +112,45 @@ func (_m *FlyteAdminDataProvider) GetProjects(ctx context.Context) (*admin.Proje return r0, r1 } + +// FlyteAdminDataProvider_GetProjects_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetProjects' +type FlyteAdminDataProvider_GetProjects_Call struct { + *mock.Call +} + +// GetProjects is a helper method to define mock.On call +// - ctx context.Context +func (_e *FlyteAdminDataProvider_Expecter) GetProjects(ctx interface{}) *FlyteAdminDataProvider_GetProjects_Call { + return &FlyteAdminDataProvider_GetProjects_Call{Call: _e.mock.On("GetProjects", ctx)} +} + +func (_c *FlyteAdminDataProvider_GetProjects_Call) Run(run func(ctx context.Context)) *FlyteAdminDataProvider_GetProjects_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(context.Context)) + }) + return _c +} + +func (_c *FlyteAdminDataProvider_GetProjects_Call) Return(_a0 *admin.Projects, _a1 error) *FlyteAdminDataProvider_GetProjects_Call { + _c.Call.Return(_a0, _a1) + return _c +} + +func (_c *FlyteAdminDataProvider_GetProjects_Call) RunAndReturn(run func(context.Context) (*admin.Projects, error)) *FlyteAdminDataProvider_GetProjects_Call { + _c.Call.Return(run) + return _c +} + +// NewFlyteAdminDataProvider creates a new instance of FlyteAdminDataProvider. 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 NewFlyteAdminDataProvider(t interface { + mock.TestingT + Cleanup(func()) +}) *FlyteAdminDataProvider { + mock := &FlyteAdminDataProvider{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +}