From 97391608d051ab6fba5b0f400702883da99bd288 Mon Sep 17 00:00:00 2001 From: Wang Yan Date: Wed, 15 Jan 2025 14:08:21 +0800 Subject: [PATCH] bump mockery (#21419) * bump mockery Signed-off-by: wang yan * update mock testing codes Signed-off-by: wang yan --------- Signed-off-by: wang yan --- Makefile | 2 +- .../flow/mock_adapter_factory_test.go | 4 +- .../replication/flow/mock_adapter_test.go | 6 +-- .../replication/mock_flow_controller_test.go | 2 +- src/jobservice/mgt/mock_manager.go | 2 +- src/jobservice/period/mock_scheduler.go | 4 +- src/lib/cache/mock_cache_test.go | 2 +- src/pkg/scheduler/mock_dao_test.go | 2 +- src/pkg/task/mock_execution_dao_test.go | 2 +- src/pkg/task/mock_jobservice_client_test.go | 4 +- src/pkg/task/mock_sweep_manager_test.go | 2 +- src/pkg/task/mock_task_dao_test.go | 2 +- src/pkg/task/mock_task_manager_test.go | 10 ++-- src/testing/common/security/context.go | 12 ++--- src/testing/controller/artifact/controller.go | 2 +- src/testing/controller/blob/controller.go | 48 +++++++++---------- src/testing/controller/config/controller.go | 2 +- .../jobservice/scheduler_controller.go | 2 +- src/testing/controller/project/controller.go | 2 +- .../controller/proxy/remote_interface.go | 2 +- src/testing/controller/purge/controller.go | 2 +- src/testing/controller/quota/controller.go | 38 +++++++-------- .../controller/replication/controller.go | 2 +- .../controller/repository/controller.go | 2 +- .../controller/retention/controller.go | 2 +- src/testing/controller/robot/controller.go | 2 +- src/testing/controller/scan/checker.go | 2 +- src/testing/controller/scan/controller.go | 2 +- .../controller/scandataexport/controller.go | 2 +- src/testing/controller/scanner/controller.go | 2 +- .../controller/securityhub/controller.go | 2 +- .../controller/systemartifact/controller.go | 2 +- src/testing/controller/task/controller.go | 2 +- .../controller/task/execution_controller.go | 2 +- src/testing/controller/user/controller.go | 2 +- src/testing/controller/webhook/controller.go | 2 +- src/testing/lib/cache/cache.go | 2 +- src/testing/lib/cache/iterator.go | 4 +- src/testing/lib/config/manager.go | 4 +- src/testing/lib/orm/creator.go | 4 +- src/testing/pkg/accessory/dao/dao.go | 2 +- src/testing/pkg/accessory/manager.go | 2 +- src/testing/pkg/accessory/model/accessory.go | 12 ++--- src/testing/pkg/allowlist/dao/dao.go | 2 +- src/testing/pkg/allowlist/manager.go | 2 +- src/testing/pkg/artifact/manager.go | 2 +- src/testing/pkg/artifactrash/manager.go | 2 +- src/testing/pkg/audit/dao/dao.go | 2 +- src/testing/pkg/audit/manager.go | 2 +- src/testing/pkg/auditext/dao/dao.go | 2 +- src/testing/pkg/auditext/manager.go | 2 +- src/testing/pkg/blob/manager.go | 35 +++++++------- .../cached/manifest/redis/cached_manager.go | 2 +- src/testing/pkg/chart/operator.go | 2 +- src/testing/pkg/distribution/manifest.go | 6 +-- src/testing/pkg/immutable/dao/dao.go | 2 +- src/testing/pkg/immutable/matcher.go | 2 +- src/testing/pkg/joblog/dao/dao.go | 2 +- src/testing/pkg/joblog/manager.go | 2 +- .../jobmonitor/job_service_monitor_client.go | 8 ++-- src/testing/pkg/jobmonitor/pool_manager.go | 2 +- src/testing/pkg/jobmonitor/queue_manager.go | 2 +- src/testing/pkg/jobmonitor/redis_client.go | 2 +- src/testing/pkg/jobmonitor/worker_manager.go | 2 +- src/testing/pkg/label/dao/dao.go | 2 +- src/testing/pkg/label/manager.go | 2 +- src/testing/pkg/ldap/manager.go | 2 +- src/testing/pkg/member/fake_member_manager.go | 2 +- .../pkg/notification/policy/dao/dao.go | 2 +- .../pkg/notification/policy/manager.go | 2 +- src/testing/pkg/oidc/dao/meta_dao.go | 2 +- src/testing/pkg/oidc/meta_manager.go | 2 +- .../pkg/p2p/preheat/instance/manager.go | 2 +- src/testing/pkg/p2p/preheat/policy/manager.go | 2 +- src/testing/pkg/parser/parser.go | 2 +- src/testing/pkg/processor/processor.go | 2 +- src/testing/pkg/project/manager.go | 2 +- src/testing/pkg/project/metadata/manager.go | 2 +- src/testing/pkg/queuestatus/manager.go | 2 +- src/testing/pkg/quota/driver/driver.go | 2 +- src/testing/pkg/quota/manager.go | 40 ++++++++-------- src/testing/pkg/rbac/dao/dao.go | 2 +- src/testing/pkg/rbac/manager.go | 2 +- src/testing/pkg/reg/adapter/adapter.go | 6 +-- src/testing/pkg/reg/dao/dao.go | 2 +- src/testing/pkg/reg/manager.go | 2 +- .../pkg/registry/fake_registry_client.go | 6 +-- src/testing/pkg/replication/dao/dao.go | 2 +- src/testing/pkg/replication/manager.go | 2 +- src/testing/pkg/repository/dao/dao.go | 2 +- src/testing/pkg/repository/manager.go | 2 +- src/testing/pkg/robot/dao/dao.go | 2 +- src/testing/pkg/robot/manager.go | 2 +- .../scan/export/artifact_digest_calculator.go | 2 +- .../pkg/scan/export/filter_processor.go | 2 +- src/testing/pkg/scan/export/manager.go | 2 +- src/testing/pkg/scan/handler.go | 10 ++-- .../native_scan_report_converter.go | 2 +- src/testing/pkg/scan/report/manager.go | 2 +- src/testing/pkg/scan/rest/v1/client.go | 4 +- src/testing/pkg/scan/rest/v1/client_pool.go | 2 +- .../pkg/scan/rest/v1/request_resolver.go | 2 +- .../pkg/scan/rest/v1/response_handler.go | 2 +- src/testing/pkg/scan/sbom/manager.go | 2 +- src/testing/pkg/scan/scanner/manager.go | 2 +- src/testing/pkg/scheduler/scheduler.go | 2 +- src/testing/pkg/securityhub/manager.go | 2 +- .../pkg/systemartifact/cleanup/selector.go | 2 +- src/testing/pkg/systemartifact/dao/dao.go | 2 +- src/testing/pkg/systemartifact/manager.go | 4 +- src/testing/pkg/tag/manager.go | 2 +- src/testing/pkg/task/execution_manager.go | 2 +- src/testing/pkg/task/manager.go | 2 +- src/testing/pkg/user/dao/dao.go | 2 +- src/testing/pkg/user/manager.go | 2 +- .../pkg/usergroup/fake_usergroup_manager.go | 2 +- src/testing/registryctl/client.go | 4 +- tools/mockery/Dockerfile | 10 +--- 118 files changed, 231 insertions(+), 242 deletions(-) diff --git a/Makefile b/Makefile index 0ecb98a5c..c89dcec6c 100644 --- a/Makefile +++ b/Makefile @@ -313,7 +313,7 @@ gen_apis: lint_apis MOCKERY_IMAGENAME=$(IMAGENAMESPACE)/mockery -MOCKERY_VERSION=v2.46.2 +MOCKERY_VERSION=v2.51.0 MOCKERY=$(RUNCONTAINER)/src ${MOCKERY_IMAGENAME}:${MOCKERY_VERSION} MOCKERY_IMAGE_BUILD_CMD=${DOCKERBUILD} -f ${TOOLSPATH}/mockery/Dockerfile --build-arg GOLANG=${GOBUILDIMAGE} --build-arg MOCKERY_VERSION=${MOCKERY_VERSION} -t ${MOCKERY_IMAGENAME}:$(MOCKERY_VERSION) . diff --git a/src/controller/replication/flow/mock_adapter_factory_test.go b/src/controller/replication/flow/mock_adapter_factory_test.go index 450c10b1a..fb8a6bfac 100644 --- a/src/controller/replication/flow/mock_adapter_factory_test.go +++ b/src/controller/replication/flow/mock_adapter_factory_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package flow @@ -14,7 +14,7 @@ type mockFactory struct { mock.Mock } -// AdapterPattern provides a mock function with given fields: +// AdapterPattern provides a mock function with no fields func (_m *mockFactory) AdapterPattern() *model.AdapterPattern { ret := _m.Called() diff --git a/src/controller/replication/flow/mock_adapter_test.go b/src/controller/replication/flow/mock_adapter_test.go index 78d8dad3a..c619fec60 100644 --- a/src/controller/replication/flow/mock_adapter_test.go +++ b/src/controller/replication/flow/mock_adapter_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package flow @@ -146,7 +146,7 @@ func (_m *mockAdapter) FetchArtifacts(filters []*model.Filter) ([]*model.Resourc return r0, r1 } -// HealthCheck provides a mock function with given fields: +// HealthCheck provides a mock function with no fields func (_m *mockAdapter) HealthCheck() (string, error) { ret := _m.Called() @@ -174,7 +174,7 @@ func (_m *mockAdapter) HealthCheck() (string, error) { return r0, r1 } -// Info provides a mock function with given fields: +// Info provides a mock function with no fields func (_m *mockAdapter) Info() (*model.RegistryInfo, error) { ret := _m.Called() diff --git a/src/controller/replication/mock_flow_controller_test.go b/src/controller/replication/mock_flow_controller_test.go index badcc57b2..c3c0b8652 100644 --- a/src/controller/replication/mock_flow_controller_test.go +++ b/src/controller/replication/mock_flow_controller_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package replication diff --git a/src/jobservice/mgt/mock_manager.go b/src/jobservice/mgt/mock_manager.go index 57258d08e..c8834f44d 100644 --- a/src/jobservice/mgt/mock_manager.go +++ b/src/jobservice/mgt/mock_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package mgt diff --git a/src/jobservice/period/mock_scheduler.go b/src/jobservice/period/mock_scheduler.go index e323dbb59..4452ae438 100644 --- a/src/jobservice/period/mock_scheduler.go +++ b/src/jobservice/period/mock_scheduler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package period @@ -37,7 +37,7 @@ func (_m *MockScheduler) Schedule(policy *Policy) (int64, error) { return r0, r1 } -// Start provides a mock function with given fields: +// Start provides a mock function with no fields func (_m *MockScheduler) Start() { _m.Called() } diff --git a/src/lib/cache/mock_cache_test.go b/src/lib/cache/mock_cache_test.go index de83992f0..0d8141884 100644 --- a/src/lib/cache/mock_cache_test.go +++ b/src/lib/cache/mock_cache_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package cache diff --git a/src/pkg/scheduler/mock_dao_test.go b/src/pkg/scheduler/mock_dao_test.go index 84d68dcc8..251fafd31 100644 --- a/src/pkg/scheduler/mock_dao_test.go +++ b/src/pkg/scheduler/mock_dao_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scheduler diff --git a/src/pkg/task/mock_execution_dao_test.go b/src/pkg/task/mock_execution_dao_test.go index fa2a4b694..c80caec88 100644 --- a/src/pkg/task/mock_execution_dao_test.go +++ b/src/pkg/task/mock_execution_dao_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/pkg/task/mock_jobservice_client_test.go b/src/pkg/task/mock_jobservice_client_test.go index b0ff4aa76..d40942ec6 100644 --- a/src/pkg/task/mock_jobservice_client_test.go +++ b/src/pkg/task/mock_jobservice_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task @@ -74,7 +74,7 @@ func (_m *mockJobserviceClient) GetJobLog(uuid string) ([]byte, error) { return r0, r1 } -// GetJobServiceConfig provides a mock function with given fields: +// GetJobServiceConfig provides a mock function with no fields func (_m *mockJobserviceClient) GetJobServiceConfig() (*job.Config, error) { ret := _m.Called() diff --git a/src/pkg/task/mock_sweep_manager_test.go b/src/pkg/task/mock_sweep_manager_test.go index f4d7161bf..e29ec8ae0 100644 --- a/src/pkg/task/mock_sweep_manager_test.go +++ b/src/pkg/task/mock_sweep_manager_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/pkg/task/mock_task_dao_test.go b/src/pkg/task/mock_task_dao_test.go index f737fe44c..6cdfcc803 100644 --- a/src/pkg/task/mock_task_dao_test.go +++ b/src/pkg/task/mock_task_dao_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/pkg/task/mock_task_manager_test.go b/src/pkg/task/mock_task_manager_test.go index 6e80df078..b4bbece80 100644 --- a/src/pkg/task/mock_task_manager_test.go +++ b/src/pkg/task/mock_task_manager_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task @@ -311,14 +311,14 @@ func (_m *mockTaskManager) Stop(ctx context.Context, id int64) error { return r0 } -// Update provides a mock function with given fields: ctx, task, props -func (_m *mockTaskManager) Update(ctx context.Context, task *Task, props ...string) error { +// Update provides a mock function with given fields: ctx, _a1, props +func (_m *mockTaskManager) Update(ctx context.Context, _a1 *Task, props ...string) error { _va := make([]interface{}, len(props)) for _i := range props { _va[_i] = props[_i] } var _ca []interface{} - _ca = append(_ca, ctx, task) + _ca = append(_ca, ctx, _a1) _ca = append(_ca, _va...) ret := _m.Called(_ca...) @@ -328,7 +328,7 @@ func (_m *mockTaskManager) Update(ctx context.Context, task *Task, props ...stri var r0 error if rf, ok := ret.Get(0).(func(context.Context, *Task, ...string) error); ok { - r0 = rf(ctx, task, props...) + r0 = rf(ctx, _a1, props...) } else { r0 = ret.Error(0) } diff --git a/src/testing/common/security/context.go b/src/testing/common/security/context.go index 29fbf99a7..df5e72993 100644 --- a/src/testing/common/security/context.go +++ b/src/testing/common/security/context.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package security @@ -33,7 +33,7 @@ func (_m *Context) Can(ctx context.Context, action types.Action, resource types. return r0 } -// GetUsername provides a mock function with given fields: +// GetUsername provides a mock function with no fields func (_m *Context) GetUsername() string { ret := _m.Called() @@ -51,7 +51,7 @@ func (_m *Context) GetUsername() string { return r0 } -// IsAuthenticated provides a mock function with given fields: +// IsAuthenticated provides a mock function with no fields func (_m *Context) IsAuthenticated() bool { ret := _m.Called() @@ -69,7 +69,7 @@ func (_m *Context) IsAuthenticated() bool { return r0 } -// IsSolutionUser provides a mock function with given fields: +// IsSolutionUser provides a mock function with no fields func (_m *Context) IsSolutionUser() bool { ret := _m.Called() @@ -87,7 +87,7 @@ func (_m *Context) IsSolutionUser() bool { return r0 } -// IsSysAdmin provides a mock function with given fields: +// IsSysAdmin provides a mock function with no fields func (_m *Context) IsSysAdmin() bool { ret := _m.Called() @@ -105,7 +105,7 @@ func (_m *Context) IsSysAdmin() bool { return r0 } -// Name provides a mock function with given fields: +// Name provides a mock function with no fields func (_m *Context) Name() string { ret := _m.Called() diff --git a/src/testing/controller/artifact/controller.go b/src/testing/controller/artifact/controller.go index 85c37c310..86f0a09ef 100644 --- a/src/testing/controller/artifact/controller.go +++ b/src/testing/controller/artifact/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package artifact diff --git a/src/testing/controller/blob/controller.go b/src/testing/controller/blob/controller.go index de097f96e..540d1e65c 100644 --- a/src/testing/controller/blob/controller.go +++ b/src/testing/controller/blob/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package blob @@ -11,7 +11,7 @@ import ( mock "github.com/stretchr/testify/mock" - pkgblob "github.com/goharbor/harbor/src/pkg/blob" + models "github.com/goharbor/harbor/src/pkg/blob/models" q "github.com/goharbor/harbor/src/lib/q" ) @@ -213,7 +213,7 @@ func (_m *Controller) Exist(ctx context.Context, digest string, options ...blob. } // Fail provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Fail(ctx context.Context, _a1 *pkgblob.Blob) error { +func (_m *Controller) Fail(ctx context.Context, _a1 *models.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -221,7 +221,7 @@ func (_m *Controller) Fail(ctx context.Context, _a1 *pkgblob.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *pkgblob.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) @@ -231,27 +231,27 @@ func (_m *Controller) Fail(ctx context.Context, _a1 *pkgblob.Blob) error { } // FindMissingAssociationsForProject provides a mock function with given fields: ctx, projectID, blobs -func (_m *Controller) FindMissingAssociationsForProject(ctx context.Context, projectID int64, blobs []*pkgblob.Blob) ([]*pkgblob.Blob, error) { +func (_m *Controller) FindMissingAssociationsForProject(ctx context.Context, projectID int64, blobs []*models.Blob) ([]*models.Blob, error) { ret := _m.Called(ctx, projectID, blobs) if len(ret) == 0 { panic("no return value specified for FindMissingAssociationsForProject") } - var r0 []*pkgblob.Blob + var r0 []*models.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, int64, []*pkgblob.Blob) ([]*pkgblob.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Blob) ([]*models.Blob, error)); ok { return rf(ctx, projectID, blobs) } - if rf, ok := ret.Get(0).(func(context.Context, int64, []*pkgblob.Blob) []*pkgblob.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Blob) []*models.Blob); ok { r0 = rf(ctx, projectID, blobs) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*pkgblob.Blob) + r0 = ret.Get(0).([]*models.Blob) } } - if rf, ok := ret.Get(1).(func(context.Context, int64, []*pkgblob.Blob) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, int64, []*models.Blob) error); ok { r1 = rf(ctx, projectID, blobs) } else { r1 = ret.Error(1) @@ -261,7 +261,7 @@ func (_m *Controller) FindMissingAssociationsForProject(ctx context.Context, pro } // Get provides a mock function with given fields: ctx, digest, options -func (_m *Controller) Get(ctx context.Context, digest string, options ...blob.Option) (*pkgblob.Blob, error) { +func (_m *Controller) Get(ctx context.Context, digest string, options ...blob.Option) (*models.Blob, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -275,16 +275,16 @@ func (_m *Controller) Get(ctx context.Context, digest string, options ...blob.Op panic("no return value specified for Get") } - var r0 *pkgblob.Blob + var r0 *models.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) (*pkgblob.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) (*models.Blob, error)); ok { return rf(ctx, digest, options...) } - if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) *pkgblob.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) *models.Blob); ok { r0 = rf(ctx, digest, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*pkgblob.Blob) + r0 = ret.Get(0).(*models.Blob) } } @@ -326,23 +326,23 @@ func (_m *Controller) GetAcceptedBlobSize(ctx context.Context, sessionID string) } // List provides a mock function with given fields: ctx, query -func (_m *Controller) List(ctx context.Context, query *q.Query) ([]*pkgblob.Blob, error) { +func (_m *Controller) List(ctx context.Context, query *q.Query) ([]*models.Blob, error) { ret := _m.Called(ctx, query) if len(ret) == 0 { panic("no return value specified for List") } - var r0 []*pkgblob.Blob + var r0 []*models.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*pkgblob.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*models.Blob, error)); ok { return rf(ctx, query) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*pkgblob.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*models.Blob); ok { r0 = rf(ctx, query) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*pkgblob.Blob) + r0 = ret.Get(0).([]*models.Blob) } } @@ -392,7 +392,7 @@ func (_m *Controller) Sync(ctx context.Context, references []distribution.Descri } // Touch provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Touch(ctx context.Context, _a1 *pkgblob.Blob) error { +func (_m *Controller) Touch(ctx context.Context, _a1 *models.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -400,7 +400,7 @@ func (_m *Controller) Touch(ctx context.Context, _a1 *pkgblob.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *pkgblob.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) @@ -410,7 +410,7 @@ func (_m *Controller) Touch(ctx context.Context, _a1 *pkgblob.Blob) error { } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Update(ctx context.Context, _a1 *pkgblob.Blob) error { +func (_m *Controller) Update(ctx context.Context, _a1 *models.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -418,7 +418,7 @@ func (_m *Controller) Update(ctx context.Context, _a1 *pkgblob.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *pkgblob.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/controller/config/controller.go b/src/testing/controller/config/controller.go index e564efcbf..5813385de 100644 --- a/src/testing/controller/config/controller.go +++ b/src/testing/controller/config/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package config diff --git a/src/testing/controller/jobservice/scheduler_controller.go b/src/testing/controller/jobservice/scheduler_controller.go index 58e464726..beff24bab 100644 --- a/src/testing/controller/jobservice/scheduler_controller.go +++ b/src/testing/controller/jobservice/scheduler_controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package jobservice diff --git a/src/testing/controller/project/controller.go b/src/testing/controller/project/controller.go index eefa8a94b..837255d00 100644 --- a/src/testing/controller/project/controller.go +++ b/src/testing/controller/project/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package project diff --git a/src/testing/controller/proxy/remote_interface.go b/src/testing/controller/proxy/remote_interface.go index b25fcd6b4..bc17a9ac6 100644 --- a/src/testing/controller/proxy/remote_interface.go +++ b/src/testing/controller/proxy/remote_interface.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package proxy diff --git a/src/testing/controller/purge/controller.go b/src/testing/controller/purge/controller.go index 935b8e0d5..25d26571e 100644 --- a/src/testing/controller/purge/controller.go +++ b/src/testing/controller/purge/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package purge diff --git a/src/testing/controller/quota/controller.go b/src/testing/controller/quota/controller.go index 911d34fcb..f2b44ec69 100644 --- a/src/testing/controller/quota/controller.go +++ b/src/testing/controller/quota/controller.go @@ -1,11 +1,11 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package quota import ( context "context" - pkgquota "github.com/goharbor/harbor/src/pkg/quota" + models "github.com/goharbor/harbor/src/pkg/quota/models" mock "github.com/stretchr/testify/mock" q "github.com/goharbor/harbor/src/lib/q" @@ -102,7 +102,7 @@ func (_m *Controller) Delete(ctx context.Context, id int64) error { } // Get provides a mock function with given fields: ctx, id, options -func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option) (*pkgquota.Quota, error) { +func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option) (*models.Quota, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -116,16 +116,16 @@ func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option panic("no return value specified for Get") } - var r0 *pkgquota.Quota + var r0 *models.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) (*pkgquota.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) (*models.Quota, error)); ok { return rf(ctx, id, options...) } - if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) *pkgquota.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) *models.Quota); ok { r0 = rf(ctx, id, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*pkgquota.Quota) + r0 = ret.Get(0).(*models.Quota) } } @@ -139,7 +139,7 @@ func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option } // GetByRef provides a mock function with given fields: ctx, reference, referenceID, options -func (_m *Controller) GetByRef(ctx context.Context, reference string, referenceID string, options ...quota.Option) (*pkgquota.Quota, error) { +func (_m *Controller) GetByRef(ctx context.Context, reference string, referenceID string, options ...quota.Option) (*models.Quota, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -153,16 +153,16 @@ func (_m *Controller) GetByRef(ctx context.Context, reference string, referenceI panic("no return value specified for GetByRef") } - var r0 *pkgquota.Quota + var r0 *models.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) (*pkgquota.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) (*models.Quota, error)); ok { return rf(ctx, reference, referenceID, options...) } - if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) *pkgquota.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) *models.Quota); ok { r0 = rf(ctx, reference, referenceID, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*pkgquota.Quota) + r0 = ret.Get(0).(*models.Quota) } } @@ -204,7 +204,7 @@ func (_m *Controller) IsEnabled(ctx context.Context, reference string, reference } // List provides a mock function with given fields: ctx, query, options -func (_m *Controller) List(ctx context.Context, query *q.Query, options ...quota.Option) ([]*pkgquota.Quota, error) { +func (_m *Controller) List(ctx context.Context, query *q.Query, options ...quota.Option) ([]*models.Quota, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -218,16 +218,16 @@ func (_m *Controller) List(ctx context.Context, query *q.Query, options ...quota panic("no return value specified for List") } - var r0 []*pkgquota.Quota + var r0 []*models.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) ([]*pkgquota.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) ([]*models.Quota, error)); ok { return rf(ctx, query, options...) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) []*pkgquota.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) []*models.Quota); ok { r0 = rf(ctx, query, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*pkgquota.Quota) + r0 = ret.Get(0).([]*models.Quota) } } @@ -284,7 +284,7 @@ func (_m *Controller) Request(ctx context.Context, reference string, referenceID } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Update(ctx context.Context, _a1 *pkgquota.Quota) error { +func (_m *Controller) Update(ctx context.Context, _a1 *models.Quota) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -292,7 +292,7 @@ func (_m *Controller) Update(ctx context.Context, _a1 *pkgquota.Quota) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *pkgquota.Quota) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *models.Quota) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/controller/replication/controller.go b/src/testing/controller/replication/controller.go index 4654cbf66..74de17c3d 100644 --- a/src/testing/controller/replication/controller.go +++ b/src/testing/controller/replication/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package replication diff --git a/src/testing/controller/repository/controller.go b/src/testing/controller/repository/controller.go index bfd0561c5..4e40ba447 100644 --- a/src/testing/controller/repository/controller.go +++ b/src/testing/controller/repository/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package repository diff --git a/src/testing/controller/retention/controller.go b/src/testing/controller/retention/controller.go index 29dfdbb8a..a1126e18f 100644 --- a/src/testing/controller/retention/controller.go +++ b/src/testing/controller/retention/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package retention diff --git a/src/testing/controller/robot/controller.go b/src/testing/controller/robot/controller.go index 32e09ea4e..e3a634b19 100644 --- a/src/testing/controller/robot/controller.go +++ b/src/testing/controller/robot/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package robot diff --git a/src/testing/controller/scan/checker.go b/src/testing/controller/scan/checker.go index 66d2a8ece..6c2d60c8b 100644 --- a/src/testing/controller/scan/checker.go +++ b/src/testing/controller/scan/checker.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scan diff --git a/src/testing/controller/scan/controller.go b/src/testing/controller/scan/controller.go index 70af6fd87..bdf1de5eb 100644 --- a/src/testing/controller/scan/controller.go +++ b/src/testing/controller/scan/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scan diff --git a/src/testing/controller/scandataexport/controller.go b/src/testing/controller/scandataexport/controller.go index b63e8f13d..8eb625af7 100644 --- a/src/testing/controller/scandataexport/controller.go +++ b/src/testing/controller/scandataexport/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scandataexport diff --git a/src/testing/controller/scanner/controller.go b/src/testing/controller/scanner/controller.go index 64eaf4c3d..e536845b6 100644 --- a/src/testing/controller/scanner/controller.go +++ b/src/testing/controller/scanner/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scanner diff --git a/src/testing/controller/securityhub/controller.go b/src/testing/controller/securityhub/controller.go index 714df1427..1e988b1f2 100644 --- a/src/testing/controller/securityhub/controller.go +++ b/src/testing/controller/securityhub/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package securityhub diff --git a/src/testing/controller/systemartifact/controller.go b/src/testing/controller/systemartifact/controller.go index 9d72db40c..7edd59c62 100644 --- a/src/testing/controller/systemartifact/controller.go +++ b/src/testing/controller/systemartifact/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package systemartifact diff --git a/src/testing/controller/task/controller.go b/src/testing/controller/task/controller.go index f296b68ed..800bf6a62 100644 --- a/src/testing/controller/task/controller.go +++ b/src/testing/controller/task/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/testing/controller/task/execution_controller.go b/src/testing/controller/task/execution_controller.go index 1b634b60a..5e187e53e 100644 --- a/src/testing/controller/task/execution_controller.go +++ b/src/testing/controller/task/execution_controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/testing/controller/user/controller.go b/src/testing/controller/user/controller.go index 5177d9d7b..12f4253e7 100644 --- a/src/testing/controller/user/controller.go +++ b/src/testing/controller/user/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package user diff --git a/src/testing/controller/webhook/controller.go b/src/testing/controller/webhook/controller.go index aeb7a105c..27d06e71a 100644 --- a/src/testing/controller/webhook/controller.go +++ b/src/testing/controller/webhook/controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package webhook diff --git a/src/testing/lib/cache/cache.go b/src/testing/lib/cache/cache.go index 3193798f5..036b34bbc 100644 --- a/src/testing/lib/cache/cache.go +++ b/src/testing/lib/cache/cache.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package cache diff --git a/src/testing/lib/cache/iterator.go b/src/testing/lib/cache/iterator.go index d57732cc2..d25f725da 100644 --- a/src/testing/lib/cache/iterator.go +++ b/src/testing/lib/cache/iterator.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package cache @@ -31,7 +31,7 @@ func (_m *Iterator) Next(ctx context.Context) bool { return r0 } -// Val provides a mock function with given fields: +// Val provides a mock function with no fields func (_m *Iterator) Val() string { ret := _m.Called() diff --git a/src/testing/lib/config/manager.go b/src/testing/lib/config/manager.go index c81aafd85..32e853e38 100644 --- a/src/testing/lib/config/manager.go +++ b/src/testing/lib/config/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package config @@ -56,7 +56,7 @@ func (_m *Manager) GetAll(ctx context.Context) map[string]interface{} { return r0 } -// GetDatabaseCfg provides a mock function with given fields: +// GetDatabaseCfg provides a mock function with no fields func (_m *Manager) GetDatabaseCfg() *models.Database { ret := _m.Called() diff --git a/src/testing/lib/orm/creator.go b/src/testing/lib/orm/creator.go index 818eb25b4..e1d58b116 100644 --- a/src/testing/lib/orm/creator.go +++ b/src/testing/lib/orm/creator.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package orm @@ -12,7 +12,7 @@ type Creator struct { mock.Mock } -// Create provides a mock function with given fields: +// Create provides a mock function with no fields func (_m *Creator) Create() orm.Ormer { ret := _m.Called() diff --git a/src/testing/pkg/accessory/dao/dao.go b/src/testing/pkg/accessory/dao/dao.go index 3a7d99448..8ebfe5524 100644 --- a/src/testing/pkg/accessory/dao/dao.go +++ b/src/testing/pkg/accessory/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/accessory/manager.go b/src/testing/pkg/accessory/manager.go index 777d4aebb..443cf8622 100644 --- a/src/testing/pkg/accessory/manager.go +++ b/src/testing/pkg/accessory/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package accessory diff --git a/src/testing/pkg/accessory/model/accessory.go b/src/testing/pkg/accessory/model/accessory.go index 22169f1fc..06bfe78f7 100644 --- a/src/testing/pkg/accessory/model/accessory.go +++ b/src/testing/pkg/accessory/model/accessory.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package model @@ -12,7 +12,7 @@ type Accessory struct { mock.Mock } -// Display provides a mock function with given fields: +// Display provides a mock function with no fields func (_m *Accessory) Display() bool { ret := _m.Called() @@ -30,7 +30,7 @@ func (_m *Accessory) Display() bool { return r0 } -// GetData provides a mock function with given fields: +// GetData provides a mock function with no fields func (_m *Accessory) GetData() model.AccessoryData { ret := _m.Called() @@ -48,7 +48,7 @@ func (_m *Accessory) GetData() model.AccessoryData { return r0 } -// IsHard provides a mock function with given fields: +// IsHard provides a mock function with no fields func (_m *Accessory) IsHard() bool { ret := _m.Called() @@ -66,7 +66,7 @@ func (_m *Accessory) IsHard() bool { return r0 } -// IsSoft provides a mock function with given fields: +// IsSoft provides a mock function with no fields func (_m *Accessory) IsSoft() bool { ret := _m.Called() @@ -84,7 +84,7 @@ func (_m *Accessory) IsSoft() bool { return r0 } -// Kind provides a mock function with given fields: +// Kind provides a mock function with no fields func (_m *Accessory) Kind() string { ret := _m.Called() diff --git a/src/testing/pkg/allowlist/dao/dao.go b/src/testing/pkg/allowlist/dao/dao.go index 9da59fae7..b16693704 100644 --- a/src/testing/pkg/allowlist/dao/dao.go +++ b/src/testing/pkg/allowlist/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/allowlist/manager.go b/src/testing/pkg/allowlist/manager.go index 69aef79dd..b684b0c8d 100644 --- a/src/testing/pkg/allowlist/manager.go +++ b/src/testing/pkg/allowlist/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package allowlist diff --git a/src/testing/pkg/artifact/manager.go b/src/testing/pkg/artifact/manager.go index 502e2ed7f..225b5b96d 100644 --- a/src/testing/pkg/artifact/manager.go +++ b/src/testing/pkg/artifact/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package artifact diff --git a/src/testing/pkg/artifactrash/manager.go b/src/testing/pkg/artifactrash/manager.go index 5d96bbea7..19dec5d5d 100644 --- a/src/testing/pkg/artifactrash/manager.go +++ b/src/testing/pkg/artifactrash/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package artifactrash diff --git a/src/testing/pkg/audit/dao/dao.go b/src/testing/pkg/audit/dao/dao.go index f95e34b5b..d6273686c 100644 --- a/src/testing/pkg/audit/dao/dao.go +++ b/src/testing/pkg/audit/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/audit/manager.go b/src/testing/pkg/audit/manager.go index 3002c9d76..6ca666b80 100644 --- a/src/testing/pkg/audit/manager.go +++ b/src/testing/pkg/audit/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package audit diff --git a/src/testing/pkg/auditext/dao/dao.go b/src/testing/pkg/auditext/dao/dao.go index 44da05c35..3b98c6196 100644 --- a/src/testing/pkg/auditext/dao/dao.go +++ b/src/testing/pkg/auditext/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/auditext/manager.go b/src/testing/pkg/auditext/manager.go index 0600a0ac7..de6d8c57c 100644 --- a/src/testing/pkg/auditext/manager.go +++ b/src/testing/pkg/auditext/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package auditext diff --git a/src/testing/pkg/blob/manager.go b/src/testing/pkg/blob/manager.go index 78de29dac..62ad23c84 100644 --- a/src/testing/pkg/blob/manager.go +++ b/src/testing/pkg/blob/manager.go @@ -1,15 +1,12 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package blob import ( context "context" - blob "github.com/goharbor/harbor/src/pkg/blob" - - mock "github.com/stretchr/testify/mock" - models "github.com/goharbor/harbor/src/pkg/blob/models" + mock "github.com/stretchr/testify/mock" q "github.com/goharbor/harbor/src/lib/q" ) @@ -150,7 +147,7 @@ func (_m *Manager) CleanupAssociationsForArtifact(ctx context.Context, artifactD } // CleanupAssociationsForProject provides a mock function with given fields: ctx, projectID, blobs -func (_m *Manager) CleanupAssociationsForProject(ctx context.Context, projectID int64, blobs []*blob.Blob) error { +func (_m *Manager) CleanupAssociationsForProject(ctx context.Context, projectID int64, blobs []*models.Blob) error { ret := _m.Called(ctx, projectID, blobs) if len(ret) == 0 { @@ -158,7 +155,7 @@ func (_m *Manager) CleanupAssociationsForProject(ctx context.Context, projectID } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, int64, []*blob.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Blob) error); ok { r0 = rf(ctx, projectID, blobs) } else { r0 = ret.Error(0) @@ -244,23 +241,23 @@ func (_m *Manager) FindBlobsShouldUnassociatedWithProject(ctx context.Context, p } // Get provides a mock function with given fields: ctx, digest -func (_m *Manager) Get(ctx context.Context, digest string) (*blob.Blob, error) { +func (_m *Manager) Get(ctx context.Context, digest string) (*models.Blob, error) { ret := _m.Called(ctx, digest) if len(ret) == 0 { panic("no return value specified for Get") } - var r0 *blob.Blob + var r0 *models.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*blob.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string) (*models.Blob, error)); ok { return rf(ctx, digest) } - if rf, ok := ret.Get(0).(func(context.Context, string) *blob.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, string) *models.Blob); ok { r0 = rf(ctx, digest) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*blob.Blob) + r0 = ret.Get(0).(*models.Blob) } } @@ -304,23 +301,23 @@ func (_m *Manager) GetByArt(ctx context.Context, digest string) ([]*models.Blob, } // List provides a mock function with given fields: ctx, query -func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*blob.Blob, error) { +func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*models.Blob, error) { ret := _m.Called(ctx, query) if len(ret) == 0 { panic("no return value specified for List") } - var r0 []*blob.Blob + var r0 []*models.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*blob.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*models.Blob, error)); ok { return rf(ctx, query) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*blob.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*models.Blob); ok { r0 = rf(ctx, query) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*blob.Blob) + r0 = ret.Get(0).([]*models.Blob) } } @@ -334,7 +331,7 @@ func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*blob.Blob, erro } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Manager) Update(ctx context.Context, _a1 *blob.Blob) error { +func (_m *Manager) Update(ctx context.Context, _a1 *models.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -342,7 +339,7 @@ func (_m *Manager) Update(ctx context.Context, _a1 *blob.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *blob.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/pkg/cached/manifest/redis/cached_manager.go b/src/testing/pkg/cached/manifest/redis/cached_manager.go index ae81c2ba8..4cc6ae7ef 100644 --- a/src/testing/pkg/cached/manifest/redis/cached_manager.go +++ b/src/testing/pkg/cached/manifest/redis/cached_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package redis diff --git a/src/testing/pkg/chart/operator.go b/src/testing/pkg/chart/operator.go index 132a83380..1023f50ab 100644 --- a/src/testing/pkg/chart/operator.go +++ b/src/testing/pkg/chart/operator.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package chart diff --git a/src/testing/pkg/distribution/manifest.go b/src/testing/pkg/distribution/manifest.go index 2379f920d..2893d4d33 100644 --- a/src/testing/pkg/distribution/manifest.go +++ b/src/testing/pkg/distribution/manifest.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package distribution @@ -12,7 +12,7 @@ type Manifest struct { mock.Mock } -// Payload provides a mock function with given fields: +// Payload provides a mock function with no fields func (_m *Manifest) Payload() (string, []byte, error) { ret := _m.Called() @@ -49,7 +49,7 @@ func (_m *Manifest) Payload() (string, []byte, error) { return r0, r1, r2 } -// References provides a mock function with given fields: +// References provides a mock function with no fields func (_m *Manifest) References() []distribution.Descriptor { ret := _m.Called() diff --git a/src/testing/pkg/immutable/dao/dao.go b/src/testing/pkg/immutable/dao/dao.go index ba91b1446..e27357a7d 100644 --- a/src/testing/pkg/immutable/dao/dao.go +++ b/src/testing/pkg/immutable/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/immutable/matcher.go b/src/testing/pkg/immutable/matcher.go index 43681a69d..a961564cf 100644 --- a/src/testing/pkg/immutable/matcher.go +++ b/src/testing/pkg/immutable/matcher.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package immutable diff --git a/src/testing/pkg/joblog/dao/dao.go b/src/testing/pkg/joblog/dao/dao.go index d9887e7b4..0f7f16394 100644 --- a/src/testing/pkg/joblog/dao/dao.go +++ b/src/testing/pkg/joblog/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/joblog/manager.go b/src/testing/pkg/joblog/manager.go index 9bb4581df..0daf9f4c2 100644 --- a/src/testing/pkg/joblog/manager.go +++ b/src/testing/pkg/joblog/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package joblog diff --git a/src/testing/pkg/jobmonitor/job_service_monitor_client.go b/src/testing/pkg/jobmonitor/job_service_monitor_client.go index d3f3c636f..85d810d7c 100644 --- a/src/testing/pkg/jobmonitor/job_service_monitor_client.go +++ b/src/testing/pkg/jobmonitor/job_service_monitor_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package jobmonitor @@ -12,7 +12,7 @@ type JobServiceMonitorClient struct { mock.Mock } -// Queues provides a mock function with given fields: +// Queues provides a mock function with no fields func (_m *JobServiceMonitorClient) Queues() ([]*work.Queue, error) { ret := _m.Called() @@ -42,7 +42,7 @@ func (_m *JobServiceMonitorClient) Queues() ([]*work.Queue, error) { return r0, r1 } -// WorkerObservations provides a mock function with given fields: +// WorkerObservations provides a mock function with no fields func (_m *JobServiceMonitorClient) WorkerObservations() ([]*work.WorkerObservation, error) { ret := _m.Called() @@ -72,7 +72,7 @@ func (_m *JobServiceMonitorClient) WorkerObservations() ([]*work.WorkerObservati return r0, r1 } -// WorkerPoolHeartbeats provides a mock function with given fields: +// WorkerPoolHeartbeats provides a mock function with no fields func (_m *JobServiceMonitorClient) WorkerPoolHeartbeats() ([]*work.WorkerPoolHeartbeat, error) { ret := _m.Called() diff --git a/src/testing/pkg/jobmonitor/pool_manager.go b/src/testing/pkg/jobmonitor/pool_manager.go index ca08ec63e..9e1fe4f97 100644 --- a/src/testing/pkg/jobmonitor/pool_manager.go +++ b/src/testing/pkg/jobmonitor/pool_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package jobmonitor diff --git a/src/testing/pkg/jobmonitor/queue_manager.go b/src/testing/pkg/jobmonitor/queue_manager.go index cc960ce49..e7ce33a25 100644 --- a/src/testing/pkg/jobmonitor/queue_manager.go +++ b/src/testing/pkg/jobmonitor/queue_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package jobmonitor diff --git a/src/testing/pkg/jobmonitor/redis_client.go b/src/testing/pkg/jobmonitor/redis_client.go index 5d270c48a..c5bdb97e5 100644 --- a/src/testing/pkg/jobmonitor/redis_client.go +++ b/src/testing/pkg/jobmonitor/redis_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package jobmonitor diff --git a/src/testing/pkg/jobmonitor/worker_manager.go b/src/testing/pkg/jobmonitor/worker_manager.go index ede27cbbe..b26ee6ffc 100644 --- a/src/testing/pkg/jobmonitor/worker_manager.go +++ b/src/testing/pkg/jobmonitor/worker_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package jobmonitor diff --git a/src/testing/pkg/label/dao/dao.go b/src/testing/pkg/label/dao/dao.go index b63c90278..7f353c078 100644 --- a/src/testing/pkg/label/dao/dao.go +++ b/src/testing/pkg/label/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/label/manager.go b/src/testing/pkg/label/manager.go index aa2fcb8b1..7063bbd2e 100644 --- a/src/testing/pkg/label/manager.go +++ b/src/testing/pkg/label/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package label diff --git a/src/testing/pkg/ldap/manager.go b/src/testing/pkg/ldap/manager.go index 966128b30..a865391e3 100644 --- a/src/testing/pkg/ldap/manager.go +++ b/src/testing/pkg/ldap/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package ldap diff --git a/src/testing/pkg/member/fake_member_manager.go b/src/testing/pkg/member/fake_member_manager.go index c959a2670..5252c2846 100644 --- a/src/testing/pkg/member/fake_member_manager.go +++ b/src/testing/pkg/member/fake_member_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package member diff --git a/src/testing/pkg/notification/policy/dao/dao.go b/src/testing/pkg/notification/policy/dao/dao.go index 3fe86a8d4..9d7547ca4 100644 --- a/src/testing/pkg/notification/policy/dao/dao.go +++ b/src/testing/pkg/notification/policy/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/notification/policy/manager.go b/src/testing/pkg/notification/policy/manager.go index 35a731495..07c406fff 100644 --- a/src/testing/pkg/notification/policy/manager.go +++ b/src/testing/pkg/notification/policy/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package policy diff --git a/src/testing/pkg/oidc/dao/meta_dao.go b/src/testing/pkg/oidc/dao/meta_dao.go index f6181268b..749253274 100644 --- a/src/testing/pkg/oidc/dao/meta_dao.go +++ b/src/testing/pkg/oidc/dao/meta_dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/oidc/meta_manager.go b/src/testing/pkg/oidc/meta_manager.go index c88c14f6c..54668823a 100644 --- a/src/testing/pkg/oidc/meta_manager.go +++ b/src/testing/pkg/oidc/meta_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package oidc diff --git a/src/testing/pkg/p2p/preheat/instance/manager.go b/src/testing/pkg/p2p/preheat/instance/manager.go index b08bd3f80..5fe05fd80 100644 --- a/src/testing/pkg/p2p/preheat/instance/manager.go +++ b/src/testing/pkg/p2p/preheat/instance/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package instance diff --git a/src/testing/pkg/p2p/preheat/policy/manager.go b/src/testing/pkg/p2p/preheat/policy/manager.go index c7df12e17..4f09455f9 100644 --- a/src/testing/pkg/p2p/preheat/policy/manager.go +++ b/src/testing/pkg/p2p/preheat/policy/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package policy diff --git a/src/testing/pkg/parser/parser.go b/src/testing/pkg/parser/parser.go index 065d4441c..785347ec3 100644 --- a/src/testing/pkg/parser/parser.go +++ b/src/testing/pkg/parser/parser.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package parser diff --git a/src/testing/pkg/processor/processor.go b/src/testing/pkg/processor/processor.go index 67a186ec3..e97d13206 100644 --- a/src/testing/pkg/processor/processor.go +++ b/src/testing/pkg/processor/processor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package processor diff --git a/src/testing/pkg/project/manager.go b/src/testing/pkg/project/manager.go index 98ac8e668..ab159eb67 100644 --- a/src/testing/pkg/project/manager.go +++ b/src/testing/pkg/project/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package project diff --git a/src/testing/pkg/project/metadata/manager.go b/src/testing/pkg/project/metadata/manager.go index 1f77f170e..f93ebbcee 100644 --- a/src/testing/pkg/project/metadata/manager.go +++ b/src/testing/pkg/project/metadata/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package metadata diff --git a/src/testing/pkg/queuestatus/manager.go b/src/testing/pkg/queuestatus/manager.go index f8f52dea9..59a85ebc7 100644 --- a/src/testing/pkg/queuestatus/manager.go +++ b/src/testing/pkg/queuestatus/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package queuestatus diff --git a/src/testing/pkg/quota/driver/driver.go b/src/testing/pkg/quota/driver/driver.go index 3db658199..69f459aa7 100644 --- a/src/testing/pkg/quota/driver/driver.go +++ b/src/testing/pkg/quota/driver/driver.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package driver diff --git a/src/testing/pkg/quota/manager.go b/src/testing/pkg/quota/manager.go index eef3b3737..37a7ae4b7 100644 --- a/src/testing/pkg/quota/manager.go +++ b/src/testing/pkg/quota/manager.go @@ -1,14 +1,14 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package quota import ( context "context" - q "github.com/goharbor/harbor/src/lib/q" + models "github.com/goharbor/harbor/src/pkg/quota/models" mock "github.com/stretchr/testify/mock" - quota "github.com/goharbor/harbor/src/pkg/quota" + q "github.com/goharbor/harbor/src/lib/q" types "github.com/goharbor/harbor/src/pkg/quota/types" ) @@ -100,23 +100,23 @@ func (_m *Manager) Delete(ctx context.Context, id int64) error { } // Get provides a mock function with given fields: ctx, id -func (_m *Manager) Get(ctx context.Context, id int64) (*quota.Quota, error) { +func (_m *Manager) Get(ctx context.Context, id int64) (*models.Quota, error) { ret := _m.Called(ctx, id) if len(ret) == 0 { panic("no return value specified for Get") } - var r0 *quota.Quota + var r0 *models.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, int64) (*quota.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64) (*models.Quota, error)); ok { return rf(ctx, id) } - if rf, ok := ret.Get(0).(func(context.Context, int64) *quota.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64) *models.Quota); ok { r0 = rf(ctx, id) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*quota.Quota) + r0 = ret.Get(0).(*models.Quota) } } @@ -130,23 +130,23 @@ func (_m *Manager) Get(ctx context.Context, id int64) (*quota.Quota, error) { } // GetByRef provides a mock function with given fields: ctx, reference, referenceID -func (_m *Manager) GetByRef(ctx context.Context, reference string, referenceID string) (*quota.Quota, error) { +func (_m *Manager) GetByRef(ctx context.Context, reference string, referenceID string) (*models.Quota, error) { ret := _m.Called(ctx, reference, referenceID) if len(ret) == 0 { panic("no return value specified for GetByRef") } - var r0 *quota.Quota + var r0 *models.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (*quota.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*models.Quota, error)); ok { return rf(ctx, reference, referenceID) } - if rf, ok := ret.Get(0).(func(context.Context, string, string) *quota.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string) *models.Quota); ok { r0 = rf(ctx, reference, referenceID) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*quota.Quota) + r0 = ret.Get(0).(*models.Quota) } } @@ -160,23 +160,23 @@ func (_m *Manager) GetByRef(ctx context.Context, reference string, referenceID s } // List provides a mock function with given fields: ctx, query -func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*quota.Quota, error) { +func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*models.Quota, error) { ret := _m.Called(ctx, query) if len(ret) == 0 { panic("no return value specified for List") } - var r0 []*quota.Quota + var r0 []*models.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*quota.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*models.Quota, error)); ok { return rf(ctx, query) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*quota.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*models.Quota); ok { r0 = rf(ctx, query) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*quota.Quota) + r0 = ret.Get(0).([]*models.Quota) } } @@ -190,7 +190,7 @@ func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*quota.Quota, er } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Manager) Update(ctx context.Context, _a1 *quota.Quota) error { +func (_m *Manager) Update(ctx context.Context, _a1 *models.Quota) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -198,7 +198,7 @@ func (_m *Manager) Update(ctx context.Context, _a1 *quota.Quota) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *quota.Quota) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *models.Quota) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/pkg/rbac/dao/dao.go b/src/testing/pkg/rbac/dao/dao.go index f18b5cbfb..7e06417d2 100644 --- a/src/testing/pkg/rbac/dao/dao.go +++ b/src/testing/pkg/rbac/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/rbac/manager.go b/src/testing/pkg/rbac/manager.go index ead3d4717..828f11904 100644 --- a/src/testing/pkg/rbac/manager.go +++ b/src/testing/pkg/rbac/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package rbac diff --git a/src/testing/pkg/reg/adapter/adapter.go b/src/testing/pkg/reg/adapter/adapter.go index 965417810..b19d55242 100644 --- a/src/testing/pkg/reg/adapter/adapter.go +++ b/src/testing/pkg/reg/adapter/adapter.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package adapter @@ -12,7 +12,7 @@ type Adapter struct { mock.Mock } -// HealthCheck provides a mock function with given fields: +// HealthCheck provides a mock function with no fields func (_m *Adapter) HealthCheck() (string, error) { ret := _m.Called() @@ -40,7 +40,7 @@ func (_m *Adapter) HealthCheck() (string, error) { return r0, r1 } -// Info provides a mock function with given fields: +// Info provides a mock function with no fields func (_m *Adapter) Info() (*model.RegistryInfo, error) { ret := _m.Called() diff --git a/src/testing/pkg/reg/dao/dao.go b/src/testing/pkg/reg/dao/dao.go index 61432f9c8..9477b9c16 100644 --- a/src/testing/pkg/reg/dao/dao.go +++ b/src/testing/pkg/reg/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/reg/manager.go b/src/testing/pkg/reg/manager.go index 4476d09e4..8ed3b5fd1 100644 --- a/src/testing/pkg/reg/manager.go +++ b/src/testing/pkg/reg/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package reg diff --git a/src/testing/pkg/registry/fake_registry_client.go b/src/testing/pkg/registry/fake_registry_client.go index 53e84de4a..9dc8c3a7c 100644 --- a/src/testing/pkg/registry/fake_registry_client.go +++ b/src/testing/pkg/registry/fake_registry_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package registry @@ -45,7 +45,7 @@ func (_m *Client) BlobExist(repository string, digest string) (bool, error) { return r0, r1 } -// Catalog provides a mock function with given fields: +// Catalog provides a mock function with no fields func (_m *Client) Catalog() ([]string, error) { ret := _m.Called() @@ -244,7 +244,7 @@ func (_m *Client) MountBlob(srcRepository string, digest string, dstRepository s return r0 } -// Ping provides a mock function with given fields: +// Ping provides a mock function with no fields func (_m *Client) Ping() error { ret := _m.Called() diff --git a/src/testing/pkg/replication/dao/dao.go b/src/testing/pkg/replication/dao/dao.go index f44d94edb..e39d0df55 100644 --- a/src/testing/pkg/replication/dao/dao.go +++ b/src/testing/pkg/replication/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/replication/manager.go b/src/testing/pkg/replication/manager.go index ae39aa6ed..ba3f46cff 100644 --- a/src/testing/pkg/replication/manager.go +++ b/src/testing/pkg/replication/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package replication diff --git a/src/testing/pkg/repository/dao/dao.go b/src/testing/pkg/repository/dao/dao.go index 6e59fe870..4c8a9fcd3 100644 --- a/src/testing/pkg/repository/dao/dao.go +++ b/src/testing/pkg/repository/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/repository/manager.go b/src/testing/pkg/repository/manager.go index 667d26f2a..fc28d1fa4 100644 --- a/src/testing/pkg/repository/manager.go +++ b/src/testing/pkg/repository/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package repository diff --git a/src/testing/pkg/robot/dao/dao.go b/src/testing/pkg/robot/dao/dao.go index b14222569..c08079266 100644 --- a/src/testing/pkg/robot/dao/dao.go +++ b/src/testing/pkg/robot/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/robot/manager.go b/src/testing/pkg/robot/manager.go index ca2c88122..a0f397e2b 100644 --- a/src/testing/pkg/robot/manager.go +++ b/src/testing/pkg/robot/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package robot diff --git a/src/testing/pkg/scan/export/artifact_digest_calculator.go b/src/testing/pkg/scan/export/artifact_digest_calculator.go index 2be3e00ec..2a1afd760 100644 --- a/src/testing/pkg/scan/export/artifact_digest_calculator.go +++ b/src/testing/pkg/scan/export/artifact_digest_calculator.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package export diff --git a/src/testing/pkg/scan/export/filter_processor.go b/src/testing/pkg/scan/export/filter_processor.go index e73648c39..2ea32f4be 100644 --- a/src/testing/pkg/scan/export/filter_processor.go +++ b/src/testing/pkg/scan/export/filter_processor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package export diff --git a/src/testing/pkg/scan/export/manager.go b/src/testing/pkg/scan/export/manager.go index 7200b6595..32d6e1cd6 100644 --- a/src/testing/pkg/scan/export/manager.go +++ b/src/testing/pkg/scan/export/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package export diff --git a/src/testing/pkg/scan/handler.go b/src/testing/pkg/scan/handler.go index 5d9ba6b8b..9d4e0ccda 100644 --- a/src/testing/pkg/scan/handler.go +++ b/src/testing/pkg/scan/handler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scan @@ -89,7 +89,7 @@ func (_m *Handler) GetSummary(ctx context.Context, ar *artifact.Artifact, mimeTy return r0, r1 } -// JobVendorType provides a mock function with given fields: +// JobVendorType provides a mock function with no fields func (_m *Handler) JobVendorType() string { ret := _m.Called() @@ -165,7 +165,7 @@ func (_m *Handler) PostScan(ctx job.Context, sr *v1.ScanRequest, rp *scan.Report return r0, r1 } -// RequestParameters provides a mock function with given fields: +// RequestParameters provides a mock function with no fields func (_m *Handler) RequestParameters() map[string]interface{} { ret := _m.Called() @@ -185,7 +185,7 @@ func (_m *Handler) RequestParameters() map[string]interface{} { return r0 } -// RequestProducesMineTypes provides a mock function with given fields: +// RequestProducesMineTypes provides a mock function with no fields func (_m *Handler) RequestProducesMineTypes() []string { ret := _m.Called() @@ -205,7 +205,7 @@ func (_m *Handler) RequestProducesMineTypes() []string { return r0 } -// RequiredPermissions provides a mock function with given fields: +// RequiredPermissions provides a mock function with no fields func (_m *Handler) RequiredPermissions() []*types.Policy { ret := _m.Called() diff --git a/src/testing/pkg/scan/postprocessors/native_scan_report_converter.go b/src/testing/pkg/scan/postprocessors/native_scan_report_converter.go index 8137b0224..8b5e3432d 100644 --- a/src/testing/pkg/scan/postprocessors/native_scan_report_converter.go +++ b/src/testing/pkg/scan/postprocessors/native_scan_report_converter.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package postprocessors diff --git a/src/testing/pkg/scan/report/manager.go b/src/testing/pkg/scan/report/manager.go index bbdbe68b3..7c499b79f 100644 --- a/src/testing/pkg/scan/report/manager.go +++ b/src/testing/pkg/scan/report/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package report diff --git a/src/testing/pkg/scan/rest/v1/client.go b/src/testing/pkg/scan/rest/v1/client.go index e65845293..e1172b023 100644 --- a/src/testing/pkg/scan/rest/v1/client.go +++ b/src/testing/pkg/scan/rest/v1/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package v1 @@ -12,7 +12,7 @@ type Client struct { mock.Mock } -// GetMetadata provides a mock function with given fields: +// GetMetadata provides a mock function with no fields func (_m *Client) GetMetadata() (*v1.ScannerAdapterMetadata, error) { ret := _m.Called() diff --git a/src/testing/pkg/scan/rest/v1/client_pool.go b/src/testing/pkg/scan/rest/v1/client_pool.go index 319d1b2c6..37f8e572d 100644 --- a/src/testing/pkg/scan/rest/v1/client_pool.go +++ b/src/testing/pkg/scan/rest/v1/client_pool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package v1 diff --git a/src/testing/pkg/scan/rest/v1/request_resolver.go b/src/testing/pkg/scan/rest/v1/request_resolver.go index 3fd73505f..932f447ab 100644 --- a/src/testing/pkg/scan/rest/v1/request_resolver.go +++ b/src/testing/pkg/scan/rest/v1/request_resolver.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package v1 diff --git a/src/testing/pkg/scan/rest/v1/response_handler.go b/src/testing/pkg/scan/rest/v1/response_handler.go index 1e18c27e0..bdb15b2c0 100644 --- a/src/testing/pkg/scan/rest/v1/response_handler.go +++ b/src/testing/pkg/scan/rest/v1/response_handler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package v1 diff --git a/src/testing/pkg/scan/sbom/manager.go b/src/testing/pkg/scan/sbom/manager.go index 11c195ae5..1751c90a3 100644 --- a/src/testing/pkg/scan/sbom/manager.go +++ b/src/testing/pkg/scan/sbom/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package sbom diff --git a/src/testing/pkg/scan/scanner/manager.go b/src/testing/pkg/scan/scanner/manager.go index b406661c6..6d5626350 100644 --- a/src/testing/pkg/scan/scanner/manager.go +++ b/src/testing/pkg/scan/scanner/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scanner diff --git a/src/testing/pkg/scheduler/scheduler.go b/src/testing/pkg/scheduler/scheduler.go index 6b0451308..601b7face 100644 --- a/src/testing/pkg/scheduler/scheduler.go +++ b/src/testing/pkg/scheduler/scheduler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package scheduler diff --git a/src/testing/pkg/securityhub/manager.go b/src/testing/pkg/securityhub/manager.go index 777333422..e686cb6d1 100644 --- a/src/testing/pkg/securityhub/manager.go +++ b/src/testing/pkg/securityhub/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package securityhub diff --git a/src/testing/pkg/systemartifact/cleanup/selector.go b/src/testing/pkg/systemartifact/cleanup/selector.go index b2fbb9602..2027a222d 100644 --- a/src/testing/pkg/systemartifact/cleanup/selector.go +++ b/src/testing/pkg/systemartifact/cleanup/selector.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package cleanup diff --git a/src/testing/pkg/systemartifact/dao/dao.go b/src/testing/pkg/systemartifact/dao/dao.go index e897f4428..43480e3b5 100644 --- a/src/testing/pkg/systemartifact/dao/dao.go +++ b/src/testing/pkg/systemartifact/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/systemartifact/manager.go b/src/testing/pkg/systemartifact/manager.go index b3ea0e1f6..f5e014f71 100644 --- a/src/testing/pkg/systemartifact/manager.go +++ b/src/testing/pkg/systemartifact/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package systemartifact @@ -175,7 +175,7 @@ func (_m *Manager) GetStorageSize(ctx context.Context) (int64, error) { return r0, r1 } -// GetSystemArtifactProjectNames provides a mock function with given fields: +// GetSystemArtifactProjectNames provides a mock function with no fields func (_m *Manager) GetSystemArtifactProjectNames() []string { ret := _m.Called() diff --git a/src/testing/pkg/tag/manager.go b/src/testing/pkg/tag/manager.go index 42f82dc5d..e5acff104 100644 --- a/src/testing/pkg/tag/manager.go +++ b/src/testing/pkg/tag/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package tag diff --git a/src/testing/pkg/task/execution_manager.go b/src/testing/pkg/task/execution_manager.go index bd2b79888..4c28f9eb1 100644 --- a/src/testing/pkg/task/execution_manager.go +++ b/src/testing/pkg/task/execution_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/testing/pkg/task/manager.go b/src/testing/pkg/task/manager.go index a9cfbdb95..2de7636ed 100644 --- a/src/testing/pkg/task/manager.go +++ b/src/testing/pkg/task/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package task diff --git a/src/testing/pkg/user/dao/dao.go b/src/testing/pkg/user/dao/dao.go index d7d6e6514..10304cdf3 100644 --- a/src/testing/pkg/user/dao/dao.go +++ b/src/testing/pkg/user/dao/dao.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package dao diff --git a/src/testing/pkg/user/manager.go b/src/testing/pkg/user/manager.go index 6abbb3530..8f0826b8f 100644 --- a/src/testing/pkg/user/manager.go +++ b/src/testing/pkg/user/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package user diff --git a/src/testing/pkg/usergroup/fake_usergroup_manager.go b/src/testing/pkg/usergroup/fake_usergroup_manager.go index a3e5691bb..40439bb6d 100644 --- a/src/testing/pkg/usergroup/fake_usergroup_manager.go +++ b/src/testing/pkg/usergroup/fake_usergroup_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package usergroup diff --git a/src/testing/registryctl/client.go b/src/testing/registryctl/client.go index 2f5dc04f6..eda6ed061 100644 --- a/src/testing/registryctl/client.go +++ b/src/testing/registryctl/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.46.2. DO NOT EDIT. +// Code generated by mockery v2.51.0. DO NOT EDIT. package registryctl @@ -45,7 +45,7 @@ func (_m *Client) DeleteManifest(repository string, reference string) error { return r0 } -// Health provides a mock function with given fields: +// Health provides a mock function with no fields func (_m *Client) Health() error { ret := _m.Called() diff --git a/tools/mockery/Dockerfile b/tools/mockery/Dockerfile index c755f3cdb..070eae24c 100644 --- a/tools/mockery/Dockerfile +++ b/tools/mockery/Dockerfile @@ -3,12 +3,4 @@ FROM ${GOLANG} ARG MOCKERY_VERSION -# https://github.com/docker-library/golang/issues/225 -ENV XDG_CACHE_HOME /tmp -ENV GO111MODULE auto - -RUN mkdir -p /tmp/mockery-${MOCKERY_VERSION} && \ - curl -fsSL https://github.com/vektra/mockery/releases/download/${MOCKERY_VERSION}/mockery_${MOCKERY_VERSION#v}_Linux_x86_64.tar.gz | tar -xz -C /tmp/mockery-${MOCKERY_VERSION} && \ - mv /tmp/mockery-${MOCKERY_VERSION}/mockery /usr/local/bin && \ - chmod +x /usr/local/bin/mockery && \ - rm -rf /tmp/mockery-${MOCKERY_VERSION} +RUN go install github.com/vektra/mockery/v2@${MOCKERY_VERSION}