diff --git a/flyteadmin/pkg/manager/interfaces/execution.go b/flyteadmin/pkg/manager/interfaces/execution.go index 9175d4a009..ad7329dff8 100644 --- a/flyteadmin/pkg/manager/interfaces/execution.go +++ b/flyteadmin/pkg/manager/interfaces/execution.go @@ -7,6 +7,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=ExecutionInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing Flyte Workflow Executions type ExecutionInterface interface { CreateExecution(ctx context.Context, request *admin.ExecutionCreateRequest, requestedAt time.Time) ( diff --git a/flyteadmin/pkg/manager/interfaces/launch_plan.go b/flyteadmin/pkg/manager/interfaces/launch_plan.go index cf20a5c21d..2ad2eb4ae3 100644 --- a/flyteadmin/pkg/manager/interfaces/launch_plan.go +++ b/flyteadmin/pkg/manager/interfaces/launch_plan.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=LaunchPlanInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing Flyte Launch Plans type LaunchPlanInterface interface { // Interface to create Launch Plans based on the request. diff --git a/flyteadmin/pkg/manager/interfaces/named_entity.go b/flyteadmin/pkg/manager/interfaces/named_entity.go index ae6b6bd204..1cd8085484 100644 --- a/flyteadmin/pkg/manager/interfaces/named_entity.go +++ b/flyteadmin/pkg/manager/interfaces/named_entity.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=NamedEntityInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing metadata associated with NamedEntityIdentifiers type NamedEntityInterface interface { GetNamedEntity(ctx context.Context, request *admin.NamedEntityGetRequest) (*admin.NamedEntity, error) diff --git a/flyteadmin/pkg/manager/interfaces/node_execution.go b/flyteadmin/pkg/manager/interfaces/node_execution.go index ad1385709c..1c6582633f 100644 --- a/flyteadmin/pkg/manager/interfaces/node_execution.go +++ b/flyteadmin/pkg/manager/interfaces/node_execution.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=NodeExecutionInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing Flyte Workflow NodeExecutions type NodeExecutionInterface interface { CreateNodeEvent(ctx context.Context, request *admin.NodeExecutionEventRequest) ( diff --git a/flyteadmin/pkg/manager/interfaces/project.go b/flyteadmin/pkg/manager/interfaces/project.go index e5f4a3cea4..6a1ac4650e 100644 --- a/flyteadmin/pkg/manager/interfaces/project.go +++ b/flyteadmin/pkg/manager/interfaces/project.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=ProjectInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing projects (and domains). type ProjectInterface interface { CreateProject(ctx context.Context, request *admin.ProjectRegisterRequest) (*admin.ProjectRegisterResponse, error) diff --git a/flyteadmin/pkg/manager/interfaces/resource.go b/flyteadmin/pkg/manager/interfaces/resource.go index 3d586a59c9..a8d3598f05 100644 --- a/flyteadmin/pkg/manager/interfaces/resource.go +++ b/flyteadmin/pkg/manager/interfaces/resource.go @@ -6,7 +6,7 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) -//go:generate mockery -name ResourceInterface -output=../mocks -case=underscore +//go:generate mockery-v2 --name=ResourceInterface --output=../mocks --case=underscore --with-expecter // ResourceInterface manages project, domain and workflow -specific attributes. type ResourceInterface interface { diff --git a/flyteadmin/pkg/manager/interfaces/task.go b/flyteadmin/pkg/manager/interfaces/task.go index 5143a29c42..4a975faf6a 100644 --- a/flyteadmin/pkg/manager/interfaces/task.go +++ b/flyteadmin/pkg/manager/interfaces/task.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=TaskInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing Flyte Tasks type TaskInterface interface { CreateTask(ctx context.Context, request *admin.TaskCreateRequest) (*admin.TaskCreateResponse, error) diff --git a/flyteadmin/pkg/manager/interfaces/task_execution.go b/flyteadmin/pkg/manager/interfaces/task_execution.go index 091189ba65..a6145d2156 100644 --- a/flyteadmin/pkg/manager/interfaces/task_execution.go +++ b/flyteadmin/pkg/manager/interfaces/task_execution.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=TaskExecutionInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing Flyte Workflow TaskExecutions type TaskExecutionInterface interface { CreateTaskExecutionEvent(ctx context.Context, request *admin.TaskExecutionEventRequest) ( diff --git a/flyteadmin/pkg/manager/interfaces/version.go b/flyteadmin/pkg/manager/interfaces/version.go index e4652c29f8..5c3955a763 100644 --- a/flyteadmin/pkg/manager/interfaces/version.go +++ b/flyteadmin/pkg/manager/interfaces/version.go @@ -6,7 +6,7 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) -//go:generate mockery -name VersionInterface -output=../mocks -case=underscore +//go:generate mockery-v2 --name=VersionInterface --output=../mocks --case=underscore --with-expecter // Interface for managing Flyte admin version type VersionInterface interface { diff --git a/flyteadmin/pkg/manager/interfaces/workflow.go b/flyteadmin/pkg/manager/interfaces/workflow.go index 66382bd667..0a97aed820 100644 --- a/flyteadmin/pkg/manager/interfaces/workflow.go +++ b/flyteadmin/pkg/manager/interfaces/workflow.go @@ -6,6 +6,8 @@ import ( "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" ) +//go:generate mockery-v2 --name=WorkflowInterface --output=../mocks --case=underscore --with-expecter + // Interface for managing Flyte Workflows type WorkflowInterface interface { CreateWorkflow(ctx context.Context, request *admin.WorkflowCreateRequest) (*admin.WorkflowCreateResponse, error) diff --git a/flyteadmin/pkg/manager/mocks/metrics_interface.go b/flyteadmin/pkg/manager/mocks/metrics_interface.go index a098a1e062..fd5ae8f34c 100644 --- a/flyteadmin/pkg/manager/mocks/metrics_interface.go +++ b/flyteadmin/pkg/manager/mocks/metrics_interface.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.3. DO NOT EDIT. +// Code generated by mockery v1.0.1. DO NOT EDIT. package mocks @@ -15,27 +15,29 @@ type MetricsInterface struct { mock.Mock } -type MetricsInterface_Expecter struct { - mock *mock.Mock +type MetricsInterface_GetExecutionMetrics struct { + *mock.Call +} + +func (_m MetricsInterface_GetExecutionMetrics) Return(_a0 *admin.WorkflowExecutionGetMetricsResponse, _a1 error) *MetricsInterface_GetExecutionMetrics { + return &MetricsInterface_GetExecutionMetrics{Call: _m.Call.Return(_a0, _a1)} } -func (_m *MetricsInterface) EXPECT() *MetricsInterface_Expecter { - return &MetricsInterface_Expecter{mock: &_m.Mock} +func (_m *MetricsInterface) OnGetExecutionMetrics(ctx context.Context, request *admin.WorkflowExecutionGetMetricsRequest) *MetricsInterface_GetExecutionMetrics { + c_call := _m.On("GetExecutionMetrics", ctx, request) + return &MetricsInterface_GetExecutionMetrics{Call: c_call} +} + +func (_m *MetricsInterface) OnGetExecutionMetricsMatch(matchers ...interface{}) *MetricsInterface_GetExecutionMetrics { + c_call := _m.On("GetExecutionMetrics", matchers...) + return &MetricsInterface_GetExecutionMetrics{Call: c_call} } // GetExecutionMetrics provides a mock function with given fields: ctx, request func (_m *MetricsInterface) GetExecutionMetrics(ctx context.Context, request *admin.WorkflowExecutionGetMetricsRequest) (*admin.WorkflowExecutionGetMetricsResponse, error) { ret := _m.Called(ctx, request) - if len(ret) == 0 { - panic("no return value specified for GetExecutionMetrics") - } - var r0 *admin.WorkflowExecutionGetMetricsResponse - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) (*admin.WorkflowExecutionGetMetricsResponse, error)); ok { - return rf(ctx, request) - } if rf, ok := ret.Get(0).(func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) *admin.WorkflowExecutionGetMetricsResponse); ok { r0 = rf(ctx, request) } else { @@ -44,6 +46,7 @@ func (_m *MetricsInterface) GetExecutionMetrics(ctx context.Context, request *ad } } + var r1 error if rf, ok := ret.Get(1).(func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) error); ok { r1 = rf(ctx, request) } else { @@ -52,46 +55,3 @@ func (_m *MetricsInterface) GetExecutionMetrics(ctx context.Context, request *ad return r0, r1 } - -// MetricsInterface_GetExecutionMetrics_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetExecutionMetrics' -type MetricsInterface_GetExecutionMetrics_Call struct { - *mock.Call -} - -// GetExecutionMetrics is a helper method to define mock.On call -// - ctx context.Context -// - request *admin.WorkflowExecutionGetMetricsRequest -func (_e *MetricsInterface_Expecter) GetExecutionMetrics(ctx interface{}, request interface{}) *MetricsInterface_GetExecutionMetrics_Call { - return &MetricsInterface_GetExecutionMetrics_Call{Call: _e.mock.On("GetExecutionMetrics", ctx, request)} -} - -func (_c *MetricsInterface_GetExecutionMetrics_Call) Run(run func(ctx context.Context, request *admin.WorkflowExecutionGetMetricsRequest)) *MetricsInterface_GetExecutionMetrics_Call { - _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*admin.WorkflowExecutionGetMetricsRequest)) - }) - return _c -} - -func (_c *MetricsInterface_GetExecutionMetrics_Call) Return(_a0 *admin.WorkflowExecutionGetMetricsResponse, _a1 error) *MetricsInterface_GetExecutionMetrics_Call { - _c.Call.Return(_a0, _a1) - return _c -} - -func (_c *MetricsInterface_GetExecutionMetrics_Call) RunAndReturn(run func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) (*admin.WorkflowExecutionGetMetricsResponse, error)) *MetricsInterface_GetExecutionMetrics_Call { - _c.Call.Return(run) - return _c -} - -// NewMetricsInterface creates a new instance of MetricsInterface. 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 NewMetricsInterface(t interface { - mock.TestingT - Cleanup(func()) -}) *MetricsInterface { - mock := &MetricsInterface{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -}