From 0042b7552135feec36e1d70c3f227579e17cb25a Mon Sep 17 00:00:00 2001 From: Kush Sharma Date: Mon, 28 Aug 2023 22:14:56 +0530 Subject: [PATCH] fix: guardian starts rest and grpc on same port - start up fix to use different port for grpc - docs fix for gcs - remove unsupported shield identity client Signed-off-by: Kush Sharma --- .gitignore | 3 + api/handler/v1beta1/mocks/activityService.go | 58 +++- api/handler/v1beta1/mocks/appealService.go | 112 ++++++-- api/handler/v1beta1/mocks/approvalService.go | 32 ++- api/handler/v1beta1/mocks/grantService.go | 11 +- api/handler/v1beta1/mocks/policyService.go | 62 +++- api/handler/v1beta1/mocks/providerService.go | 151 ++++++++-- api/handler/v1beta1/mocks/resourceService.go | 94 ++++-- core/activity/mocks/auditLogger.go | 27 +- core/activity/mocks/providerService.go | 30 +- core/activity/mocks/repository.go | 53 +++- core/appeal/mocks/approvalService.go | 31 +- core/appeal/mocks/auditLogger.go | 27 +- core/appeal/mocks/grantService.go | 64 ++++- core/appeal/mocks/iamManager.go | 40 ++- core/appeal/mocks/notifier.go | 23 +- core/appeal/mocks/policyService.go | 44 ++- core/appeal/mocks/providerService.go | 77 +++-- core/appeal/mocks/repository.go | 62 +++- core/appeal/mocks/resourceService.go | 44 ++- core/approval/mocks/policyService.go | 25 +- core/approval/mocks/repository.go | 52 +++- core/grant/mocks/auditLogger.go | 27 +- core/grant/mocks/notifier.go | 23 +- core/grant/mocks/providerService.go | 55 +++- core/grant/mocks/repository.go | 62 +++- core/grant/mocks/resourceService.go | 30 +- core/policy/mocks/auditLogger.go | 27 +- core/policy/mocks/providerService.go | 45 ++- core/policy/mocks/repository.go | 53 +++- core/policy/mocks/resourceService.go | 30 +- core/policy/service.go | 3 +- core/provider/mocks/activityManager.go | 32 ++- core/provider/mocks/auditLogger.go | 27 +- core/provider/mocks/client.go | 109 +++++-- core/provider/mocks/repository.go | 97 +++++-- core/provider/mocks/resourceService.go | 48 +++- core/resource/mocks/auditLogger.go | 27 +- core/resource/mocks/repository.go | 80 +++++- docs/docs/providers/gcs.md | 1 + domain/provider.go | 4 +- internal/server/config.go | 26 +- internal/server/server.go | 9 +- internal/server/services.go | 4 +- jobs/mocks/grantService.go | 66 ++++- jobs/mocks/providerService.go | 16 +- mocks/ShieldClient.go | 2 +- plugins/identities/http.go | 2 +- plugins/identities/service.go | 11 - plugins/identities/shield.go | 231 --------------- plugins/providers/bigquery/client.go | 4 +- .../bigquery/mocks/BigQueryClient.go | 138 ++++++--- .../bigquery/mocks/cloudLoggingClientI.go | 35 ++- plugins/providers/bigquery/mocks/encryptor.go | 40 ++- .../providers/{shield => frontier}/client.go | 12 +- .../{shield => frontier}/client_test.go | 80 +++--- .../providers/{shield => frontier}/config.go | 2 +- .../{shield => frontier}/config_test.go | 20 +- .../providers/{shield => frontier}/errors.go | 2 +- .../{shield => frontier}/provider.go | 9 +- .../{shield => frontier}/provider_test.go | 272 +++++++++--------- .../{shield => frontier}/resource.go | 2 +- .../gcloudiam/mocks/GcloudIamClient.go | 62 +++- .../providers/gcloudiam/mocks/encryptor.go | 40 ++- plugins/providers/gcs/mocks/Crypto.go | 11 +- plugins/providers/gcs/mocks/GCSClient.go | 11 +- 66 files changed, 2115 insertions(+), 894 deletions(-) delete mode 100644 plugins/identities/shield.go rename plugins/providers/{shield => frontier}/client.go (97%) rename plugins/providers/{shield => frontier}/client_test.go (88%) rename plugins/providers/{shield => frontier}/config.go (99%) rename plugins/providers/{shield => frontier}/config_test.go (85%) rename plugins/providers/{shield => frontier}/errors.go (90%) rename plugins/providers/{shield => frontier}/provider.go (97%) rename plugins/providers/{shield => frontier}/provider_test.go (85%) rename plugins/providers/{shield => frontier}/resource.go (99%) diff --git a/.gitignore b/.gitignore index aa8e1c175..856dfb7ab 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,9 @@ tmp # guardian .guardian.yaml +.guardian.yml +guardian.yml +guardian.yaml dist/ ./guardian diff --git a/api/handler/v1beta1/mocks/activityService.go b/api/handler/v1beta1/mocks/activityService.go index 2b5b7ab15..19568c5e1 100644 --- a/api/handler/v1beta1/mocks/activityService.go +++ b/api/handler/v1beta1/mocks/activityService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ActivityService) Find(_a0 context.Context, _a1 domain.ListProviderActi ret := _m.Called(_a0, _a1) var r0 []*domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListProviderActivitiesFilter) ([]*domain.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListProviderActivitiesFilter) []*domain.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -35,7 +39,6 @@ func (_m *ActivityService) Find(_a0 context.Context, _a1 domain.ListProviderActi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListProviderActivitiesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -51,8 +54,8 @@ type ActivityService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListProviderActivitiesFilter +// - _a0 context.Context +// - _a1 domain.ListProviderActivitiesFilter func (_e *ActivityService_Expecter) Find(_a0 interface{}, _a1 interface{}) *ActivityService_Find_Call { return &ActivityService_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -69,11 +72,20 @@ func (_c *ActivityService_Find_Call) Return(_a0 []*domain.Activity, _a1 error) * return _c } +func (_c *ActivityService_Find_Call) RunAndReturn(run func(context.Context, domain.ListProviderActivitiesFilter) ([]*domain.Activity, error)) *ActivityService_Find_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: _a0, _a1 func (_m *ActivityService) GetOne(_a0 context.Context, _a1 string) (*domain.Activity, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -82,7 +94,6 @@ func (_m *ActivityService) GetOne(_a0 context.Context, _a1 string) (*domain.Acti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -98,8 +109,8 @@ type ActivityService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *ActivityService_Expecter) GetOne(_a0 interface{}, _a1 interface{}) *ActivityService_GetOne_Call { return &ActivityService_GetOne_Call{Call: _e.mock.On("GetOne", _a0, _a1)} } @@ -116,11 +127,20 @@ func (_c *ActivityService_GetOne_Call) Return(_a0 *domain.Activity, _a1 error) * return _c } +func (_c *ActivityService_GetOne_Call) RunAndReturn(run func(context.Context, string) (*domain.Activity, error)) *ActivityService_GetOne_Call { + _c.Call.Return(run) + return _c +} + // Import provides a mock function with given fields: _a0, _a1 func (_m *ActivityService) Import(_a0 context.Context, _a1 domain.ImportActivitiesFilter) ([]*domain.Activity, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ImportActivitiesFilter) ([]*domain.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ImportActivitiesFilter) []*domain.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -129,7 +149,6 @@ func (_m *ActivityService) Import(_a0 context.Context, _a1 domain.ImportActiviti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ImportActivitiesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -145,8 +164,8 @@ type ActivityService_Import_Call struct { } // Import is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ImportActivitiesFilter +// - _a0 context.Context +// - _a1 domain.ImportActivitiesFilter func (_e *ActivityService_Expecter) Import(_a0 interface{}, _a1 interface{}) *ActivityService_Import_Call { return &ActivityService_Import_Call{Call: _e.mock.On("Import", _a0, _a1)} } @@ -162,3 +181,22 @@ func (_c *ActivityService_Import_Call) Return(_a0 []*domain.Activity, _a1 error) _c.Call.Return(_a0, _a1) return _c } + +func (_c *ActivityService_Import_Call) RunAndReturn(run func(context.Context, domain.ImportActivitiesFilter) ([]*domain.Activity, error)) *ActivityService_Import_Call { + _c.Call.Return(run) + return _c +} + +// NewActivityService creates a new instance of ActivityService. 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 NewActivityService(t interface { + mock.TestingT + Cleanup(func()) +}) *ActivityService { + mock := &ActivityService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/api/handler/v1beta1/mocks/appealService.go b/api/handler/v1beta1/mocks/appealService.go index 0ea553955..787b1af82 100644 --- a/api/handler/v1beta1/mocks/appealService.go +++ b/api/handler/v1beta1/mocks/appealService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -30,6 +30,10 @@ func (_m *AppealService) AddApprover(ctx context.Context, appealID string, appro ret := _m.Called(ctx, appealID, approvalID, email) var r0 *domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (*domain.Appeal, error)); ok { + return rf(ctx, appealID, approvalID, email) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string) *domain.Appeal); ok { r0 = rf(ctx, appealID, approvalID, email) } else { @@ -38,7 +42,6 @@ func (_m *AppealService) AddApprover(ctx context.Context, appealID string, appro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { r1 = rf(ctx, appealID, approvalID, email) } else { @@ -54,10 +57,10 @@ type AppealService_AddApprover_Call struct { } // AddApprover is a helper method to define mock.On call -// - ctx context.Context -// - appealID string -// - approvalID string -// - email string +// - ctx context.Context +// - appealID string +// - approvalID string +// - email string func (_e *AppealService_Expecter) AddApprover(ctx interface{}, appealID interface{}, approvalID interface{}, email interface{}) *AppealService_AddApprover_Call { return &AppealService_AddApprover_Call{Call: _e.mock.On("AddApprover", ctx, appealID, approvalID, email)} } @@ -74,11 +77,20 @@ func (_c *AppealService_AddApprover_Call) Return(_a0 *domain.Appeal, _a1 error) return _c } +func (_c *AppealService_AddApprover_Call) RunAndReturn(run func(context.Context, string, string, string) (*domain.Appeal, error)) *AppealService_AddApprover_Call { + _c.Call.Return(run) + return _c +} + // Cancel provides a mock function with given fields: _a0, _a1 func (_m *AppealService) Cancel(_a0 context.Context, _a1 string) (*domain.Appeal, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Appeal, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Appeal); ok { r0 = rf(_a0, _a1) } else { @@ -87,7 +99,6 @@ func (_m *AppealService) Cancel(_a0 context.Context, _a1 string) (*domain.Appeal } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -103,8 +114,8 @@ type AppealService_Cancel_Call struct { } // Cancel is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *AppealService_Expecter) Cancel(_a0 interface{}, _a1 interface{}) *AppealService_Cancel_Call { return &AppealService_Cancel_Call{Call: _e.mock.On("Cancel", _a0, _a1)} } @@ -121,6 +132,11 @@ func (_c *AppealService_Cancel_Call) Return(_a0 *domain.Appeal, _a1 error) *Appe return _c } +func (_c *AppealService_Cancel_Call) RunAndReturn(run func(context.Context, string) (*domain.Appeal, error)) *AppealService_Cancel_Call { + _c.Call.Return(run) + return _c +} + // Create provides a mock function with given fields: _a0, _a1, _a2 func (_m *AppealService) Create(_a0 context.Context, _a1 []*domain.Appeal, _a2 ...appeal.CreateAppealOption) error { _va := make([]interface{}, len(_a2)) @@ -148,9 +164,9 @@ type AppealService_Create_Call struct { } // Create is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Appeal -// - _a2 ...appeal.CreateAppealOption +// - _a0 context.Context +// - _a1 []*domain.Appeal +// - _a2 ...appeal.CreateAppealOption func (_e *AppealService_Expecter) Create(_a0 interface{}, _a1 interface{}, _a2 ...interface{}) *AppealService_Create_Call { return &AppealService_Create_Call{Call: _e.mock.On("Create", append([]interface{}{_a0, _a1}, _a2...)...)} @@ -174,11 +190,20 @@ func (_c *AppealService_Create_Call) Return(_a0 error) *AppealService_Create_Cal return _c } +func (_c *AppealService_Create_Call) RunAndReturn(run func(context.Context, []*domain.Appeal, ...appeal.CreateAppealOption) error) *AppealService_Create_Call { + _c.Call.Return(run) + return _c +} + // DeleteApprover provides a mock function with given fields: ctx, appealID, approvalID, email func (_m *AppealService) DeleteApprover(ctx context.Context, appealID string, approvalID string, email string) (*domain.Appeal, error) { ret := _m.Called(ctx, appealID, approvalID, email) var r0 *domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (*domain.Appeal, error)); ok { + return rf(ctx, appealID, approvalID, email) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string) *domain.Appeal); ok { r0 = rf(ctx, appealID, approvalID, email) } else { @@ -187,7 +212,6 @@ func (_m *AppealService) DeleteApprover(ctx context.Context, appealID string, ap } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { r1 = rf(ctx, appealID, approvalID, email) } else { @@ -203,10 +227,10 @@ type AppealService_DeleteApprover_Call struct { } // DeleteApprover is a helper method to define mock.On call -// - ctx context.Context -// - appealID string -// - approvalID string -// - email string +// - ctx context.Context +// - appealID string +// - approvalID string +// - email string func (_e *AppealService_Expecter) DeleteApprover(ctx interface{}, appealID interface{}, approvalID interface{}, email interface{}) *AppealService_DeleteApprover_Call { return &AppealService_DeleteApprover_Call{Call: _e.mock.On("DeleteApprover", ctx, appealID, approvalID, email)} } @@ -223,11 +247,20 @@ func (_c *AppealService_DeleteApprover_Call) Return(_a0 *domain.Appeal, _a1 erro return _c } +func (_c *AppealService_DeleteApprover_Call) RunAndReturn(run func(context.Context, string, string, string) (*domain.Appeal, error)) *AppealService_DeleteApprover_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0, _a1 func (_m *AppealService) Find(_a0 context.Context, _a1 *domain.ListAppealsFilter) ([]*domain.Appeal, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ListAppealsFilter) ([]*domain.Appeal, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ListAppealsFilter) []*domain.Appeal); ok { r0 = rf(_a0, _a1) } else { @@ -236,7 +269,6 @@ func (_m *AppealService) Find(_a0 context.Context, _a1 *domain.ListAppealsFilter } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ListAppealsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -252,8 +284,8 @@ type AppealService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ListAppealsFilter +// - _a0 context.Context +// - _a1 *domain.ListAppealsFilter func (_e *AppealService_Expecter) Find(_a0 interface{}, _a1 interface{}) *AppealService_Find_Call { return &AppealService_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -270,11 +302,20 @@ func (_c *AppealService_Find_Call) Return(_a0 []*domain.Appeal, _a1 error) *Appe return _c } +func (_c *AppealService_Find_Call) RunAndReturn(run func(context.Context, *domain.ListAppealsFilter) ([]*domain.Appeal, error)) *AppealService_Find_Call { + _c.Call.Return(run) + return _c +} + // GetByID provides a mock function with given fields: _a0, _a1 func (_m *AppealService) GetByID(_a0 context.Context, _a1 string) (*domain.Appeal, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Appeal, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Appeal); ok { r0 = rf(_a0, _a1) } else { @@ -283,7 +324,6 @@ func (_m *AppealService) GetByID(_a0 context.Context, _a1 string) (*domain.Appea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -299,8 +339,8 @@ type AppealService_GetByID_Call struct { } // GetByID is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *AppealService_Expecter) GetByID(_a0 interface{}, _a1 interface{}) *AppealService_GetByID_Call { return &AppealService_GetByID_Call{Call: _e.mock.On("GetByID", _a0, _a1)} } @@ -317,11 +357,20 @@ func (_c *AppealService_GetByID_Call) Return(_a0 *domain.Appeal, _a1 error) *App return _c } +func (_c *AppealService_GetByID_Call) RunAndReturn(run func(context.Context, string) (*domain.Appeal, error)) *AppealService_GetByID_Call { + _c.Call.Return(run) + return _c +} + // UpdateApproval provides a mock function with given fields: ctx, approvalAction func (_m *AppealService) UpdateApproval(ctx context.Context, approvalAction domain.ApprovalAction) (*domain.Appeal, error) { ret := _m.Called(ctx, approvalAction) var r0 *domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ApprovalAction) (*domain.Appeal, error)); ok { + return rf(ctx, approvalAction) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ApprovalAction) *domain.Appeal); ok { r0 = rf(ctx, approvalAction) } else { @@ -330,7 +379,6 @@ func (_m *AppealService) UpdateApproval(ctx context.Context, approvalAction doma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ApprovalAction) error); ok { r1 = rf(ctx, approvalAction) } else { @@ -346,8 +394,8 @@ type AppealService_UpdateApproval_Call struct { } // UpdateApproval is a helper method to define mock.On call -// - ctx context.Context -// - approvalAction domain.ApprovalAction +// - ctx context.Context +// - approvalAction domain.ApprovalAction func (_e *AppealService_Expecter) UpdateApproval(ctx interface{}, approvalAction interface{}) *AppealService_UpdateApproval_Call { return &AppealService_UpdateApproval_Call{Call: _e.mock.On("UpdateApproval", ctx, approvalAction)} } @@ -364,13 +412,17 @@ func (_c *AppealService_UpdateApproval_Call) Return(_a0 *domain.Appeal, _a1 erro return _c } -type mockConstructorTestingTNewAppealService interface { - mock.TestingT - Cleanup(func()) +func (_c *AppealService_UpdateApproval_Call) RunAndReturn(run func(context.Context, domain.ApprovalAction) (*domain.Appeal, error)) *AppealService_UpdateApproval_Call { + _c.Call.Return(run) + return _c } // NewAppealService creates a new instance of AppealService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewAppealService(t mockConstructorTestingTNewAppealService) *AppealService { +// The first argument is typically a *testing.T value. +func NewAppealService(t interface { + mock.TestingT + Cleanup(func()) +}) *AppealService { mock := &AppealService{} mock.Mock.Test(t) diff --git a/api/handler/v1beta1/mocks/approvalService.go b/api/handler/v1beta1/mocks/approvalService.go index 5385ab080..31b8ea9ad 100644 --- a/api/handler/v1beta1/mocks/approvalService.go +++ b/api/handler/v1beta1/mocks/approvalService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type ApprovalService_BulkInsert_Call struct { } // BulkInsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Approval +// - _a0 context.Context +// - _a1 []*domain.Approval func (_e *ApprovalService_Expecter) BulkInsert(_a0 interface{}, _a1 interface{}) *ApprovalService_BulkInsert_Call { return &ApprovalService_BulkInsert_Call{Call: _e.mock.On("BulkInsert", _a0, _a1)} } @@ -60,11 +60,20 @@ func (_c *ApprovalService_BulkInsert_Call) Return(_a0 error) *ApprovalService_Bu return _c } +func (_c *ApprovalService_BulkInsert_Call) RunAndReturn(run func(context.Context, []*domain.Approval) error) *ApprovalService_BulkInsert_Call { + _c.Call.Return(run) + return _c +} + // ListApprovals provides a mock function with given fields: _a0, _a1 func (_m *ApprovalService) ListApprovals(_a0 context.Context, _a1 *domain.ListApprovalsFilter) ([]*domain.Approval, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Approval + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ListApprovalsFilter) ([]*domain.Approval, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ListApprovalsFilter) []*domain.Approval); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +82,6 @@ func (_m *ApprovalService) ListApprovals(_a0 context.Context, _a1 *domain.ListAp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ListApprovalsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -89,8 +97,8 @@ type ApprovalService_ListApprovals_Call struct { } // ListApprovals is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ListApprovalsFilter +// - _a0 context.Context +// - _a1 *domain.ListApprovalsFilter func (_e *ApprovalService_Expecter) ListApprovals(_a0 interface{}, _a1 interface{}) *ApprovalService_ListApprovals_Call { return &ApprovalService_ListApprovals_Call{Call: _e.mock.On("ListApprovals", _a0, _a1)} } @@ -107,13 +115,17 @@ func (_c *ApprovalService_ListApprovals_Call) Return(_a0 []*domain.Approval, _a1 return _c } -type mockConstructorTestingTNewApprovalService interface { - mock.TestingT - Cleanup(func()) +func (_c *ApprovalService_ListApprovals_Call) RunAndReturn(run func(context.Context, *domain.ListApprovalsFilter) ([]*domain.Approval, error)) *ApprovalService_ListApprovals_Call { + _c.Call.Return(run) + return _c } // NewApprovalService creates a new instance of ApprovalService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewApprovalService(t mockConstructorTestingTNewApprovalService) *ApprovalService { +// The first argument is typically a *testing.T value. +func NewApprovalService(t interface { + mock.TestingT + Cleanup(func()) +}) *ApprovalService { mock := &ApprovalService{} mock.Mock.Test(t) diff --git a/api/handler/v1beta1/mocks/grantService.go b/api/handler/v1beta1/mocks/grantService.go index b77a289c8..155e1f23b 100644 --- a/api/handler/v1beta1/mocks/grantService.go +++ b/api/handler/v1beta1/mocks/grantService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.20.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -361,13 +361,12 @@ func (_c *GrantService_Update_Call) RunAndReturn(run func(context.Context, *doma return _c } -type mockConstructorTestingTNewGrantService interface { +// NewGrantService creates a new instance of GrantService. 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 NewGrantService(t interface { mock.TestingT Cleanup(func()) -} - -// NewGrantService creates a new instance of GrantService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewGrantService(t mockConstructorTestingTNewGrantService) *GrantService { +}) *GrantService { mock := &GrantService{} mock.Mock.Test(t) diff --git a/api/handler/v1beta1/mocks/policyService.go b/api/handler/v1beta1/mocks/policyService.go index 1cf418eb1..3c448398e 100644 --- a/api/handler/v1beta1/mocks/policyService.go +++ b/api/handler/v1beta1/mocks/policyService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type PolicyService_Create_Call struct { } // Create is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Policy +// - _a0 context.Context +// - _a1 *domain.Policy func (_e *PolicyService_Expecter) Create(_a0 interface{}, _a1 interface{}) *PolicyService_Create_Call { return &PolicyService_Create_Call{Call: _e.mock.On("Create", _a0, _a1)} } @@ -60,11 +60,20 @@ func (_c *PolicyService_Create_Call) Return(_a0 error) *PolicyService_Create_Cal return _c } +func (_c *PolicyService_Create_Call) RunAndReturn(run func(context.Context, *domain.Policy) error) *PolicyService_Create_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0 func (_m *PolicyService) Find(_a0 context.Context) ([]*domain.Policy, error) { ret := _m.Called(_a0) var r0 []*domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*domain.Policy, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*domain.Policy); ok { r0 = rf(_a0) } else { @@ -73,7 +82,6 @@ func (_m *PolicyService) Find(_a0 context.Context) ([]*domain.Policy, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -89,7 +97,7 @@ type PolicyService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *PolicyService_Expecter) Find(_a0 interface{}) *PolicyService_Find_Call { return &PolicyService_Find_Call{Call: _e.mock.On("Find", _a0)} } @@ -106,11 +114,20 @@ func (_c *PolicyService_Find_Call) Return(_a0 []*domain.Policy, _a1 error) *Poli return _c } +func (_c *PolicyService_Find_Call) RunAndReturn(run func(context.Context) ([]*domain.Policy, error)) *PolicyService_Find_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: ctx, id, version func (_m *PolicyService) GetOne(ctx context.Context, id string, version uint) (*domain.Policy, error) { ret := _m.Called(ctx, id, version) var r0 *domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, uint) (*domain.Policy, error)); ok { + return rf(ctx, id, version) + } if rf, ok := ret.Get(0).(func(context.Context, string, uint) *domain.Policy); ok { r0 = rf(ctx, id, version) } else { @@ -119,7 +136,6 @@ func (_m *PolicyService) GetOne(ctx context.Context, id string, version uint) (* } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, uint) error); ok { r1 = rf(ctx, id, version) } else { @@ -135,9 +151,9 @@ type PolicyService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - ctx context.Context -// - id string -// - version uint +// - ctx context.Context +// - id string +// - version uint func (_e *PolicyService_Expecter) GetOne(ctx interface{}, id interface{}, version interface{}) *PolicyService_GetOne_Call { return &PolicyService_GetOne_Call{Call: _e.mock.On("GetOne", ctx, id, version)} } @@ -154,6 +170,11 @@ func (_c *PolicyService_GetOne_Call) Return(_a0 *domain.Policy, _a1 error) *Poli return _c } +func (_c *PolicyService_GetOne_Call) RunAndReturn(run func(context.Context, string, uint) (*domain.Policy, error)) *PolicyService_GetOne_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *PolicyService) Update(_a0 context.Context, _a1 *domain.Policy) error { ret := _m.Called(_a0, _a1) @@ -174,8 +195,8 @@ type PolicyService_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Policy +// - _a0 context.Context +// - _a1 *domain.Policy func (_e *PolicyService_Expecter) Update(_a0 interface{}, _a1 interface{}) *PolicyService_Update_Call { return &PolicyService_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -191,3 +212,22 @@ func (_c *PolicyService_Update_Call) Return(_a0 error) *PolicyService_Update_Cal _c.Call.Return(_a0) return _c } + +func (_c *PolicyService_Update_Call) RunAndReturn(run func(context.Context, *domain.Policy) error) *PolicyService_Update_Call { + _c.Call.Return(run) + return _c +} + +// NewPolicyService creates a new instance of PolicyService. 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 NewPolicyService(t interface { + mock.TestingT + Cleanup(func()) +}) *PolicyService { + mock := &PolicyService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/api/handler/v1beta1/mocks/providerService.go b/api/handler/v1beta1/mocks/providerService.go index b4c4eb08b..815624ca2 100644 --- a/api/handler/v1beta1/mocks/providerService.go +++ b/api/handler/v1beta1/mocks/providerService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type ProviderService_Create_Call struct { } // Create is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Provider +// - _a0 context.Context +// - _a1 *domain.Provider func (_e *ProviderService_Expecter) Create(_a0 interface{}, _a1 interface{}) *ProviderService_Create_Call { return &ProviderService_Create_Call{Call: _e.mock.On("Create", _a0, _a1)} } @@ -60,6 +60,11 @@ func (_c *ProviderService_Create_Call) Return(_a0 error) *ProviderService_Create return _c } +func (_c *ProviderService_Create_Call) RunAndReturn(run func(context.Context, *domain.Provider) error) *ProviderService_Create_Call { + _c.Call.Return(run) + return _c +} + // Delete provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) Delete(_a0 context.Context, _a1 string) error { ret := _m.Called(_a0, _a1) @@ -80,8 +85,8 @@ type ProviderService_Delete_Call struct { } // Delete is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *ProviderService_Expecter) Delete(_a0 interface{}, _a1 interface{}) *ProviderService_Delete_Call { return &ProviderService_Delete_Call{Call: _e.mock.On("Delete", _a0, _a1)} } @@ -98,6 +103,11 @@ func (_c *ProviderService_Delete_Call) Return(_a0 error) *ProviderService_Delete return _c } +func (_c *ProviderService_Delete_Call) RunAndReturn(run func(context.Context, string) error) *ProviderService_Delete_Call { + _c.Call.Return(run) + return _c +} + // FetchResources provides a mock function with given fields: _a0 func (_m *ProviderService) FetchResources(_a0 context.Context) error { ret := _m.Called(_a0) @@ -118,7 +128,7 @@ type ProviderService_FetchResources_Call struct { } // FetchResources is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *ProviderService_Expecter) FetchResources(_a0 interface{}) *ProviderService_FetchResources_Call { return &ProviderService_FetchResources_Call{Call: _e.mock.On("FetchResources", _a0)} } @@ -135,11 +145,20 @@ func (_c *ProviderService_FetchResources_Call) Return(_a0 error) *ProviderServic return _c } +func (_c *ProviderService_FetchResources_Call) RunAndReturn(run func(context.Context) error) *ProviderService_FetchResources_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0 func (_m *ProviderService) Find(_a0 context.Context) ([]*domain.Provider, error) { ret := _m.Called(_a0) var r0 []*domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*domain.Provider, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*domain.Provider); ok { r0 = rf(_a0) } else { @@ -148,7 +167,6 @@ func (_m *ProviderService) Find(_a0 context.Context) ([]*domain.Provider, error) } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -164,7 +182,7 @@ type ProviderService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *ProviderService_Expecter) Find(_a0 interface{}) *ProviderService_Find_Call { return &ProviderService_Find_Call{Call: _e.mock.On("Find", _a0)} } @@ -181,11 +199,20 @@ func (_c *ProviderService_Find_Call) Return(_a0 []*domain.Provider, _a1 error) * return _c } +func (_c *ProviderService_Find_Call) RunAndReturn(run func(context.Context) ([]*domain.Provider, error)) *ProviderService_Find_Call { + _c.Call.Return(run) + return _c +} + // GetByID provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) GetByID(_a0 context.Context, _a1 string) (*domain.Provider, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Provider, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Provider); ok { r0 = rf(_a0, _a1) } else { @@ -194,7 +221,6 @@ func (_m *ProviderService) GetByID(_a0 context.Context, _a1 string) (*domain.Pro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -210,8 +236,8 @@ type ProviderService_GetByID_Call struct { } // GetByID is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *ProviderService_Expecter) GetByID(_a0 interface{}, _a1 interface{}) *ProviderService_GetByID_Call { return &ProviderService_GetByID_Call{Call: _e.mock.On("GetByID", _a0, _a1)} } @@ -228,11 +254,20 @@ func (_c *ProviderService_GetByID_Call) Return(_a0 *domain.Provider, _a1 error) return _c } +func (_c *ProviderService_GetByID_Call) RunAndReturn(run func(context.Context, string) (*domain.Provider, error)) *ProviderService_GetByID_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: ctx, pType, urn func (_m *ProviderService) GetOne(ctx context.Context, pType string, urn string) (*domain.Provider, error) { ret := _m.Called(ctx, pType, urn) var r0 *domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*domain.Provider, error)); ok { + return rf(ctx, pType, urn) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) *domain.Provider); ok { r0 = rf(ctx, pType, urn) } else { @@ -241,7 +276,6 @@ func (_m *ProviderService) GetOne(ctx context.Context, pType string, urn string) } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, pType, urn) } else { @@ -257,9 +291,9 @@ type ProviderService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - ctx context.Context -// - pType string -// - urn string +// - ctx context.Context +// - pType string +// - urn string func (_e *ProviderService_Expecter) GetOne(ctx interface{}, pType interface{}, urn interface{}) *ProviderService_GetOne_Call { return &ProviderService_GetOne_Call{Call: _e.mock.On("GetOne", ctx, pType, urn)} } @@ -276,11 +310,20 @@ func (_c *ProviderService_GetOne_Call) Return(_a0 *domain.Provider, _a1 error) * return _c } +func (_c *ProviderService_GetOne_Call) RunAndReturn(run func(context.Context, string, string) (*domain.Provider, error)) *ProviderService_GetOne_Call { + _c.Call.Return(run) + return _c +} + // GetRoles provides a mock function with given fields: ctx, id, resourceType func (_m *ProviderService) GetRoles(ctx context.Context, id string, resourceType string) ([]*domain.Role, error) { ret := _m.Called(ctx, id, resourceType) var r0 []*domain.Role + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) ([]*domain.Role, error)); ok { + return rf(ctx, id, resourceType) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) []*domain.Role); ok { r0 = rf(ctx, id, resourceType) } else { @@ -289,7 +332,6 @@ func (_m *ProviderService) GetRoles(ctx context.Context, id string, resourceType } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, id, resourceType) } else { @@ -305,9 +347,9 @@ type ProviderService_GetRoles_Call struct { } // GetRoles is a helper method to define mock.On call -// - ctx context.Context -// - id string -// - resourceType string +// - ctx context.Context +// - id string +// - resourceType string func (_e *ProviderService_Expecter) GetRoles(ctx interface{}, id interface{}, resourceType interface{}) *ProviderService_GetRoles_Call { return &ProviderService_GetRoles_Call{Call: _e.mock.On("GetRoles", ctx, id, resourceType)} } @@ -324,11 +366,20 @@ func (_c *ProviderService_GetRoles_Call) Return(_a0 []*domain.Role, _a1 error) * return _c } +func (_c *ProviderService_GetRoles_Call) RunAndReturn(run func(context.Context, string, string) ([]*domain.Role, error)) *ProviderService_GetRoles_Call { + _c.Call.Return(run) + return _c +} + // GetTypes provides a mock function with given fields: _a0 func (_m *ProviderService) GetTypes(_a0 context.Context) ([]domain.ProviderType, error) { ret := _m.Called(_a0) var r0 []domain.ProviderType + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]domain.ProviderType, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []domain.ProviderType); ok { r0 = rf(_a0) } else { @@ -337,7 +388,6 @@ func (_m *ProviderService) GetTypes(_a0 context.Context) ([]domain.ProviderType, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -353,7 +403,7 @@ type ProviderService_GetTypes_Call struct { } // GetTypes is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *ProviderService_Expecter) GetTypes(_a0 interface{}) *ProviderService_GetTypes_Call { return &ProviderService_GetTypes_Call{Call: _e.mock.On("GetTypes", _a0)} } @@ -370,6 +420,11 @@ func (_c *ProviderService_GetTypes_Call) Return(_a0 []domain.ProviderType, _a1 e return _c } +func (_c *ProviderService_GetTypes_Call) RunAndReturn(run func(context.Context) ([]domain.ProviderType, error)) *ProviderService_GetTypes_Call { + _c.Call.Return(run) + return _c +} + // GrantAccess provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) GrantAccess(_a0 context.Context, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -390,8 +445,8 @@ type ProviderService_GrantAccess_Call struct { } // GrantAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Grant +// - _a0 context.Context +// - _a1 domain.Grant func (_e *ProviderService_Expecter) GrantAccess(_a0 interface{}, _a1 interface{}) *ProviderService_GrantAccess_Call { return &ProviderService_GrantAccess_Call{Call: _e.mock.On("GrantAccess", _a0, _a1)} } @@ -408,6 +463,11 @@ func (_c *ProviderService_GrantAccess_Call) Return(_a0 error) *ProviderService_G return _c } +func (_c *ProviderService_GrantAccess_Call) RunAndReturn(run func(context.Context, domain.Grant) error) *ProviderService_GrantAccess_Call { + _c.Call.Return(run) + return _c +} + // RevokeAccess provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) RevokeAccess(_a0 context.Context, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -428,8 +488,8 @@ type ProviderService_RevokeAccess_Call struct { } // RevokeAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Grant +// - _a0 context.Context +// - _a1 domain.Grant func (_e *ProviderService_Expecter) RevokeAccess(_a0 interface{}, _a1 interface{}) *ProviderService_RevokeAccess_Call { return &ProviderService_RevokeAccess_Call{Call: _e.mock.On("RevokeAccess", _a0, _a1)} } @@ -446,6 +506,11 @@ func (_c *ProviderService_RevokeAccess_Call) Return(_a0 error) *ProviderService_ return _c } +func (_c *ProviderService_RevokeAccess_Call) RunAndReturn(run func(context.Context, domain.Grant) error) *ProviderService_RevokeAccess_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) Update(_a0 context.Context, _a1 *domain.Provider) error { ret := _m.Called(_a0, _a1) @@ -466,8 +531,8 @@ type ProviderService_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Provider +// - _a0 context.Context +// - _a1 *domain.Provider func (_e *ProviderService_Expecter) Update(_a0 interface{}, _a1 interface{}) *ProviderService_Update_Call { return &ProviderService_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -484,6 +549,11 @@ func (_c *ProviderService_Update_Call) Return(_a0 error) *ProviderService_Update return _c } +func (_c *ProviderService_Update_Call) RunAndReturn(run func(context.Context, *domain.Provider) error) *ProviderService_Update_Call { + _c.Call.Return(run) + return _c +} + // ValidateAppeal provides a mock function with given fields: _a0, _a1, _a2, _a3 func (_m *ProviderService) ValidateAppeal(_a0 context.Context, _a1 *domain.Appeal, _a2 *domain.Provider, _a3 *domain.Policy) error { ret := _m.Called(_a0, _a1, _a2, _a3) @@ -504,10 +574,10 @@ type ProviderService_ValidateAppeal_Call struct { } // ValidateAppeal is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Appeal -// - _a2 *domain.Provider -// - _a3 *domain.Policy +// - _a0 context.Context +// - _a1 *domain.Appeal +// - _a2 *domain.Provider +// - _a3 *domain.Policy func (_e *ProviderService_Expecter) ValidateAppeal(_a0 interface{}, _a1 interface{}, _a2 interface{}, _a3 interface{}) *ProviderService_ValidateAppeal_Call { return &ProviderService_ValidateAppeal_Call{Call: _e.mock.On("ValidateAppeal", _a0, _a1, _a2, _a3)} } @@ -523,3 +593,22 @@ func (_c *ProviderService_ValidateAppeal_Call) Return(_a0 error) *ProviderServic _c.Call.Return(_a0) return _c } + +func (_c *ProviderService_ValidateAppeal_Call) RunAndReturn(run func(context.Context, *domain.Appeal, *domain.Provider, *domain.Policy) error) *ProviderService_ValidateAppeal_Call { + _c.Call.Return(run) + return _c +} + +// NewProviderService creates a new instance of ProviderService. 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 NewProviderService(t interface { + mock.TestingT + Cleanup(func()) +}) *ProviderService { + mock := &ProviderService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/api/handler/v1beta1/mocks/resourceService.go b/api/handler/v1beta1/mocks/resourceService.go index 99038829f..785f8a4c5 100644 --- a/api/handler/v1beta1/mocks/resourceService.go +++ b/api/handler/v1beta1/mocks/resourceService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type ResourceService_BatchDelete_Call struct { } // BatchDelete is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []string +// - _a0 context.Context +// - _a1 []string func (_e *ResourceService_Expecter) BatchDelete(_a0 interface{}, _a1 interface{}) *ResourceService_BatchDelete_Call { return &ResourceService_BatchDelete_Call{Call: _e.mock.On("BatchDelete", _a0, _a1)} } @@ -60,6 +60,11 @@ func (_c *ResourceService_BatchDelete_Call) Return(_a0 error) *ResourceService_B return _c } +func (_c *ResourceService_BatchDelete_Call) RunAndReturn(run func(context.Context, []string) error) *ResourceService_BatchDelete_Call { + _c.Call.Return(run) + return _c +} + // BulkUpsert provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) BulkUpsert(_a0 context.Context, _a1 []*domain.Resource) error { ret := _m.Called(_a0, _a1) @@ -80,8 +85,8 @@ type ResourceService_BulkUpsert_Call struct { } // BulkUpsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Resource +// - _a0 context.Context +// - _a1 []*domain.Resource func (_e *ResourceService_Expecter) BulkUpsert(_a0 interface{}, _a1 interface{}) *ResourceService_BulkUpsert_Call { return &ResourceService_BulkUpsert_Call{Call: _e.mock.On("BulkUpsert", _a0, _a1)} } @@ -98,6 +103,11 @@ func (_c *ResourceService_BulkUpsert_Call) Return(_a0 error) *ResourceService_Bu return _c } +func (_c *ResourceService_BulkUpsert_Call) RunAndReturn(run func(context.Context, []*domain.Resource) error) *ResourceService_BulkUpsert_Call { + _c.Call.Return(run) + return _c +} + // Delete provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) Delete(_a0 context.Context, _a1 string) error { ret := _m.Called(_a0, _a1) @@ -118,8 +128,8 @@ type ResourceService_Delete_Call struct { } // Delete is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *ResourceService_Expecter) Delete(_a0 interface{}, _a1 interface{}) *ResourceService_Delete_Call { return &ResourceService_Delete_Call{Call: _e.mock.On("Delete", _a0, _a1)} } @@ -136,11 +146,20 @@ func (_c *ResourceService_Delete_Call) Return(_a0 error) *ResourceService_Delete return _c } +func (_c *ResourceService_Delete_Call) RunAndReturn(run func(context.Context, string) error) *ResourceService_Delete_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFilter) ([]*domain.Resource, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) []*domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -149,7 +168,6 @@ func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFil } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListResourcesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -165,8 +183,8 @@ type ResourceService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListResourcesFilter +// - _a0 context.Context +// - _a1 domain.ListResourcesFilter func (_e *ResourceService_Expecter) Find(_a0 interface{}, _a1 interface{}) *ResourceService_Find_Call { return &ResourceService_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -183,11 +201,20 @@ func (_c *ResourceService_Find_Call) Return(_a0 []*domain.Resource, _a1 error) * return _c } +func (_c *ResourceService_Find_Call) RunAndReturn(run func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)) *ResourceService_Find_Call { + _c.Call.Return(run) + return _c +} + // Get provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) Get(_a0 context.Context, _a1 *domain.ResourceIdentifier) (*domain.Resource, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ResourceIdentifier) *domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -196,7 +223,6 @@ func (_m *ResourceService) Get(_a0 context.Context, _a1 *domain.ResourceIdentifi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ResourceIdentifier) error); ok { r1 = rf(_a0, _a1) } else { @@ -212,8 +238,8 @@ type ResourceService_Get_Call struct { } // Get is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ResourceIdentifier +// - _a0 context.Context +// - _a1 *domain.ResourceIdentifier func (_e *ResourceService_Expecter) Get(_a0 interface{}, _a1 interface{}) *ResourceService_Get_Call { return &ResourceService_Get_Call{Call: _e.mock.On("Get", _a0, _a1)} } @@ -230,11 +256,20 @@ func (_c *ResourceService_Get_Call) Return(_a0 *domain.Resource, _a1 error) *Res return _c } +func (_c *ResourceService_Get_Call) RunAndReturn(run func(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)) *ResourceService_Get_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) GetOne(_a0 context.Context, _a1 string) (*domain.Resource, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -243,7 +278,6 @@ func (_m *ResourceService) GetOne(_a0 context.Context, _a1 string) (*domain.Reso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -259,8 +293,8 @@ type ResourceService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *ResourceService_Expecter) GetOne(_a0 interface{}, _a1 interface{}) *ResourceService_GetOne_Call { return &ResourceService_GetOne_Call{Call: _e.mock.On("GetOne", _a0, _a1)} } @@ -277,6 +311,11 @@ func (_c *ResourceService_GetOne_Call) Return(_a0 *domain.Resource, _a1 error) * return _c } +func (_c *ResourceService_GetOne_Call) RunAndReturn(run func(context.Context, string) (*domain.Resource, error)) *ResourceService_GetOne_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) Update(_a0 context.Context, _a1 *domain.Resource) error { ret := _m.Called(_a0, _a1) @@ -297,8 +336,8 @@ type ResourceService_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Resource +// - _a0 context.Context +// - _a1 *domain.Resource func (_e *ResourceService_Expecter) Update(_a0 interface{}, _a1 interface{}) *ResourceService_Update_Call { return &ResourceService_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -314,3 +353,22 @@ func (_c *ResourceService_Update_Call) Return(_a0 error) *ResourceService_Update _c.Call.Return(_a0) return _c } + +func (_c *ResourceService_Update_Call) RunAndReturn(run func(context.Context, *domain.Resource) error) *ResourceService_Update_Call { + _c.Call.Return(run) + return _c +} + +// NewResourceService creates a new instance of ResourceService. 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 NewResourceService(t interface { + mock.TestingT + Cleanup(func()) +}) *ResourceService { + mock := &ResourceService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/activity/mocks/auditLogger.go b/core/activity/mocks/auditLogger.go index 421d831ee..876822022 100644 --- a/core/activity/mocks/auditLogger.go +++ b/core/activity/mocks/auditLogger.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type AuditLogger_Log_Call struct { } // Log is a helper method to define mock.On call -// - ctx context.Context -// - action string -// - data interface{} +// - ctx context.Context +// - action string +// - data interface{} func (_e *AuditLogger_Expecter) Log(ctx interface{}, action interface{}, data interface{}) *AuditLogger_Log_Call { return &AuditLogger_Log_Call{Call: _e.mock.On("Log", ctx, action, data)} } @@ -59,3 +59,22 @@ func (_c *AuditLogger_Log_Call) Return(_a0 error) *AuditLogger_Log_Call { _c.Call.Return(_a0) return _c } + +func (_c *AuditLogger_Log_Call) RunAndReturn(run func(context.Context, string, interface{}) error) *AuditLogger_Log_Call { + _c.Call.Return(run) + return _c +} + +// NewAuditLogger creates a new instance of AuditLogger. 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 NewAuditLogger(t interface { + mock.TestingT + Cleanup(func()) +}) *AuditLogger { + mock := &AuditLogger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/activity/mocks/providerService.go b/core/activity/mocks/providerService.go index 289609988..36b1dd0be 100644 --- a/core/activity/mocks/providerService.go +++ b/core/activity/mocks/providerService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ProviderService) ImportActivities(_a0 context.Context, _a1 domain.Impo ret := _m.Called(_a0, _a1) var r0 []*domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ImportActivitiesFilter) ([]*domain.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ImportActivitiesFilter) []*domain.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -35,7 +39,6 @@ func (_m *ProviderService) ImportActivities(_a0 context.Context, _a1 domain.Impo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ImportActivitiesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -51,8 +54,8 @@ type ProviderService_ImportActivities_Call struct { } // ImportActivities is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ImportActivitiesFilter +// - _a0 context.Context +// - _a1 domain.ImportActivitiesFilter func (_e *ProviderService_Expecter) ImportActivities(_a0 interface{}, _a1 interface{}) *ProviderService_ImportActivities_Call { return &ProviderService_ImportActivities_Call{Call: _e.mock.On("ImportActivities", _a0, _a1)} } @@ -68,3 +71,22 @@ func (_c *ProviderService_ImportActivities_Call) Return(_a0 []*domain.Activity, _c.Call.Return(_a0, _a1) return _c } + +func (_c *ProviderService_ImportActivities_Call) RunAndReturn(run func(context.Context, domain.ImportActivitiesFilter) ([]*domain.Activity, error)) *ProviderService_ImportActivities_Call { + _c.Call.Return(run) + return _c +} + +// NewProviderService creates a new instance of ProviderService. 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 NewProviderService(t interface { + mock.TestingT + Cleanup(func()) +}) *ProviderService { + mock := &ProviderService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/activity/mocks/repository.go b/core/activity/mocks/repository.go index ccfdcc75b..7db04ada8 100644 --- a/core/activity/mocks/repository.go +++ b/core/activity/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type Repository_BulkUpsert_Call struct { } // BulkUpsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Activity +// - _a0 context.Context +// - _a1 []*domain.Activity func (_e *Repository_Expecter) BulkUpsert(_a0 interface{}, _a1 interface{}) *Repository_BulkUpsert_Call { return &Repository_BulkUpsert_Call{Call: _e.mock.On("BulkUpsert", _a0, _a1)} } @@ -60,11 +60,20 @@ func (_c *Repository_BulkUpsert_Call) Return(_a0 error) *Repository_BulkUpsert_C return _c } +func (_c *Repository_BulkUpsert_Call) RunAndReturn(run func(context.Context, []*domain.Activity) error) *Repository_BulkUpsert_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0, _a1 func (_m *Repository) Find(_a0 context.Context, _a1 domain.ListProviderActivitiesFilter) ([]*domain.Activity, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListProviderActivitiesFilter) ([]*domain.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListProviderActivitiesFilter) []*domain.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +82,6 @@ func (_m *Repository) Find(_a0 context.Context, _a1 domain.ListProviderActivitie } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListProviderActivitiesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -89,8 +97,8 @@ type Repository_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListProviderActivitiesFilter +// - _a0 context.Context +// - _a1 domain.ListProviderActivitiesFilter func (_e *Repository_Expecter) Find(_a0 interface{}, _a1 interface{}) *Repository_Find_Call { return &Repository_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -107,11 +115,20 @@ func (_c *Repository_Find_Call) Return(_a0 []*domain.Activity, _a1 error) *Repos return _c } +func (_c *Repository_Find_Call) RunAndReturn(run func(context.Context, domain.ListProviderActivitiesFilter) ([]*domain.Activity, error)) *Repository_Find_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: _a0, _a1 func (_m *Repository) GetOne(_a0 context.Context, _a1 string) (*domain.Activity, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -120,7 +137,6 @@ func (_m *Repository) GetOne(_a0 context.Context, _a1 string) (*domain.Activity, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -136,8 +152,8 @@ type Repository_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *Repository_Expecter) GetOne(_a0 interface{}, _a1 interface{}) *Repository_GetOne_Call { return &Repository_GetOne_Call{Call: _e.mock.On("GetOne", _a0, _a1)} } @@ -153,3 +169,22 @@ func (_c *Repository_GetOne_Call) Return(_a0 *domain.Activity, _a1 error) *Repos _c.Call.Return(_a0, _a1) return _c } + +func (_c *Repository_GetOne_Call) RunAndReturn(run func(context.Context, string) (*domain.Activity, error)) *Repository_GetOne_Call { + _c.Call.Return(run) + return _c +} + +// NewRepository creates a new instance of Repository. 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 NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { + mock := &Repository{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/approvalService.go b/core/appeal/mocks/approvalService.go index af1f50cbb..b866dae07 100644 --- a/core/appeal/mocks/approvalService.go +++ b/core/appeal/mocks/approvalService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type ApprovalService_AddApprover_Call struct { } // AddApprover is a helper method to define mock.On call -// - ctx context.Context -// - approvalID string -// - email string +// - ctx context.Context +// - approvalID string +// - email string func (_e *ApprovalService_Expecter) AddApprover(ctx interface{}, approvalID interface{}, email interface{}) *ApprovalService_AddApprover_Call { return &ApprovalService_AddApprover_Call{Call: _e.mock.On("AddApprover", ctx, approvalID, email)} } @@ -60,6 +60,11 @@ func (_c *ApprovalService_AddApprover_Call) Return(_a0 error) *ApprovalService_A return _c } +func (_c *ApprovalService_AddApprover_Call) RunAndReturn(run func(context.Context, string, string) error) *ApprovalService_AddApprover_Call { + _c.Call.Return(run) + return _c +} + // DeleteApprover provides a mock function with given fields: ctx, approvalID, email func (_m *ApprovalService) DeleteApprover(ctx context.Context, approvalID string, email string) error { ret := _m.Called(ctx, approvalID, email) @@ -80,9 +85,9 @@ type ApprovalService_DeleteApprover_Call struct { } // DeleteApprover is a helper method to define mock.On call -// - ctx context.Context -// - approvalID string -// - email string +// - ctx context.Context +// - approvalID string +// - email string func (_e *ApprovalService_Expecter) DeleteApprover(ctx interface{}, approvalID interface{}, email interface{}) *ApprovalService_DeleteApprover_Call { return &ApprovalService_DeleteApprover_Call{Call: _e.mock.On("DeleteApprover", ctx, approvalID, email)} } @@ -99,13 +104,17 @@ func (_c *ApprovalService_DeleteApprover_Call) Return(_a0 error) *ApprovalServic return _c } -type mockConstructorTestingTNewApprovalService interface { - mock.TestingT - Cleanup(func()) +func (_c *ApprovalService_DeleteApprover_Call) RunAndReturn(run func(context.Context, string, string) error) *ApprovalService_DeleteApprover_Call { + _c.Call.Return(run) + return _c } // NewApprovalService creates a new instance of ApprovalService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewApprovalService(t mockConstructorTestingTNewApprovalService) *ApprovalService { +// The first argument is typically a *testing.T value. +func NewApprovalService(t interface { + mock.TestingT + Cleanup(func()) +}) *ApprovalService { mock := &ApprovalService{} mock.Mock.Test(t) diff --git a/core/appeal/mocks/auditLogger.go b/core/appeal/mocks/auditLogger.go index 421d831ee..876822022 100644 --- a/core/appeal/mocks/auditLogger.go +++ b/core/appeal/mocks/auditLogger.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type AuditLogger_Log_Call struct { } // Log is a helper method to define mock.On call -// - ctx context.Context -// - action string -// - data interface{} +// - ctx context.Context +// - action string +// - data interface{} func (_e *AuditLogger_Expecter) Log(ctx interface{}, action interface{}, data interface{}) *AuditLogger_Log_Call { return &AuditLogger_Log_Call{Call: _e.mock.On("Log", ctx, action, data)} } @@ -59,3 +59,22 @@ func (_c *AuditLogger_Log_Call) Return(_a0 error) *AuditLogger_Log_Call { _c.Call.Return(_a0) return _c } + +func (_c *AuditLogger_Log_Call) RunAndReturn(run func(context.Context, string, interface{}) error) *AuditLogger_Log_Call { + _c.Call.Return(run) + return _c +} + +// NewAuditLogger creates a new instance of AuditLogger. 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 NewAuditLogger(t interface { + mock.TestingT + Cleanup(func()) +}) *AuditLogger { + mock := &AuditLogger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/grantService.go b/core/appeal/mocks/grantService.go index 3aed1f8c1..a0a416d5e 100644 --- a/core/appeal/mocks/grantService.go +++ b/core/appeal/mocks/grantService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *GrantService) List(_a0 context.Context, _a1 domain.ListGrantsFilter) ( ret := _m.Called(_a0, _a1) var r0 []domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListGrantsFilter) ([]domain.Grant, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListGrantsFilter) []domain.Grant); ok { r0 = rf(_a0, _a1) } else { @@ -37,7 +41,6 @@ func (_m *GrantService) List(_a0 context.Context, _a1 domain.ListGrantsFilter) ( } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListGrantsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -53,8 +56,8 @@ type GrantService_List_Call struct { } // List is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListGrantsFilter +// - _a0 context.Context +// - _a1 domain.ListGrantsFilter func (_e *GrantService_Expecter) List(_a0 interface{}, _a1 interface{}) *GrantService_List_Call { return &GrantService_List_Call{Call: _e.mock.On("List", _a0, _a1)} } @@ -71,11 +74,20 @@ func (_c *GrantService_List_Call) Return(_a0 []domain.Grant, _a1 error) *GrantSe return _c } +func (_c *GrantService_List_Call) RunAndReturn(run func(context.Context, domain.ListGrantsFilter) ([]domain.Grant, error)) *GrantService_List_Call { + _c.Call.Return(run) + return _c +} + // Prepare provides a mock function with given fields: _a0, _a1 func (_m *GrantService) Prepare(_a0 context.Context, _a1 domain.Appeal) (*domain.Grant, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.Appeal) (*domain.Grant, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.Appeal) *domain.Grant); ok { r0 = rf(_a0, _a1) } else { @@ -84,7 +96,6 @@ func (_m *GrantService) Prepare(_a0 context.Context, _a1 domain.Appeal) (*domain } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.Appeal) error); ok { r1 = rf(_a0, _a1) } else { @@ -100,8 +111,8 @@ type GrantService_Prepare_Call struct { } // Prepare is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Appeal +// - _a0 context.Context +// - _a1 domain.Appeal func (_e *GrantService_Expecter) Prepare(_a0 interface{}, _a1 interface{}) *GrantService_Prepare_Call { return &GrantService_Prepare_Call{Call: _e.mock.On("Prepare", _a0, _a1)} } @@ -118,6 +129,11 @@ func (_c *GrantService_Prepare_Call) Return(_a0 *domain.Grant, _a1 error) *Grant return _c } +func (_c *GrantService_Prepare_Call) RunAndReturn(run func(context.Context, domain.Appeal) (*domain.Grant, error)) *GrantService_Prepare_Call { + _c.Call.Return(run) + return _c +} + // Revoke provides a mock function with given fields: ctx, id, actor, reason, opts func (_m *GrantService) Revoke(ctx context.Context, id string, actor string, reason string, opts ...grant.Option) (*domain.Grant, error) { _va := make([]interface{}, len(opts)) @@ -130,6 +146,10 @@ func (_m *GrantService) Revoke(ctx context.Context, id string, actor string, rea ret := _m.Called(_ca...) var r0 *domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string, ...grant.Option) (*domain.Grant, error)); ok { + return rf(ctx, id, actor, reason, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string, ...grant.Option) *domain.Grant); ok { r0 = rf(ctx, id, actor, reason, opts...) } else { @@ -138,7 +158,6 @@ func (_m *GrantService) Revoke(ctx context.Context, id string, actor string, rea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string, ...grant.Option) error); ok { r1 = rf(ctx, id, actor, reason, opts...) } else { @@ -154,11 +173,11 @@ type GrantService_Revoke_Call struct { } // Revoke is a helper method to define mock.On call -// - ctx context.Context -// - id string -// - actor string -// - reason string -// - opts ...grant.Option +// - ctx context.Context +// - id string +// - actor string +// - reason string +// - opts ...grant.Option func (_e *GrantService_Expecter) Revoke(ctx interface{}, id interface{}, actor interface{}, reason interface{}, opts ...interface{}) *GrantService_Revoke_Call { return &GrantService_Revoke_Call{Call: _e.mock.On("Revoke", append([]interface{}{ctx, id, actor, reason}, opts...)...)} @@ -181,3 +200,22 @@ func (_c *GrantService_Revoke_Call) Return(_a0 *domain.Grant, _a1 error) *GrantS _c.Call.Return(_a0, _a1) return _c } + +func (_c *GrantService_Revoke_Call) RunAndReturn(run func(context.Context, string, string, string, ...grant.Option) (*domain.Grant, error)) *GrantService_Revoke_Call { + _c.Call.Return(run) + return _c +} + +// NewGrantService creates a new instance of GrantService. 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 NewGrantService(t interface { + mock.TestingT + Cleanup(func()) +}) *GrantService { + mock := &GrantService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/iamManager.go b/core/appeal/mocks/iamManager.go index c5e1dbf82..95812330c 100644 --- a/core/appeal/mocks/iamManager.go +++ b/core/appeal/mocks/iamManager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -25,6 +25,10 @@ func (_m *IamManager) GetClient(_a0 domain.SensitiveConfig) (domain.IAMClient, e ret := _m.Called(_a0) var r0 domain.IAMClient + var r1 error + if rf, ok := ret.Get(0).(func(domain.SensitiveConfig) (domain.IAMClient, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(domain.SensitiveConfig) domain.IAMClient); ok { r0 = rf(_a0) } else { @@ -33,7 +37,6 @@ func (_m *IamManager) GetClient(_a0 domain.SensitiveConfig) (domain.IAMClient, e } } - var r1 error if rf, ok := ret.Get(1).(func(domain.SensitiveConfig) error); ok { r1 = rf(_a0) } else { @@ -49,7 +52,7 @@ type IamManager_GetClient_Call struct { } // GetClient is a helper method to define mock.On call -// - _a0 domain.SensitiveConfig +// - _a0 domain.SensitiveConfig func (_e *IamManager_Expecter) GetClient(_a0 interface{}) *IamManager_GetClient_Call { return &IamManager_GetClient_Call{Call: _e.mock.On("GetClient", _a0)} } @@ -66,11 +69,20 @@ func (_c *IamManager_GetClient_Call) Return(_a0 domain.IAMClient, _a1 error) *Ia return _c } +func (_c *IamManager_GetClient_Call) RunAndReturn(run func(domain.SensitiveConfig) (domain.IAMClient, error)) *IamManager_GetClient_Call { + _c.Call.Return(run) + return _c +} + // ParseConfig provides a mock function with given fields: _a0 func (_m *IamManager) ParseConfig(_a0 *domain.IAMConfig) (domain.SensitiveConfig, error) { ret := _m.Called(_a0) var r0 domain.SensitiveConfig + var r1 error + if rf, ok := ret.Get(0).(func(*domain.IAMConfig) (domain.SensitiveConfig, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(*domain.IAMConfig) domain.SensitiveConfig); ok { r0 = rf(_a0) } else { @@ -79,7 +91,6 @@ func (_m *IamManager) ParseConfig(_a0 *domain.IAMConfig) (domain.SensitiveConfig } } - var r1 error if rf, ok := ret.Get(1).(func(*domain.IAMConfig) error); ok { r1 = rf(_a0) } else { @@ -95,7 +106,7 @@ type IamManager_ParseConfig_Call struct { } // ParseConfig is a helper method to define mock.On call -// - _a0 *domain.IAMConfig +// - _a0 *domain.IAMConfig func (_e *IamManager_Expecter) ParseConfig(_a0 interface{}) *IamManager_ParseConfig_Call { return &IamManager_ParseConfig_Call{Call: _e.mock.On("ParseConfig", _a0)} } @@ -111,3 +122,22 @@ func (_c *IamManager_ParseConfig_Call) Return(_a0 domain.SensitiveConfig, _a1 er _c.Call.Return(_a0, _a1) return _c } + +func (_c *IamManager_ParseConfig_Call) RunAndReturn(run func(*domain.IAMConfig) (domain.SensitiveConfig, error)) *IamManager_ParseConfig_Call { + _c.Call.Return(run) + return _c +} + +// NewIamManager creates a new instance of IamManager. 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 NewIamManager(t interface { + mock.TestingT + Cleanup(func()) +}) *IamManager { + mock := &IamManager{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/notifier.go b/core/appeal/mocks/notifier.go index 0ec80e839..6735281b2 100644 --- a/core/appeal/mocks/notifier.go +++ b/core/appeal/mocks/notifier.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,7 +42,7 @@ type Notifier_Notify_Call struct { } // Notify is a helper method to define mock.On call -// - _a0 []domain.Notification +// - _a0 []domain.Notification func (_e *Notifier_Expecter) Notify(_a0 interface{}) *Notifier_Notify_Call { return &Notifier_Notify_Call{Call: _e.mock.On("Notify", _a0)} } @@ -58,3 +58,22 @@ func (_c *Notifier_Notify_Call) Return(_a0 []error) *Notifier_Notify_Call { _c.Call.Return(_a0) return _c } + +func (_c *Notifier_Notify_Call) RunAndReturn(run func([]domain.Notification) []error) *Notifier_Notify_Call { + _c.Call.Return(run) + return _c +} + +// NewNotifier creates a new instance of Notifier. 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 NewNotifier(t interface { + mock.TestingT + Cleanup(func()) +}) *Notifier { + mock := &Notifier{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/policyService.go b/core/appeal/mocks/policyService.go index 1a627df5e..2b01f6fb2 100644 --- a/core/appeal/mocks/policyService.go +++ b/core/appeal/mocks/policyService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *PolicyService) Find(_a0 context.Context) ([]*domain.Policy, error) { ret := _m.Called(_a0) var r0 []*domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*domain.Policy, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*domain.Policy); ok { r0 = rf(_a0) } else { @@ -35,7 +39,6 @@ func (_m *PolicyService) Find(_a0 context.Context) ([]*domain.Policy, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -51,7 +54,7 @@ type PolicyService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *PolicyService_Expecter) Find(_a0 interface{}) *PolicyService_Find_Call { return &PolicyService_Find_Call{Call: _e.mock.On("Find", _a0)} } @@ -68,11 +71,20 @@ func (_c *PolicyService_Find_Call) Return(_a0 []*domain.Policy, _a1 error) *Poli return _c } +func (_c *PolicyService_Find_Call) RunAndReturn(run func(context.Context) ([]*domain.Policy, error)) *PolicyService_Find_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: _a0, _a1, _a2 func (_m *PolicyService) GetOne(_a0 context.Context, _a1 string, _a2 uint) (*domain.Policy, error) { ret := _m.Called(_a0, _a1, _a2) var r0 *domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, uint) (*domain.Policy, error)); ok { + return rf(_a0, _a1, _a2) + } if rf, ok := ret.Get(0).(func(context.Context, string, uint) *domain.Policy); ok { r0 = rf(_a0, _a1, _a2) } else { @@ -81,7 +93,6 @@ func (_m *PolicyService) GetOne(_a0 context.Context, _a1 string, _a2 uint) (*dom } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, uint) error); ok { r1 = rf(_a0, _a1, _a2) } else { @@ -97,9 +108,9 @@ type PolicyService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string -// - _a2 uint +// - _a0 context.Context +// - _a1 string +// - _a2 uint func (_e *PolicyService_Expecter) GetOne(_a0 interface{}, _a1 interface{}, _a2 interface{}) *PolicyService_GetOne_Call { return &PolicyService_GetOne_Call{Call: _e.mock.On("GetOne", _a0, _a1, _a2)} } @@ -115,3 +126,22 @@ func (_c *PolicyService_GetOne_Call) Return(_a0 *domain.Policy, _a1 error) *Poli _c.Call.Return(_a0, _a1) return _c } + +func (_c *PolicyService_GetOne_Call) RunAndReturn(run func(context.Context, string, uint) (*domain.Policy, error)) *PolicyService_GetOne_Call { + _c.Call.Return(run) + return _c +} + +// NewPolicyService creates a new instance of PolicyService. 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 NewPolicyService(t interface { + mock.TestingT + Cleanup(func()) +}) *PolicyService { + mock := &PolicyService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/providerService.go b/core/appeal/mocks/providerService.go index 3e7c63910..5138a907c 100644 --- a/core/appeal/mocks/providerService.go +++ b/core/appeal/mocks/providerService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ProviderService) Find(_a0 context.Context) ([]*domain.Provider, error) ret := _m.Called(_a0) var r0 []*domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*domain.Provider, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*domain.Provider); ok { r0 = rf(_a0) } else { @@ -35,7 +39,6 @@ func (_m *ProviderService) Find(_a0 context.Context) ([]*domain.Provider, error) } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -51,7 +54,7 @@ type ProviderService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *ProviderService_Expecter) Find(_a0 interface{}) *ProviderService_Find_Call { return &ProviderService_Find_Call{Call: _e.mock.On("Find", _a0)} } @@ -68,11 +71,20 @@ func (_c *ProviderService_Find_Call) Return(_a0 []*domain.Provider, _a1 error) * return _c } +func (_c *ProviderService_Find_Call) RunAndReturn(run func(context.Context) ([]*domain.Provider, error)) *ProviderService_Find_Call { + _c.Call.Return(run) + return _c +} + // GetPermissions provides a mock function with given fields: _a0, _a1, _a2, _a3 func (_m *ProviderService) GetPermissions(_a0 context.Context, _a1 *domain.ProviderConfig, _a2 string, _a3 string) ([]interface{}, error) { ret := _m.Called(_a0, _a1, _a2, _a3) var r0 []interface{} + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ProviderConfig, string, string) ([]interface{}, error)); ok { + return rf(_a0, _a1, _a2, _a3) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ProviderConfig, string, string) []interface{}); ok { r0 = rf(_a0, _a1, _a2, _a3) } else { @@ -81,7 +93,6 @@ func (_m *ProviderService) GetPermissions(_a0 context.Context, _a1 *domain.Provi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ProviderConfig, string, string) error); ok { r1 = rf(_a0, _a1, _a2, _a3) } else { @@ -97,10 +108,10 @@ type ProviderService_GetPermissions_Call struct { } // GetPermissions is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ProviderConfig -// - _a2 string -// - _a3 string +// - _a0 context.Context +// - _a1 *domain.ProviderConfig +// - _a2 string +// - _a3 string func (_e *ProviderService_Expecter) GetPermissions(_a0 interface{}, _a1 interface{}, _a2 interface{}, _a3 interface{}) *ProviderService_GetPermissions_Call { return &ProviderService_GetPermissions_Call{Call: _e.mock.On("GetPermissions", _a0, _a1, _a2, _a3)} } @@ -117,6 +128,11 @@ func (_c *ProviderService_GetPermissions_Call) Return(_a0 []interface{}, _a1 err return _c } +func (_c *ProviderService_GetPermissions_Call) RunAndReturn(run func(context.Context, *domain.ProviderConfig, string, string) ([]interface{}, error)) *ProviderService_GetPermissions_Call { + _c.Call.Return(run) + return _c +} + // GrantAccess provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) GrantAccess(_a0 context.Context, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -137,8 +153,8 @@ type ProviderService_GrantAccess_Call struct { } // GrantAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Grant +// - _a0 context.Context +// - _a1 domain.Grant func (_e *ProviderService_Expecter) GrantAccess(_a0 interface{}, _a1 interface{}) *ProviderService_GrantAccess_Call { return &ProviderService_GrantAccess_Call{Call: _e.mock.On("GrantAccess", _a0, _a1)} } @@ -155,6 +171,11 @@ func (_c *ProviderService_GrantAccess_Call) Return(_a0 error) *ProviderService_G return _c } +func (_c *ProviderService_GrantAccess_Call) RunAndReturn(run func(context.Context, domain.Grant) error) *ProviderService_GrantAccess_Call { + _c.Call.Return(run) + return _c +} + // RevokeAccess provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) RevokeAccess(_a0 context.Context, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -175,8 +196,8 @@ type ProviderService_RevokeAccess_Call struct { } // RevokeAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Grant +// - _a0 context.Context +// - _a1 domain.Grant func (_e *ProviderService_Expecter) RevokeAccess(_a0 interface{}, _a1 interface{}) *ProviderService_RevokeAccess_Call { return &ProviderService_RevokeAccess_Call{Call: _e.mock.On("RevokeAccess", _a0, _a1)} } @@ -193,6 +214,11 @@ func (_c *ProviderService_RevokeAccess_Call) Return(_a0 error) *ProviderService_ return _c } +func (_c *ProviderService_RevokeAccess_Call) RunAndReturn(run func(context.Context, domain.Grant) error) *ProviderService_RevokeAccess_Call { + _c.Call.Return(run) + return _c +} + // ValidateAppeal provides a mock function with given fields: _a0, _a1, _a2, _a3 func (_m *ProviderService) ValidateAppeal(_a0 context.Context, _a1 *domain.Appeal, _a2 *domain.Provider, _a3 *domain.Policy) error { ret := _m.Called(_a0, _a1, _a2, _a3) @@ -213,10 +239,10 @@ type ProviderService_ValidateAppeal_Call struct { } // ValidateAppeal is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Appeal -// - _a2 *domain.Provider -// - _a3 *domain.Policy +// - _a0 context.Context +// - _a1 *domain.Appeal +// - _a2 *domain.Provider +// - _a3 *domain.Policy func (_e *ProviderService_Expecter) ValidateAppeal(_a0 interface{}, _a1 interface{}, _a2 interface{}, _a3 interface{}) *ProviderService_ValidateAppeal_Call { return &ProviderService_ValidateAppeal_Call{Call: _e.mock.On("ValidateAppeal", _a0, _a1, _a2, _a3)} } @@ -232,3 +258,22 @@ func (_c *ProviderService_ValidateAppeal_Call) Return(_a0 error) *ProviderServic _c.Call.Return(_a0) return _c } + +func (_c *ProviderService_ValidateAppeal_Call) RunAndReturn(run func(context.Context, *domain.Appeal, *domain.Provider, *domain.Policy) error) *ProviderService_ValidateAppeal_Call { + _c.Call.Return(run) + return _c +} + +// NewProviderService creates a new instance of ProviderService. 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 NewProviderService(t interface { + mock.TestingT + Cleanup(func()) +}) *ProviderService { + mock := &ProviderService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/repository.go b/core/appeal/mocks/repository.go index d110dc869..daa7f0fcd 100644 --- a/core/appeal/mocks/repository.go +++ b/core/appeal/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type Repository_BulkUpsert_Call struct { } // BulkUpsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Appeal +// - _a0 context.Context +// - _a1 []*domain.Appeal func (_e *Repository_Expecter) BulkUpsert(_a0 interface{}, _a1 interface{}) *Repository_BulkUpsert_Call { return &Repository_BulkUpsert_Call{Call: _e.mock.On("BulkUpsert", _a0, _a1)} } @@ -60,11 +60,20 @@ func (_c *Repository_BulkUpsert_Call) Return(_a0 error) *Repository_BulkUpsert_C return _c } +func (_c *Repository_BulkUpsert_Call) RunAndReturn(run func(context.Context, []*domain.Appeal) error) *Repository_BulkUpsert_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0, _a1 func (_m *Repository) Find(_a0 context.Context, _a1 *domain.ListAppealsFilter) ([]*domain.Appeal, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ListAppealsFilter) ([]*domain.Appeal, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ListAppealsFilter) []*domain.Appeal); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +82,6 @@ func (_m *Repository) Find(_a0 context.Context, _a1 *domain.ListAppealsFilter) ( } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ListAppealsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -89,8 +97,8 @@ type Repository_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ListAppealsFilter +// - _a0 context.Context +// - _a1 *domain.ListAppealsFilter func (_e *Repository_Expecter) Find(_a0 interface{}, _a1 interface{}) *Repository_Find_Call { return &Repository_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -107,11 +115,20 @@ func (_c *Repository_Find_Call) Return(_a0 []*domain.Appeal, _a1 error) *Reposit return _c } +func (_c *Repository_Find_Call) RunAndReturn(run func(context.Context, *domain.ListAppealsFilter) ([]*domain.Appeal, error)) *Repository_Find_Call { + _c.Call.Return(run) + return _c +} + // GetByID provides a mock function with given fields: ctx, id func (_m *Repository) GetByID(ctx context.Context, id string) (*domain.Appeal, error) { ret := _m.Called(ctx, id) var r0 *domain.Appeal + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Appeal, error)); ok { + return rf(ctx, id) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Appeal); ok { r0 = rf(ctx, id) } else { @@ -120,7 +137,6 @@ func (_m *Repository) GetByID(ctx context.Context, id string) (*domain.Appeal, e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, id) } else { @@ -136,8 +152,8 @@ type Repository_GetByID_Call struct { } // GetByID is a helper method to define mock.On call -// - ctx context.Context -// - id string +// - ctx context.Context +// - id string func (_e *Repository_Expecter) GetByID(ctx interface{}, id interface{}) *Repository_GetByID_Call { return &Repository_GetByID_Call{Call: _e.mock.On("GetByID", ctx, id)} } @@ -154,6 +170,11 @@ func (_c *Repository_GetByID_Call) Return(_a0 *domain.Appeal, _a1 error) *Reposi return _c } +func (_c *Repository_GetByID_Call) RunAndReturn(run func(context.Context, string) (*domain.Appeal, error)) *Repository_GetByID_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *Repository) Update(_a0 context.Context, _a1 *domain.Appeal) error { ret := _m.Called(_a0, _a1) @@ -174,8 +195,8 @@ type Repository_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Appeal +// - _a0 context.Context +// - _a1 *domain.Appeal func (_e *Repository_Expecter) Update(_a0 interface{}, _a1 interface{}) *Repository_Update_Call { return &Repository_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -191,3 +212,22 @@ func (_c *Repository_Update_Call) Return(_a0 error) *Repository_Update_Call { _c.Call.Return(_a0) return _c } + +func (_c *Repository_Update_Call) RunAndReturn(run func(context.Context, *domain.Appeal) error) *Repository_Update_Call { + _c.Call.Return(run) + return _c +} + +// NewRepository creates a new instance of Repository. 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 NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { + mock := &Repository{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/appeal/mocks/resourceService.go b/core/appeal/mocks/resourceService.go index d7f5afff1..601338b3d 100644 --- a/core/appeal/mocks/resourceService.go +++ b/core/appeal/mocks/resourceService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFil ret := _m.Called(_a0, _a1) var r0 []*domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) []*domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -35,7 +39,6 @@ func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFil } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListResourcesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -51,8 +54,8 @@ type ResourceService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListResourcesFilter +// - _a0 context.Context +// - _a1 domain.ListResourcesFilter func (_e *ResourceService_Expecter) Find(_a0 interface{}, _a1 interface{}) *ResourceService_Find_Call { return &ResourceService_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -69,11 +72,20 @@ func (_c *ResourceService_Find_Call) Return(_a0 []*domain.Resource, _a1 error) * return _c } +func (_c *ResourceService_Find_Call) RunAndReturn(run func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)) *ResourceService_Find_Call { + _c.Call.Return(run) + return _c +} + // Get provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) Get(_a0 context.Context, _a1 *domain.ResourceIdentifier) (*domain.Resource, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ResourceIdentifier) *domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -82,7 +94,6 @@ func (_m *ResourceService) Get(_a0 context.Context, _a1 *domain.ResourceIdentifi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ResourceIdentifier) error); ok { r1 = rf(_a0, _a1) } else { @@ -98,8 +109,8 @@ type ResourceService_Get_Call struct { } // Get is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ResourceIdentifier +// - _a0 context.Context +// - _a1 *domain.ResourceIdentifier func (_e *ResourceService_Expecter) Get(_a0 interface{}, _a1 interface{}) *ResourceService_Get_Call { return &ResourceService_Get_Call{Call: _e.mock.On("Get", _a0, _a1)} } @@ -115,3 +126,22 @@ func (_c *ResourceService_Get_Call) Return(_a0 *domain.Resource, _a1 error) *Res _c.Call.Return(_a0, _a1) return _c } + +func (_c *ResourceService_Get_Call) RunAndReturn(run func(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)) *ResourceService_Get_Call { + _c.Call.Return(run) + return _c +} + +// NewResourceService creates a new instance of ResourceService. 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 NewResourceService(t interface { + mock.TestingT + Cleanup(func()) +}) *ResourceService { + mock := &ResourceService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/approval/mocks/policyService.go b/core/approval/mocks/policyService.go index 447557dc1..5ba64cbb3 100644 --- a/core/approval/mocks/policyService.go +++ b/core/approval/mocks/policyService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *PolicyService) GetOne(_a0 context.Context, _a1 string, _a2 uint) (*dom ret := _m.Called(_a0, _a1, _a2) var r0 *domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, uint) (*domain.Policy, error)); ok { + return rf(_a0, _a1, _a2) + } if rf, ok := ret.Get(0).(func(context.Context, string, uint) *domain.Policy); ok { r0 = rf(_a0, _a1, _a2) } else { @@ -35,7 +39,6 @@ func (_m *PolicyService) GetOne(_a0 context.Context, _a1 string, _a2 uint) (*dom } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, uint) error); ok { r1 = rf(_a0, _a1, _a2) } else { @@ -51,9 +54,9 @@ type PolicyService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string -// - _a2 uint +// - _a0 context.Context +// - _a1 string +// - _a2 uint func (_e *PolicyService_Expecter) GetOne(_a0 interface{}, _a1 interface{}, _a2 interface{}) *PolicyService_GetOne_Call { return &PolicyService_GetOne_Call{Call: _e.mock.On("GetOne", _a0, _a1, _a2)} } @@ -70,13 +73,17 @@ func (_c *PolicyService_GetOne_Call) Return(_a0 *domain.Policy, _a1 error) *Poli return _c } -type mockConstructorTestingTNewPolicyService interface { - mock.TestingT - Cleanup(func()) +func (_c *PolicyService_GetOne_Call) RunAndReturn(run func(context.Context, string, uint) (*domain.Policy, error)) *PolicyService_GetOne_Call { + _c.Call.Return(run) + return _c } // NewPolicyService creates a new instance of PolicyService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewPolicyService(t mockConstructorTestingTNewPolicyService) *PolicyService { +// The first argument is typically a *testing.T value. +func NewPolicyService(t interface { + mock.TestingT + Cleanup(func()) +}) *PolicyService { mock := &PolicyService{} mock.Mock.Test(t) diff --git a/core/approval/mocks/repository.go b/core/approval/mocks/repository.go index 78c803267..230cec2b1 100644 --- a/core/approval/mocks/repository.go +++ b/core/approval/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type Repository_AddApprover_Call struct { } // AddApprover is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Approver +// - _a0 context.Context +// - _a1 *domain.Approver func (_e *Repository_Expecter) AddApprover(_a0 interface{}, _a1 interface{}) *Repository_AddApprover_Call { return &Repository_AddApprover_Call{Call: _e.mock.On("AddApprover", _a0, _a1)} } @@ -60,6 +60,11 @@ func (_c *Repository_AddApprover_Call) Return(_a0 error) *Repository_AddApprover return _c } +func (_c *Repository_AddApprover_Call) RunAndReturn(run func(context.Context, *domain.Approver) error) *Repository_AddApprover_Call { + _c.Call.Return(run) + return _c +} + // BulkInsert provides a mock function with given fields: _a0, _a1 func (_m *Repository) BulkInsert(_a0 context.Context, _a1 []*domain.Approval) error { ret := _m.Called(_a0, _a1) @@ -80,8 +85,8 @@ type Repository_BulkInsert_Call struct { } // BulkInsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Approval +// - _a0 context.Context +// - _a1 []*domain.Approval func (_e *Repository_Expecter) BulkInsert(_a0 interface{}, _a1 interface{}) *Repository_BulkInsert_Call { return &Repository_BulkInsert_Call{Call: _e.mock.On("BulkInsert", _a0, _a1)} } @@ -98,6 +103,11 @@ func (_c *Repository_BulkInsert_Call) Return(_a0 error) *Repository_BulkInsert_C return _c } +func (_c *Repository_BulkInsert_Call) RunAndReturn(run func(context.Context, []*domain.Approval) error) *Repository_BulkInsert_Call { + _c.Call.Return(run) + return _c +} + // DeleteApprover provides a mock function with given fields: ctx, approvalID, email func (_m *Repository) DeleteApprover(ctx context.Context, approvalID string, email string) error { ret := _m.Called(ctx, approvalID, email) @@ -118,9 +128,9 @@ type Repository_DeleteApprover_Call struct { } // DeleteApprover is a helper method to define mock.On call -// - ctx context.Context -// - approvalID string -// - email string +// - ctx context.Context +// - approvalID string +// - email string func (_e *Repository_Expecter) DeleteApprover(ctx interface{}, approvalID interface{}, email interface{}) *Repository_DeleteApprover_Call { return &Repository_DeleteApprover_Call{Call: _e.mock.On("DeleteApprover", ctx, approvalID, email)} } @@ -137,11 +147,20 @@ func (_c *Repository_DeleteApprover_Call) Return(_a0 error) *Repository_DeleteAp return _c } +func (_c *Repository_DeleteApprover_Call) RunAndReturn(run func(context.Context, string, string) error) *Repository_DeleteApprover_Call { + _c.Call.Return(run) + return _c +} + // ListApprovals provides a mock function with given fields: _a0, _a1 func (_m *Repository) ListApprovals(_a0 context.Context, _a1 *domain.ListApprovalsFilter) ([]*domain.Approval, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Approval + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ListApprovalsFilter) ([]*domain.Approval, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ListApprovalsFilter) []*domain.Approval); ok { r0 = rf(_a0, _a1) } else { @@ -150,7 +169,6 @@ func (_m *Repository) ListApprovals(_a0 context.Context, _a1 *domain.ListApprova } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ListApprovalsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -166,8 +184,8 @@ type Repository_ListApprovals_Call struct { } // ListApprovals is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ListApprovalsFilter +// - _a0 context.Context +// - _a1 *domain.ListApprovalsFilter func (_e *Repository_Expecter) ListApprovals(_a0 interface{}, _a1 interface{}) *Repository_ListApprovals_Call { return &Repository_ListApprovals_Call{Call: _e.mock.On("ListApprovals", _a0, _a1)} } @@ -184,13 +202,17 @@ func (_c *Repository_ListApprovals_Call) Return(_a0 []*domain.Approval, _a1 erro return _c } -type mockConstructorTestingTNewRepository interface { - mock.TestingT - Cleanup(func()) +func (_c *Repository_ListApprovals_Call) RunAndReturn(run func(context.Context, *domain.ListApprovalsFilter) ([]*domain.Approval, error)) *Repository_ListApprovals_Call { + _c.Call.Return(run) + return _c } // NewRepository creates a new instance of Repository. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewRepository(t mockConstructorTestingTNewRepository) *Repository { +// The first argument is typically a *testing.T value. +func NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { mock := &Repository{} mock.Mock.Test(t) diff --git a/core/grant/mocks/auditLogger.go b/core/grant/mocks/auditLogger.go index 421d831ee..876822022 100644 --- a/core/grant/mocks/auditLogger.go +++ b/core/grant/mocks/auditLogger.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type AuditLogger_Log_Call struct { } // Log is a helper method to define mock.On call -// - ctx context.Context -// - action string -// - data interface{} +// - ctx context.Context +// - action string +// - data interface{} func (_e *AuditLogger_Expecter) Log(ctx interface{}, action interface{}, data interface{}) *AuditLogger_Log_Call { return &AuditLogger_Log_Call{Call: _e.mock.On("Log", ctx, action, data)} } @@ -59,3 +59,22 @@ func (_c *AuditLogger_Log_Call) Return(_a0 error) *AuditLogger_Log_Call { _c.Call.Return(_a0) return _c } + +func (_c *AuditLogger_Log_Call) RunAndReturn(run func(context.Context, string, interface{}) error) *AuditLogger_Log_Call { + _c.Call.Return(run) + return _c +} + +// NewAuditLogger creates a new instance of AuditLogger. 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 NewAuditLogger(t interface { + mock.TestingT + Cleanup(func()) +}) *AuditLogger { + mock := &AuditLogger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/grant/mocks/notifier.go b/core/grant/mocks/notifier.go index 187534f70..0e5e15a0d 100644 --- a/core/grant/mocks/notifier.go +++ b/core/grant/mocks/notifier.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -43,7 +43,7 @@ type Notifier_Notify_Call struct { } // Notify is a helper method to define mock.On call -// - _a0 []domain.Notification +// - _a0 []domain.Notification func (_e *Notifier_Expecter) Notify(_a0 interface{}) *Notifier_Notify_Call { return &Notifier_Notify_Call{Call: _e.mock.On("Notify", _a0)} } @@ -59,3 +59,22 @@ func (_c *Notifier_Notify_Call) Return(_a0 []error) *Notifier_Notify_Call { _c.Call.Return(_a0) return _c } + +func (_c *Notifier_Notify_Call) RunAndReturn(run func([]domain.Notification) []error) *Notifier_Notify_Call { + _c.Call.Return(run) + return _c +} + +// NewNotifier creates a new instance of Notifier. 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 NewNotifier(t interface { + mock.TestingT + Cleanup(func()) +}) *Notifier { + mock := &Notifier{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/grant/mocks/providerService.go b/core/grant/mocks/providerService.go index 1a86cef4a..236e58574 100644 --- a/core/grant/mocks/providerService.go +++ b/core/grant/mocks/providerService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -28,6 +28,10 @@ func (_m *ProviderService) GetByID(_a0 context.Context, _a1 string) (*domain.Pro ret := _m.Called(_a0, _a1) var r0 *domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Provider, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Provider); ok { r0 = rf(_a0, _a1) } else { @@ -36,7 +40,6 @@ func (_m *ProviderService) GetByID(_a0 context.Context, _a1 string) (*domain.Pro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -52,8 +55,8 @@ type ProviderService_GetByID_Call struct { } // GetByID is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *ProviderService_Expecter) GetByID(_a0 interface{}, _a1 interface{}) *ProviderService_GetByID_Call { return &ProviderService_GetByID_Call{Call: _e.mock.On("GetByID", _a0, _a1)} } @@ -70,11 +73,20 @@ func (_c *ProviderService_GetByID_Call) Return(_a0 *domain.Provider, _a1 error) return _c } +func (_c *ProviderService_GetByID_Call) RunAndReturn(run func(context.Context, string) (*domain.Provider, error)) *ProviderService_GetByID_Call { + _c.Call.Return(run) + return _c +} + // ListAccess provides a mock function with given fields: _a0, _a1, _a2 func (_m *ProviderService) ListAccess(_a0 context.Context, _a1 domain.Provider, _a2 []*domain.Resource) (domain.MapResourceAccess, error) { ret := _m.Called(_a0, _a1, _a2) var r0 domain.MapResourceAccess + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.Provider, []*domain.Resource) (domain.MapResourceAccess, error)); ok { + return rf(_a0, _a1, _a2) + } if rf, ok := ret.Get(0).(func(context.Context, domain.Provider, []*domain.Resource) domain.MapResourceAccess); ok { r0 = rf(_a0, _a1, _a2) } else { @@ -83,7 +95,6 @@ func (_m *ProviderService) ListAccess(_a0 context.Context, _a1 domain.Provider, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.Provider, []*domain.Resource) error); ok { r1 = rf(_a0, _a1, _a2) } else { @@ -99,9 +110,9 @@ type ProviderService_ListAccess_Call struct { } // ListAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Provider -// - _a2 []*domain.Resource +// - _a0 context.Context +// - _a1 domain.Provider +// - _a2 []*domain.Resource func (_e *ProviderService_Expecter) ListAccess(_a0 interface{}, _a1 interface{}, _a2 interface{}) *ProviderService_ListAccess_Call { return &ProviderService_ListAccess_Call{Call: _e.mock.On("ListAccess", _a0, _a1, _a2)} } @@ -118,6 +129,11 @@ func (_c *ProviderService_ListAccess_Call) Return(_a0 domain.MapResourceAccess, return _c } +func (_c *ProviderService_ListAccess_Call) RunAndReturn(run func(context.Context, domain.Provider, []*domain.Resource) (domain.MapResourceAccess, error)) *ProviderService_ListAccess_Call { + _c.Call.Return(run) + return _c +} + // RevokeAccess provides a mock function with given fields: _a0, _a1 func (_m *ProviderService) RevokeAccess(_a0 context.Context, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -138,8 +154,8 @@ type ProviderService_RevokeAccess_Call struct { } // RevokeAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Grant +// - _a0 context.Context +// - _a1 domain.Grant func (_e *ProviderService_Expecter) RevokeAccess(_a0 interface{}, _a1 interface{}) *ProviderService_RevokeAccess_Call { return &ProviderService_RevokeAccess_Call{Call: _e.mock.On("RevokeAccess", _a0, _a1)} } @@ -155,3 +171,22 @@ func (_c *ProviderService_RevokeAccess_Call) Return(_a0 error) *ProviderService_ _c.Call.Return(_a0) return _c } + +func (_c *ProviderService_RevokeAccess_Call) RunAndReturn(run func(context.Context, domain.Grant) error) *ProviderService_RevokeAccess_Call { + _c.Call.Return(run) + return _c +} + +// NewProviderService creates a new instance of ProviderService. 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 NewProviderService(t interface { + mock.TestingT + Cleanup(func()) +}) *ProviderService { + mock := &ProviderService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/grant/mocks/repository.go b/core/grant/mocks/repository.go index 3d1b28707..b4c3848e4 100644 --- a/core/grant/mocks/repository.go +++ b/core/grant/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -43,8 +43,8 @@ type Repository_BulkUpsert_Call struct { } // BulkUpsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Grant +// - _a0 context.Context +// - _a1 []*domain.Grant func (_e *Repository_Expecter) BulkUpsert(_a0 interface{}, _a1 interface{}) *Repository_BulkUpsert_Call { return &Repository_BulkUpsert_Call{Call: _e.mock.On("BulkUpsert", _a0, _a1)} } @@ -61,11 +61,20 @@ func (_c *Repository_BulkUpsert_Call) Return(_a0 error) *Repository_BulkUpsert_C return _c } +func (_c *Repository_BulkUpsert_Call) RunAndReturn(run func(context.Context, []*domain.Grant) error) *Repository_BulkUpsert_Call { + _c.Call.Return(run) + return _c +} + // GetByID provides a mock function with given fields: _a0, _a1 func (_m *Repository) GetByID(_a0 context.Context, _a1 string) (*domain.Grant, error) { ret := _m.Called(_a0, _a1) var r0 *domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Grant, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Grant); ok { r0 = rf(_a0, _a1) } else { @@ -74,7 +83,6 @@ func (_m *Repository) GetByID(_a0 context.Context, _a1 string) (*domain.Grant, e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -90,8 +98,8 @@ type Repository_GetByID_Call struct { } // GetByID is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *Repository_Expecter) GetByID(_a0 interface{}, _a1 interface{}) *Repository_GetByID_Call { return &Repository_GetByID_Call{Call: _e.mock.On("GetByID", _a0, _a1)} } @@ -108,11 +116,20 @@ func (_c *Repository_GetByID_Call) Return(_a0 *domain.Grant, _a1 error) *Reposit return _c } +func (_c *Repository_GetByID_Call) RunAndReturn(run func(context.Context, string) (*domain.Grant, error)) *Repository_GetByID_Call { + _c.Call.Return(run) + return _c +} + // List provides a mock function with given fields: _a0, _a1 func (_m *Repository) List(_a0 context.Context, _a1 domain.ListGrantsFilter) ([]domain.Grant, error) { ret := _m.Called(_a0, _a1) var r0 []domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListGrantsFilter) ([]domain.Grant, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListGrantsFilter) []domain.Grant); ok { r0 = rf(_a0, _a1) } else { @@ -121,7 +138,6 @@ func (_m *Repository) List(_a0 context.Context, _a1 domain.ListGrantsFilter) ([] } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListGrantsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -137,8 +153,8 @@ type Repository_List_Call struct { } // List is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListGrantsFilter +// - _a0 context.Context +// - _a1 domain.ListGrantsFilter func (_e *Repository_Expecter) List(_a0 interface{}, _a1 interface{}) *Repository_List_Call { return &Repository_List_Call{Call: _e.mock.On("List", _a0, _a1)} } @@ -155,6 +171,11 @@ func (_c *Repository_List_Call) Return(_a0 []domain.Grant, _a1 error) *Repositor return _c } +func (_c *Repository_List_Call) RunAndReturn(run func(context.Context, domain.ListGrantsFilter) ([]domain.Grant, error)) *Repository_List_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *Repository) Update(_a0 context.Context, _a1 *domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -175,8 +196,8 @@ type Repository_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Grant +// - _a0 context.Context +// - _a1 *domain.Grant func (_e *Repository_Expecter) Update(_a0 interface{}, _a1 interface{}) *Repository_Update_Call { return &Repository_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -192,3 +213,22 @@ func (_c *Repository_Update_Call) Return(_a0 error) *Repository_Update_Call { _c.Call.Return(_a0) return _c } + +func (_c *Repository_Update_Call) RunAndReturn(run func(context.Context, *domain.Grant) error) *Repository_Update_Call { + _c.Call.Return(run) + return _c +} + +// NewRepository creates a new instance of Repository. 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 NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { + mock := &Repository{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/grant/mocks/resourceService.go b/core/grant/mocks/resourceService.go index 5bb7322f1..f8c485c8b 100644 --- a/core/grant/mocks/resourceService.go +++ b/core/grant/mocks/resourceService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -28,6 +28,10 @@ func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFil ret := _m.Called(_a0, _a1) var r0 []*domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) []*domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -36,7 +40,6 @@ func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFil } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListResourcesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -52,8 +55,8 @@ type ResourceService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListResourcesFilter +// - _a0 context.Context +// - _a1 domain.ListResourcesFilter func (_e *ResourceService_Expecter) Find(_a0 interface{}, _a1 interface{}) *ResourceService_Find_Call { return &ResourceService_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -69,3 +72,22 @@ func (_c *ResourceService_Find_Call) Return(_a0 []*domain.Resource, _a1 error) * _c.Call.Return(_a0, _a1) return _c } + +func (_c *ResourceService_Find_Call) RunAndReturn(run func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)) *ResourceService_Find_Call { + _c.Call.Return(run) + return _c +} + +// NewResourceService creates a new instance of ResourceService. 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 NewResourceService(t interface { + mock.TestingT + Cleanup(func()) +}) *ResourceService { + mock := &ResourceService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/policy/mocks/auditLogger.go b/core/policy/mocks/auditLogger.go index 421d831ee..876822022 100644 --- a/core/policy/mocks/auditLogger.go +++ b/core/policy/mocks/auditLogger.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type AuditLogger_Log_Call struct { } // Log is a helper method to define mock.On call -// - ctx context.Context -// - action string -// - data interface{} +// - ctx context.Context +// - action string +// - data interface{} func (_e *AuditLogger_Expecter) Log(ctx interface{}, action interface{}, data interface{}) *AuditLogger_Log_Call { return &AuditLogger_Log_Call{Call: _e.mock.On("Log", ctx, action, data)} } @@ -59,3 +59,22 @@ func (_c *AuditLogger_Log_Call) Return(_a0 error) *AuditLogger_Log_Call { _c.Call.Return(_a0) return _c } + +func (_c *AuditLogger_Log_Call) RunAndReturn(run func(context.Context, string, interface{}) error) *AuditLogger_Log_Call { + _c.Call.Return(run) + return _c +} + +// NewAuditLogger creates a new instance of AuditLogger. 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 NewAuditLogger(t interface { + mock.TestingT + Cleanup(func()) +}) *AuditLogger { + mock := &AuditLogger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/policy/mocks/providerService.go b/core/policy/mocks/providerService.go index ae5b2b125..9fbc558b2 100644 --- a/core/policy/mocks/providerService.go +++ b/core/policy/mocks/providerService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ProviderService) GetOne(ctx context.Context, pType string, urn string) ret := _m.Called(ctx, pType, urn) var r0 *domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*domain.Provider, error)); ok { + return rf(ctx, pType, urn) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) *domain.Provider); ok { r0 = rf(ctx, pType, urn) } else { @@ -35,7 +39,6 @@ func (_m *ProviderService) GetOne(ctx context.Context, pType string, urn string) } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, pType, urn) } else { @@ -51,9 +54,9 @@ type ProviderService_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - ctx context.Context -// - pType string -// - urn string +// - ctx context.Context +// - pType string +// - urn string func (_e *ProviderService_Expecter) GetOne(ctx interface{}, pType interface{}, urn interface{}) *ProviderService_GetOne_Call { return &ProviderService_GetOne_Call{Call: _e.mock.On("GetOne", ctx, pType, urn)} } @@ -70,6 +73,11 @@ func (_c *ProviderService_GetOne_Call) Return(_a0 *domain.Provider, _a1 error) * return _c } +func (_c *ProviderService_GetOne_Call) RunAndReturn(run func(context.Context, string, string) (*domain.Provider, error)) *ProviderService_GetOne_Call { + _c.Call.Return(run) + return _c +} + // ValidateAppeal provides a mock function with given fields: _a0, _a1, _a2, _a3 func (_m *ProviderService) ValidateAppeal(_a0 context.Context, _a1 *domain.Appeal, _a2 *domain.Provider, _a3 *domain.Policy) error { ret := _m.Called(_a0, _a1, _a2, _a3) @@ -90,10 +98,10 @@ type ProviderService_ValidateAppeal_Call struct { } // ValidateAppeal is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Appeal -// - _a2 *domain.Provider -// - _a3 *domain.Policy +// - _a0 context.Context +// - _a1 *domain.Appeal +// - _a2 *domain.Provider +// - _a3 *domain.Policy func (_e *ProviderService_Expecter) ValidateAppeal(_a0 interface{}, _a1 interface{}, _a2 interface{}, _a3 interface{}) *ProviderService_ValidateAppeal_Call { return &ProviderService_ValidateAppeal_Call{Call: _e.mock.On("ValidateAppeal", _a0, _a1, _a2, _a3)} } @@ -109,3 +117,22 @@ func (_c *ProviderService_ValidateAppeal_Call) Return(_a0 error) *ProviderServic _c.Call.Return(_a0) return _c } + +func (_c *ProviderService_ValidateAppeal_Call) RunAndReturn(run func(context.Context, *domain.Appeal, *domain.Provider, *domain.Policy) error) *ProviderService_ValidateAppeal_Call { + _c.Call.Return(run) + return _c +} + +// NewProviderService creates a new instance of ProviderService. 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 NewProviderService(t interface { + mock.TestingT + Cleanup(func()) +}) *ProviderService { + mock := &ProviderService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/policy/mocks/repository.go b/core/policy/mocks/repository.go index ddb4a14cf..ac5834ac3 100644 --- a/core/policy/mocks/repository.go +++ b/core/policy/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type Repository_Create_Call struct { } // Create is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Policy +// - _a0 context.Context +// - _a1 *domain.Policy func (_e *Repository_Expecter) Create(_a0 interface{}, _a1 interface{}) *Repository_Create_Call { return &Repository_Create_Call{Call: _e.mock.On("Create", _a0, _a1)} } @@ -60,11 +60,20 @@ func (_c *Repository_Create_Call) Return(_a0 error) *Repository_Create_Call { return _c } +func (_c *Repository_Create_Call) RunAndReturn(run func(context.Context, *domain.Policy) error) *Repository_Create_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0 func (_m *Repository) Find(_a0 context.Context) ([]*domain.Policy, error) { ret := _m.Called(_a0) var r0 []*domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*domain.Policy, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*domain.Policy); ok { r0 = rf(_a0) } else { @@ -73,7 +82,6 @@ func (_m *Repository) Find(_a0 context.Context) ([]*domain.Policy, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -89,7 +97,7 @@ type Repository_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *Repository_Expecter) Find(_a0 interface{}) *Repository_Find_Call { return &Repository_Find_Call{Call: _e.mock.On("Find", _a0)} } @@ -106,11 +114,20 @@ func (_c *Repository_Find_Call) Return(_a0 []*domain.Policy, _a1 error) *Reposit return _c } +func (_c *Repository_Find_Call) RunAndReturn(run func(context.Context) ([]*domain.Policy, error)) *Repository_Find_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: ctx, id, version func (_m *Repository) GetOne(ctx context.Context, id string, version uint) (*domain.Policy, error) { ret := _m.Called(ctx, id, version) var r0 *domain.Policy + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, uint) (*domain.Policy, error)); ok { + return rf(ctx, id, version) + } if rf, ok := ret.Get(0).(func(context.Context, string, uint) *domain.Policy); ok { r0 = rf(ctx, id, version) } else { @@ -119,7 +136,6 @@ func (_m *Repository) GetOne(ctx context.Context, id string, version uint) (*dom } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, uint) error); ok { r1 = rf(ctx, id, version) } else { @@ -135,9 +151,9 @@ type Repository_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - ctx context.Context -// - id string -// - version uint +// - ctx context.Context +// - id string +// - version uint func (_e *Repository_Expecter) GetOne(ctx interface{}, id interface{}, version interface{}) *Repository_GetOne_Call { return &Repository_GetOne_Call{Call: _e.mock.On("GetOne", ctx, id, version)} } @@ -153,3 +169,22 @@ func (_c *Repository_GetOne_Call) Return(_a0 *domain.Policy, _a1 error) *Reposit _c.Call.Return(_a0, _a1) return _c } + +func (_c *Repository_GetOne_Call) RunAndReturn(run func(context.Context, string, uint) (*domain.Policy, error)) *Repository_GetOne_Call { + _c.Call.Return(run) + return _c +} + +// NewRepository creates a new instance of Repository. 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 NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { + mock := &Repository{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/policy/mocks/resourceService.go b/core/policy/mocks/resourceService.go index 97abd4440..72d5efc57 100644 --- a/core/policy/mocks/resourceService.go +++ b/core/policy/mocks/resourceService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ResourceService) Get(_a0 context.Context, _a1 *domain.ResourceIdentifi ret := _m.Called(_a0, _a1) var r0 *domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *domain.ResourceIdentifier) *domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -35,7 +39,6 @@ func (_m *ResourceService) Get(_a0 context.Context, _a1 *domain.ResourceIdentifi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *domain.ResourceIdentifier) error); ok { r1 = rf(_a0, _a1) } else { @@ -51,8 +54,8 @@ type ResourceService_Get_Call struct { } // Get is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.ResourceIdentifier +// - _a0 context.Context +// - _a1 *domain.ResourceIdentifier func (_e *ResourceService_Expecter) Get(_a0 interface{}, _a1 interface{}) *ResourceService_Get_Call { return &ResourceService_Get_Call{Call: _e.mock.On("Get", _a0, _a1)} } @@ -68,3 +71,22 @@ func (_c *ResourceService_Get_Call) Return(_a0 *domain.Resource, _a1 error) *Res _c.Call.Return(_a0, _a1) return _c } + +func (_c *ResourceService_Get_Call) RunAndReturn(run func(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)) *ResourceService_Get_Call { + _c.Call.Return(run) + return _c +} + +// NewResourceService creates a new instance of ResourceService. 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 NewResourceService(t interface { + mock.TestingT + Cleanup(func()) +}) *ResourceService { + mock := &ResourceService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/policy/service.go b/core/policy/service.go index f0a40d10a..87d368348 100644 --- a/core/policy/service.go +++ b/core/policy/service.go @@ -319,7 +319,8 @@ func (s *Service) validateApprover(expr string) error { // skip validation if expression is accessing arbitrary value if strings.Contains(expr, "$appeal.resource.details") || - strings.Contains(expr, "$appeal.creator") { + strings.Contains(expr, "$appeal.creator") || + strings.Contains(expr, "$appeal.resource.created_by") { return nil } diff --git a/core/provider/mocks/activityManager.go b/core/provider/mocks/activityManager.go index af55c01b0..8cf31e2d9 100644 --- a/core/provider/mocks/activityManager.go +++ b/core/provider/mocks/activityManager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -27,6 +27,10 @@ func (_m *ActivityManager) GetActivities(_a0 context.Context, _a1 domain.Provide ret := _m.Called(_a0, _a1, _a2) var r0 []*domain.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.Provider, domain.ImportActivitiesFilter) ([]*domain.Activity, error)); ok { + return rf(_a0, _a1, _a2) + } if rf, ok := ret.Get(0).(func(context.Context, domain.Provider, domain.ImportActivitiesFilter) []*domain.Activity); ok { r0 = rf(_a0, _a1, _a2) } else { @@ -35,7 +39,6 @@ func (_m *ActivityManager) GetActivities(_a0 context.Context, _a1 domain.Provide } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.Provider, domain.ImportActivitiesFilter) error); ok { r1 = rf(_a0, _a1, _a2) } else { @@ -51,9 +54,9 @@ type ActivityManager_GetActivities_Call struct { } // GetActivities is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.Provider -// - _a2 domain.ImportActivitiesFilter +// - _a0 context.Context +// - _a1 domain.Provider +// - _a2 domain.ImportActivitiesFilter func (_e *ActivityManager_Expecter) GetActivities(_a0 interface{}, _a1 interface{}, _a2 interface{}) *ActivityManager_GetActivities_Call { return &ActivityManager_GetActivities_Call{Call: _e.mock.On("GetActivities", _a0, _a1, _a2)} } @@ -69,3 +72,22 @@ func (_c *ActivityManager_GetActivities_Call) Return(_a0 []*domain.Activity, _a1 _c.Call.Return(_a0, _a1) return _c } + +func (_c *ActivityManager_GetActivities_Call) RunAndReturn(run func(context.Context, domain.Provider, domain.ImportActivitiesFilter) ([]*domain.Activity, error)) *ActivityManager_GetActivities_Call { + _c.Call.Return(run) + return _c +} + +// NewActivityManager creates a new instance of ActivityManager. 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 NewActivityManager(t interface { + mock.TestingT + Cleanup(func()) +}) *ActivityManager { + mock := &ActivityManager{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/provider/mocks/auditLogger.go b/core/provider/mocks/auditLogger.go index 421d831ee..876822022 100644 --- a/core/provider/mocks/auditLogger.go +++ b/core/provider/mocks/auditLogger.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type AuditLogger_Log_Call struct { } // Log is a helper method to define mock.On call -// - ctx context.Context -// - action string -// - data interface{} +// - ctx context.Context +// - action string +// - data interface{} func (_e *AuditLogger_Expecter) Log(ctx interface{}, action interface{}, data interface{}) *AuditLogger_Log_Call { return &AuditLogger_Log_Call{Call: _e.mock.On("Log", ctx, action, data)} } @@ -59,3 +59,22 @@ func (_c *AuditLogger_Log_Call) Return(_a0 error) *AuditLogger_Log_Call { _c.Call.Return(_a0) return _c } + +func (_c *AuditLogger_Log_Call) RunAndReturn(run func(context.Context, string, interface{}) error) *AuditLogger_Log_Call { + _c.Call.Return(run) + return _c +} + +// NewAuditLogger creates a new instance of AuditLogger. 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 NewAuditLogger(t interface { + mock.TestingT + Cleanup(func()) +}) *AuditLogger { + mock := &AuditLogger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/provider/mocks/client.go b/core/provider/mocks/client.go index cc9ec67ec..7d63df2b2 100644 --- a/core/provider/mocks/client.go +++ b/core/provider/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,7 +42,7 @@ type Client_CreateConfig_Call struct { } // CreateConfig is a helper method to define mock.On call -// - _a0 *domain.ProviderConfig +// - _a0 *domain.ProviderConfig func (_e *Client_Expecter) CreateConfig(_a0 interface{}) *Client_CreateConfig_Call { return &Client_CreateConfig_Call{Call: _e.mock.On("CreateConfig", _a0)} } @@ -59,6 +59,11 @@ func (_c *Client_CreateConfig_Call) Return(_a0 error) *Client_CreateConfig_Call return _c } +func (_c *Client_CreateConfig_Call) RunAndReturn(run func(*domain.ProviderConfig) error) *Client_CreateConfig_Call { + _c.Call.Return(run) + return _c +} + // GetAccountTypes provides a mock function with given fields: func (_m *Client) GetAccountTypes() []string { ret := _m.Called() @@ -97,11 +102,20 @@ func (_c *Client_GetAccountTypes_Call) Return(_a0 []string) *Client_GetAccountTy return _c } +func (_c *Client_GetAccountTypes_Call) RunAndReturn(run func() []string) *Client_GetAccountTypes_Call { + _c.Call.Return(run) + return _c +} + // GetPermissions provides a mock function with given fields: p, resourceType, role func (_m *Client) GetPermissions(p *domain.ProviderConfig, resourceType string, role string) ([]interface{}, error) { ret := _m.Called(p, resourceType, role) var r0 []interface{} + var r1 error + if rf, ok := ret.Get(0).(func(*domain.ProviderConfig, string, string) ([]interface{}, error)); ok { + return rf(p, resourceType, role) + } if rf, ok := ret.Get(0).(func(*domain.ProviderConfig, string, string) []interface{}); ok { r0 = rf(p, resourceType, role) } else { @@ -110,7 +124,6 @@ func (_m *Client) GetPermissions(p *domain.ProviderConfig, resourceType string, } } - var r1 error if rf, ok := ret.Get(1).(func(*domain.ProviderConfig, string, string) error); ok { r1 = rf(p, resourceType, role) } else { @@ -126,9 +139,9 @@ type Client_GetPermissions_Call struct { } // GetPermissions is a helper method to define mock.On call -// - p *domain.ProviderConfig -// - resourceType string -// - role string +// - p *domain.ProviderConfig +// - resourceType string +// - role string func (_e *Client_Expecter) GetPermissions(p interface{}, resourceType interface{}, role interface{}) *Client_GetPermissions_Call { return &Client_GetPermissions_Call{Call: _e.mock.On("GetPermissions", p, resourceType, role)} } @@ -145,11 +158,20 @@ func (_c *Client_GetPermissions_Call) Return(_a0 []interface{}, _a1 error) *Clie return _c } +func (_c *Client_GetPermissions_Call) RunAndReturn(run func(*domain.ProviderConfig, string, string) ([]interface{}, error)) *Client_GetPermissions_Call { + _c.Call.Return(run) + return _c +} + // GetResources provides a mock function with given fields: pc func (_m *Client) GetResources(pc *domain.ProviderConfig) ([]*domain.Resource, error) { ret := _m.Called(pc) var r0 []*domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(*domain.ProviderConfig) ([]*domain.Resource, error)); ok { + return rf(pc) + } if rf, ok := ret.Get(0).(func(*domain.ProviderConfig) []*domain.Resource); ok { r0 = rf(pc) } else { @@ -158,7 +180,6 @@ func (_m *Client) GetResources(pc *domain.ProviderConfig) ([]*domain.Resource, e } } - var r1 error if rf, ok := ret.Get(1).(func(*domain.ProviderConfig) error); ok { r1 = rf(pc) } else { @@ -174,7 +195,7 @@ type Client_GetResources_Call struct { } // GetResources is a helper method to define mock.On call -// - pc *domain.ProviderConfig +// - pc *domain.ProviderConfig func (_e *Client_Expecter) GetResources(pc interface{}) *Client_GetResources_Call { return &Client_GetResources_Call{Call: _e.mock.On("GetResources", pc)} } @@ -191,11 +212,20 @@ func (_c *Client_GetResources_Call) Return(_a0 []*domain.Resource, _a1 error) *C return _c } +func (_c *Client_GetResources_Call) RunAndReturn(run func(*domain.ProviderConfig) ([]*domain.Resource, error)) *Client_GetResources_Call { + _c.Call.Return(run) + return _c +} + // GetRoles provides a mock function with given fields: pc, resourceType func (_m *Client) GetRoles(pc *domain.ProviderConfig, resourceType string) ([]*domain.Role, error) { ret := _m.Called(pc, resourceType) var r0 []*domain.Role + var r1 error + if rf, ok := ret.Get(0).(func(*domain.ProviderConfig, string) ([]*domain.Role, error)); ok { + return rf(pc, resourceType) + } if rf, ok := ret.Get(0).(func(*domain.ProviderConfig, string) []*domain.Role); ok { r0 = rf(pc, resourceType) } else { @@ -204,7 +234,6 @@ func (_m *Client) GetRoles(pc *domain.ProviderConfig, resourceType string) ([]*d } } - var r1 error if rf, ok := ret.Get(1).(func(*domain.ProviderConfig, string) error); ok { r1 = rf(pc, resourceType) } else { @@ -220,8 +249,8 @@ type Client_GetRoles_Call struct { } // GetRoles is a helper method to define mock.On call -// - pc *domain.ProviderConfig -// - resourceType string +// - pc *domain.ProviderConfig +// - resourceType string func (_e *Client_Expecter) GetRoles(pc interface{}, resourceType interface{}) *Client_GetRoles_Call { return &Client_GetRoles_Call{Call: _e.mock.On("GetRoles", pc, resourceType)} } @@ -238,6 +267,11 @@ func (_c *Client_GetRoles_Call) Return(_a0 []*domain.Role, _a1 error) *Client_Ge return _c } +func (_c *Client_GetRoles_Call) RunAndReturn(run func(*domain.ProviderConfig, string) ([]*domain.Role, error)) *Client_GetRoles_Call { + _c.Call.Return(run) + return _c +} + // GetType provides a mock function with given fields: func (_m *Client) GetType() string { ret := _m.Called() @@ -274,6 +308,11 @@ func (_c *Client_GetType_Call) Return(_a0 string) *Client_GetType_Call { return _c } +func (_c *Client_GetType_Call) RunAndReturn(run func() string) *Client_GetType_Call { + _c.Call.Return(run) + return _c +} + // GrantAccess provides a mock function with given fields: _a0, _a1 func (_m *Client) GrantAccess(_a0 *domain.ProviderConfig, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -294,8 +333,8 @@ type Client_GrantAccess_Call struct { } // GrantAccess is a helper method to define mock.On call -// - _a0 *domain.ProviderConfig -// - _a1 domain.Grant +// - _a0 *domain.ProviderConfig +// - _a1 domain.Grant func (_e *Client_Expecter) GrantAccess(_a0 interface{}, _a1 interface{}) *Client_GrantAccess_Call { return &Client_GrantAccess_Call{Call: _e.mock.On("GrantAccess", _a0, _a1)} } @@ -312,11 +351,20 @@ func (_c *Client_GrantAccess_Call) Return(_a0 error) *Client_GrantAccess_Call { return _c } +func (_c *Client_GrantAccess_Call) RunAndReturn(run func(*domain.ProviderConfig, domain.Grant) error) *Client_GrantAccess_Call { + _c.Call.Return(run) + return _c +} + // ListAccess provides a mock function with given fields: _a0, _a1, _a2 func (_m *Client) ListAccess(_a0 context.Context, _a1 domain.ProviderConfig, _a2 []*domain.Resource) (domain.MapResourceAccess, error) { ret := _m.Called(_a0, _a1, _a2) var r0 domain.MapResourceAccess + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ProviderConfig, []*domain.Resource) (domain.MapResourceAccess, error)); ok { + return rf(_a0, _a1, _a2) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ProviderConfig, []*domain.Resource) domain.MapResourceAccess); ok { r0 = rf(_a0, _a1, _a2) } else { @@ -325,7 +373,6 @@ func (_m *Client) ListAccess(_a0 context.Context, _a1 domain.ProviderConfig, _a2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ProviderConfig, []*domain.Resource) error); ok { r1 = rf(_a0, _a1, _a2) } else { @@ -341,9 +388,9 @@ type Client_ListAccess_Call struct { } // ListAccess is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ProviderConfig -// - _a2 []*domain.Resource +// - _a0 context.Context +// - _a1 domain.ProviderConfig +// - _a2 []*domain.Resource func (_e *Client_Expecter) ListAccess(_a0 interface{}, _a1 interface{}, _a2 interface{}) *Client_ListAccess_Call { return &Client_ListAccess_Call{Call: _e.mock.On("ListAccess", _a0, _a1, _a2)} } @@ -360,6 +407,11 @@ func (_c *Client_ListAccess_Call) Return(_a0 domain.MapResourceAccess, _a1 error return _c } +func (_c *Client_ListAccess_Call) RunAndReturn(run func(context.Context, domain.ProviderConfig, []*domain.Resource) (domain.MapResourceAccess, error)) *Client_ListAccess_Call { + _c.Call.Return(run) + return _c +} + // RevokeAccess provides a mock function with given fields: _a0, _a1 func (_m *Client) RevokeAccess(_a0 *domain.ProviderConfig, _a1 domain.Grant) error { ret := _m.Called(_a0, _a1) @@ -380,8 +432,8 @@ type Client_RevokeAccess_Call struct { } // RevokeAccess is a helper method to define mock.On call -// - _a0 *domain.ProviderConfig -// - _a1 domain.Grant +// - _a0 *domain.ProviderConfig +// - _a1 domain.Grant func (_e *Client_Expecter) RevokeAccess(_a0 interface{}, _a1 interface{}) *Client_RevokeAccess_Call { return &Client_RevokeAccess_Call{Call: _e.mock.On("RevokeAccess", _a0, _a1)} } @@ -397,3 +449,22 @@ func (_c *Client_RevokeAccess_Call) Return(_a0 error) *Client_RevokeAccess_Call _c.Call.Return(_a0) return _c } + +func (_c *Client_RevokeAccess_Call) RunAndReturn(run func(*domain.ProviderConfig, domain.Grant) error) *Client_RevokeAccess_Call { + _c.Call.Return(run) + return _c +} + +// NewClient creates a new instance of Client. 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 NewClient(t interface { + mock.TestingT + Cleanup(func()) +}) *Client { + mock := &Client{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/provider/mocks/repository.go b/core/provider/mocks/repository.go index 09e68cfa0..9800c24ee 100644 --- a/core/provider/mocks/repository.go +++ b/core/provider/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type Repository_Create_Call struct { } // Create is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Provider +// - _a0 context.Context +// - _a1 *domain.Provider func (_e *Repository_Expecter) Create(_a0 interface{}, _a1 interface{}) *Repository_Create_Call { return &Repository_Create_Call{Call: _e.mock.On("Create", _a0, _a1)} } @@ -60,6 +60,11 @@ func (_c *Repository_Create_Call) Return(_a0 error) *Repository_Create_Call { return _c } +func (_c *Repository_Create_Call) RunAndReturn(run func(context.Context, *domain.Provider) error) *Repository_Create_Call { + _c.Call.Return(run) + return _c +} + // Delete provides a mock function with given fields: ctx, id func (_m *Repository) Delete(ctx context.Context, id string) error { ret := _m.Called(ctx, id) @@ -80,8 +85,8 @@ type Repository_Delete_Call struct { } // Delete is a helper method to define mock.On call -// - ctx context.Context -// - id string +// - ctx context.Context +// - id string func (_e *Repository_Expecter) Delete(ctx interface{}, id interface{}) *Repository_Delete_Call { return &Repository_Delete_Call{Call: _e.mock.On("Delete", ctx, id)} } @@ -98,11 +103,20 @@ func (_c *Repository_Delete_Call) Return(_a0 error) *Repository_Delete_Call { return _c } +func (_c *Repository_Delete_Call) RunAndReturn(run func(context.Context, string) error) *Repository_Delete_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0 func (_m *Repository) Find(_a0 context.Context) ([]*domain.Provider, error) { ret := _m.Called(_a0) var r0 []*domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*domain.Provider, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*domain.Provider); ok { r0 = rf(_a0) } else { @@ -111,7 +125,6 @@ func (_m *Repository) Find(_a0 context.Context) ([]*domain.Provider, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -127,7 +140,7 @@ type Repository_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *Repository_Expecter) Find(_a0 interface{}) *Repository_Find_Call { return &Repository_Find_Call{Call: _e.mock.On("Find", _a0)} } @@ -144,11 +157,20 @@ func (_c *Repository_Find_Call) Return(_a0 []*domain.Provider, _a1 error) *Repos return _c } +func (_c *Repository_Find_Call) RunAndReturn(run func(context.Context) ([]*domain.Provider, error)) *Repository_Find_Call { + _c.Call.Return(run) + return _c +} + // GetByID provides a mock function with given fields: ctx, id func (_m *Repository) GetByID(ctx context.Context, id string) (*domain.Provider, error) { ret := _m.Called(ctx, id) var r0 *domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Provider, error)); ok { + return rf(ctx, id) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Provider); ok { r0 = rf(ctx, id) } else { @@ -157,7 +179,6 @@ func (_m *Repository) GetByID(ctx context.Context, id string) (*domain.Provider, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, id) } else { @@ -173,8 +194,8 @@ type Repository_GetByID_Call struct { } // GetByID is a helper method to define mock.On call -// - ctx context.Context -// - id string +// - ctx context.Context +// - id string func (_e *Repository_Expecter) GetByID(ctx interface{}, id interface{}) *Repository_GetByID_Call { return &Repository_GetByID_Call{Call: _e.mock.On("GetByID", ctx, id)} } @@ -191,11 +212,20 @@ func (_c *Repository_GetByID_Call) Return(_a0 *domain.Provider, _a1 error) *Repo return _c } +func (_c *Repository_GetByID_Call) RunAndReturn(run func(context.Context, string) (*domain.Provider, error)) *Repository_GetByID_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: ctx, pType, urn func (_m *Repository) GetOne(ctx context.Context, pType string, urn string) (*domain.Provider, error) { ret := _m.Called(ctx, pType, urn) var r0 *domain.Provider + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*domain.Provider, error)); ok { + return rf(ctx, pType, urn) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) *domain.Provider); ok { r0 = rf(ctx, pType, urn) } else { @@ -204,7 +234,6 @@ func (_m *Repository) GetOne(ctx context.Context, pType string, urn string) (*do } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, pType, urn) } else { @@ -220,9 +249,9 @@ type Repository_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - ctx context.Context -// - pType string -// - urn string +// - ctx context.Context +// - pType string +// - urn string func (_e *Repository_Expecter) GetOne(ctx interface{}, pType interface{}, urn interface{}) *Repository_GetOne_Call { return &Repository_GetOne_Call{Call: _e.mock.On("GetOne", ctx, pType, urn)} } @@ -239,11 +268,20 @@ func (_c *Repository_GetOne_Call) Return(_a0 *domain.Provider, _a1 error) *Repos return _c } +func (_c *Repository_GetOne_Call) RunAndReturn(run func(context.Context, string, string) (*domain.Provider, error)) *Repository_GetOne_Call { + _c.Call.Return(run) + return _c +} + // GetTypes provides a mock function with given fields: _a0 func (_m *Repository) GetTypes(_a0 context.Context) ([]domain.ProviderType, error) { ret := _m.Called(_a0) var r0 []domain.ProviderType + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]domain.ProviderType, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []domain.ProviderType); ok { r0 = rf(_a0) } else { @@ -252,7 +290,6 @@ func (_m *Repository) GetTypes(_a0 context.Context) ([]domain.ProviderType, erro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -268,7 +305,7 @@ type Repository_GetTypes_Call struct { } // GetTypes is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *Repository_Expecter) GetTypes(_a0 interface{}) *Repository_GetTypes_Call { return &Repository_GetTypes_Call{Call: _e.mock.On("GetTypes", _a0)} } @@ -285,6 +322,11 @@ func (_c *Repository_GetTypes_Call) Return(_a0 []domain.ProviderType, _a1 error) return _c } +func (_c *Repository_GetTypes_Call) RunAndReturn(run func(context.Context) ([]domain.ProviderType, error)) *Repository_GetTypes_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *Repository) Update(_a0 context.Context, _a1 *domain.Provider) error { ret := _m.Called(_a0, _a1) @@ -305,8 +347,8 @@ type Repository_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Provider +// - _a0 context.Context +// - _a1 *domain.Provider func (_e *Repository_Expecter) Update(_a0 interface{}, _a1 interface{}) *Repository_Update_Call { return &Repository_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -322,3 +364,22 @@ func (_c *Repository_Update_Call) Return(_a0 error) *Repository_Update_Call { _c.Call.Return(_a0) return _c } + +func (_c *Repository_Update_Call) RunAndReturn(run func(context.Context, *domain.Provider) error) *Repository_Update_Call { + _c.Call.Return(run) + return _c +} + +// NewRepository creates a new instance of Repository. 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 NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { + mock := &Repository{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/provider/mocks/resourceService.go b/core/provider/mocks/resourceService.go index f75836a43..d05b52a74 100644 --- a/core/provider/mocks/resourceService.go +++ b/core/provider/mocks/resourceService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type ResourceService_BatchDelete_Call struct { } // BatchDelete is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []string +// - _a0 context.Context +// - _a1 []string func (_e *ResourceService_Expecter) BatchDelete(_a0 interface{}, _a1 interface{}) *ResourceService_BatchDelete_Call { return &ResourceService_BatchDelete_Call{Call: _e.mock.On("BatchDelete", _a0, _a1)} } @@ -60,6 +60,11 @@ func (_c *ResourceService_BatchDelete_Call) Return(_a0 error) *ResourceService_B return _c } +func (_c *ResourceService_BatchDelete_Call) RunAndReturn(run func(context.Context, []string) error) *ResourceService_BatchDelete_Call { + _c.Call.Return(run) + return _c +} + // BulkUpsert provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) BulkUpsert(_a0 context.Context, _a1 []*domain.Resource) error { ret := _m.Called(_a0, _a1) @@ -80,8 +85,8 @@ type ResourceService_BulkUpsert_Call struct { } // BulkUpsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Resource +// - _a0 context.Context +// - _a1 []*domain.Resource func (_e *ResourceService_Expecter) BulkUpsert(_a0 interface{}, _a1 interface{}) *ResourceService_BulkUpsert_Call { return &ResourceService_BulkUpsert_Call{Call: _e.mock.On("BulkUpsert", _a0, _a1)} } @@ -98,11 +103,20 @@ func (_c *ResourceService_BulkUpsert_Call) Return(_a0 error) *ResourceService_Bu return _c } +func (_c *ResourceService_BulkUpsert_Call) RunAndReturn(run func(context.Context, []*domain.Resource) error) *ResourceService_BulkUpsert_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0, _a1 func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFilter) ([]*domain.Resource, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) []*domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -111,7 +125,6 @@ func (_m *ResourceService) Find(_a0 context.Context, _a1 domain.ListResourcesFil } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListResourcesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -127,8 +140,8 @@ type ResourceService_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListResourcesFilter +// - _a0 context.Context +// - _a1 domain.ListResourcesFilter func (_e *ResourceService_Expecter) Find(_a0 interface{}, _a1 interface{}) *ResourceService_Find_Call { return &ResourceService_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -144,3 +157,22 @@ func (_c *ResourceService_Find_Call) Return(_a0 []*domain.Resource, _a1 error) * _c.Call.Return(_a0, _a1) return _c } + +func (_c *ResourceService_Find_Call) RunAndReturn(run func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)) *ResourceService_Find_Call { + _c.Call.Return(run) + return _c +} + +// NewResourceService creates a new instance of ResourceService. 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 NewResourceService(t interface { + mock.TestingT + Cleanup(func()) +}) *ResourceService { + mock := &ResourceService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/resource/mocks/auditLogger.go b/core/resource/mocks/auditLogger.go index 421d831ee..876822022 100644 --- a/core/resource/mocks/auditLogger.go +++ b/core/resource/mocks/auditLogger.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -41,9 +41,9 @@ type AuditLogger_Log_Call struct { } // Log is a helper method to define mock.On call -// - ctx context.Context -// - action string -// - data interface{} +// - ctx context.Context +// - action string +// - data interface{} func (_e *AuditLogger_Expecter) Log(ctx interface{}, action interface{}, data interface{}) *AuditLogger_Log_Call { return &AuditLogger_Log_Call{Call: _e.mock.On("Log", ctx, action, data)} } @@ -59,3 +59,22 @@ func (_c *AuditLogger_Log_Call) Return(_a0 error) *AuditLogger_Log_Call { _c.Call.Return(_a0) return _c } + +func (_c *AuditLogger_Log_Call) RunAndReturn(run func(context.Context, string, interface{}) error) *AuditLogger_Log_Call { + _c.Call.Return(run) + return _c +} + +// NewAuditLogger creates a new instance of AuditLogger. 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 NewAuditLogger(t interface { + mock.TestingT + Cleanup(func()) +}) *AuditLogger { + mock := &AuditLogger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/resource/mocks/repository.go b/core/resource/mocks/repository.go index 02626e6b6..80b37c4b0 100644 --- a/core/resource/mocks/repository.go +++ b/core/resource/mocks/repository.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -42,8 +42,8 @@ type Repository_BatchDelete_Call struct { } // BatchDelete is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []string +// - _a0 context.Context +// - _a1 []string func (_e *Repository_Expecter) BatchDelete(_a0 interface{}, _a1 interface{}) *Repository_BatchDelete_Call { return &Repository_BatchDelete_Call{Call: _e.mock.On("BatchDelete", _a0, _a1)} } @@ -60,6 +60,11 @@ func (_c *Repository_BatchDelete_Call) Return(_a0 error) *Repository_BatchDelete return _c } +func (_c *Repository_BatchDelete_Call) RunAndReturn(run func(context.Context, []string) error) *Repository_BatchDelete_Call { + _c.Call.Return(run) + return _c +} + // BulkUpsert provides a mock function with given fields: _a0, _a1 func (_m *Repository) BulkUpsert(_a0 context.Context, _a1 []*domain.Resource) error { ret := _m.Called(_a0, _a1) @@ -80,8 +85,8 @@ type Repository_BulkUpsert_Call struct { } // BulkUpsert is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 []*domain.Resource +// - _a0 context.Context +// - _a1 []*domain.Resource func (_e *Repository_Expecter) BulkUpsert(_a0 interface{}, _a1 interface{}) *Repository_BulkUpsert_Call { return &Repository_BulkUpsert_Call{Call: _e.mock.On("BulkUpsert", _a0, _a1)} } @@ -98,6 +103,11 @@ func (_c *Repository_BulkUpsert_Call) Return(_a0 error) *Repository_BulkUpsert_C return _c } +func (_c *Repository_BulkUpsert_Call) RunAndReturn(run func(context.Context, []*domain.Resource) error) *Repository_BulkUpsert_Call { + _c.Call.Return(run) + return _c +} + // Delete provides a mock function with given fields: ctx, id func (_m *Repository) Delete(ctx context.Context, id string) error { ret := _m.Called(ctx, id) @@ -118,8 +128,8 @@ type Repository_Delete_Call struct { } // Delete is a helper method to define mock.On call -// - ctx context.Context -// - id string +// - ctx context.Context +// - id string func (_e *Repository_Expecter) Delete(ctx interface{}, id interface{}) *Repository_Delete_Call { return &Repository_Delete_Call{Call: _e.mock.On("Delete", ctx, id)} } @@ -136,11 +146,20 @@ func (_c *Repository_Delete_Call) Return(_a0 error) *Repository_Delete_Call { return _c } +func (_c *Repository_Delete_Call) RunAndReturn(run func(context.Context, string) error) *Repository_Delete_Call { + _c.Call.Return(run) + return _c +} + // Find provides a mock function with given fields: _a0, _a1 func (_m *Repository) Find(_a0 context.Context, _a1 domain.ListResourcesFilter) ([]*domain.Resource, error) { ret := _m.Called(_a0, _a1) var r0 []*domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListResourcesFilter) []*domain.Resource); ok { r0 = rf(_a0, _a1) } else { @@ -149,7 +168,6 @@ func (_m *Repository) Find(_a0 context.Context, _a1 domain.ListResourcesFilter) } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListResourcesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -165,8 +183,8 @@ type Repository_Find_Call struct { } // Find is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 domain.ListResourcesFilter +// - _a0 context.Context +// - _a1 domain.ListResourcesFilter func (_e *Repository_Expecter) Find(_a0 interface{}, _a1 interface{}) *Repository_Find_Call { return &Repository_Find_Call{Call: _e.mock.On("Find", _a0, _a1)} } @@ -183,11 +201,20 @@ func (_c *Repository_Find_Call) Return(_a0 []*domain.Resource, _a1 error) *Repos return _c } +func (_c *Repository_Find_Call) RunAndReturn(run func(context.Context, domain.ListResourcesFilter) ([]*domain.Resource, error)) *Repository_Find_Call { + _c.Call.Return(run) + return _c +} + // GetOne provides a mock function with given fields: ctx, id func (_m *Repository) GetOne(ctx context.Context, id string) (*domain.Resource, error) { ret := _m.Called(ctx, id) var r0 *domain.Resource + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*domain.Resource, error)); ok { + return rf(ctx, id) + } if rf, ok := ret.Get(0).(func(context.Context, string) *domain.Resource); ok { r0 = rf(ctx, id) } else { @@ -196,7 +223,6 @@ func (_m *Repository) GetOne(ctx context.Context, id string) (*domain.Resource, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, id) } else { @@ -212,8 +238,8 @@ type Repository_GetOne_Call struct { } // GetOne is a helper method to define mock.On call -// - ctx context.Context -// - id string +// - ctx context.Context +// - id string func (_e *Repository_Expecter) GetOne(ctx interface{}, id interface{}) *Repository_GetOne_Call { return &Repository_GetOne_Call{Call: _e.mock.On("GetOne", ctx, id)} } @@ -230,6 +256,11 @@ func (_c *Repository_GetOne_Call) Return(_a0 *domain.Resource, _a1 error) *Repos return _c } +func (_c *Repository_GetOne_Call) RunAndReturn(run func(context.Context, string) (*domain.Resource, error)) *Repository_GetOne_Call { + _c.Call.Return(run) + return _c +} + // Update provides a mock function with given fields: _a0, _a1 func (_m *Repository) Update(_a0 context.Context, _a1 *domain.Resource) error { ret := _m.Called(_a0, _a1) @@ -250,8 +281,8 @@ type Repository_Update_Call struct { } // Update is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *domain.Resource +// - _a0 context.Context +// - _a1 *domain.Resource func (_e *Repository_Expecter) Update(_a0 interface{}, _a1 interface{}) *Repository_Update_Call { return &Repository_Update_Call{Call: _e.mock.On("Update", _a0, _a1)} } @@ -267,3 +298,22 @@ func (_c *Repository_Update_Call) Return(_a0 error) *Repository_Update_Call { _c.Call.Return(_a0) return _c } + +func (_c *Repository_Update_Call) RunAndReturn(run func(context.Context, *domain.Resource) error) *Repository_Update_Call { + _c.Call.Return(run) + return _c +} + +// NewRepository creates a new instance of Repository. 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 NewRepository(t interface { + mock.TestingT + Cleanup(func()) +}) *Repository { + mock := &Repository{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/docs/docs/providers/gcs.md b/docs/docs/providers/gcs.md index d3d1e30de..10fa6afc4 100644 --- a/docs/docs/providers/gcs.md +++ b/docs/docs/providers/gcs.md @@ -66,6 +66,7 @@ urn: sample-URN credentials: service_account_key: resource_name: projects/ +resources: - type: bucket policy: id: my-first-policy diff --git a/domain/provider.go b/domain/provider.go index 1890800e4..8c27d5f57 100644 --- a/domain/provider.go +++ b/domain/provider.go @@ -23,8 +23,8 @@ const ( ProviderTypeGCS = "gcs" // ProviderTypePolicyTag is the type name for Dataplex ProviderTypePolicyTag = "dataplex" - // ProviderTypeShield is the type name for Shield auth layer provider - ProviderTypeShield = "shield" + // ProviderTypeFrontier is the type name for Frontier auth layer provider + ProviderTypeFrontier = "frontier" ) // Role is the configuration to define a role and mapping the permissions in the provider diff --git a/internal/server/config.go b/internal/server/config.go index 27b8cb40f..93f0862b9 100644 --- a/internal/server/config.go +++ b/internal/server/config.go @@ -3,6 +3,8 @@ package server import ( "errors" "fmt" + "os" + "path/filepath" "github.com/raystack/guardian/internal/store" "github.com/raystack/guardian/jobs" @@ -48,9 +50,29 @@ type Config struct { Auth Auth `mapstructure:"auth"` } -func LoadConfig(configFile string) (Config, error) { +func LoadConfig(serverConfigFileFromFlag string) (Config, error) { var cfg Config - loader := config.NewLoader(config.WithFile(configFile)) + var options []config.LoaderOption + options = append(options, config.WithName("config")) + options = append(options, config.WithEnvKeyReplacer(".", "_")) + options = append(options, config.WithEnvPrefix("GUARDIAN")) + if p, err := os.Getwd(); err == nil { + options = append(options, config.WithPath(p)) + } + if execPath, err := os.Executable(); err == nil { + options = append(options, config.WithPath(filepath.Dir(execPath))) + } + if currentHomeDir, err := os.UserHomeDir(); err == nil { + options = append(options, config.WithPath(currentHomeDir)) + options = append(options, config.WithPath(filepath.Join(currentHomeDir, ".config"))) + } + + // override all config sources and prioritize one from file + if serverConfigFileFromFlag != "" { + options = append(options, config.WithFile(serverConfigFileFromFlag)) + } + + loader := config.NewLoader(options...) if err := loader.Load(&cfg); err != nil { if errors.As(err, &config.ConfigFileNotFoundError{}) { diff --git a/internal/server/server.go b/internal/server/server.go index 957d7d46a..68b943508 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -36,10 +36,6 @@ import ( "google.golang.org/protobuf/encoding/protojson" ) -var ( - ConfigFileName = "config" -) - const ( GRPCMaxClientSendSize = 32 << 20 defaultGracePeriod = 5 * time.Second @@ -169,9 +165,10 @@ func RunServer(config *Config) error { }), ) address := fmt.Sprintf(":%d", config.Port) + grpcAddress := fmt.Sprintf(":%d", config.Port+1) grpcConn, err := grpc.DialContext( timeoutGrpcDialCtx, - address, + grpcAddress, grpc.WithInsecure(), grpc.WithDefaultCallOptions( grpc.MaxCallRecvMsgSize(GRPCMaxClientSendSize), @@ -205,7 +202,7 @@ func RunServer(config *Config) error { WriteTimeout: 120 * time.Second, MaxHeaderBytes: 1 << 20, }), - mux.WithGRPCTarget(address, grpcServer), + mux.WithGRPCTarget(grpcAddress, grpcServer), mux.WithGracePeriod(defaultGracePeriod), ) } diff --git a/internal/server/services.go b/internal/server/services.go index 5b3b33a31..1ccfa2aab 100644 --- a/internal/server/services.go +++ b/internal/server/services.go @@ -21,12 +21,12 @@ import ( "github.com/raystack/guardian/plugins/identities" "github.com/raystack/guardian/plugins/notifiers" "github.com/raystack/guardian/plugins/providers/bigquery" + "github.com/raystack/guardian/plugins/providers/frontier" "github.com/raystack/guardian/plugins/providers/gcloudiam" "github.com/raystack/guardian/plugins/providers/gcs" "github.com/raystack/guardian/plugins/providers/grafana" "github.com/raystack/guardian/plugins/providers/metabase" "github.com/raystack/guardian/plugins/providers/noop" - "github.com/raystack/guardian/plugins/providers/shield" "github.com/raystack/guardian/plugins/providers/tableau" "github.com/raystack/salt/audit" audit_repos "github.com/raystack/salt/audit/repositories" @@ -111,7 +111,7 @@ func InitServices(deps ServiceDeps) (*Services, error) { noop.NewProvider(domain.ProviderTypeNoOp, deps.Logger), gcs.NewProvider(domain.ProviderTypeGCS, deps.Crypto), dataplex.NewProvider(domain.ProviderTypePolicyTag, deps.Crypto), - shield.NewProvider(domain.ProviderTypeShield, deps.Logger), + frontier.NewProvider(domain.ProviderTypeFrontier, deps.Logger), } iamManager := identities.NewManager(deps.Crypto, deps.Validator) diff --git a/jobs/mocks/grantService.go b/jobs/mocks/grantService.go index 52249f501..a5e123878 100644 --- a/jobs/mocks/grantService.go +++ b/jobs/mocks/grantService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -16,11 +16,41 @@ type GrantService struct { mock.Mock } +// BulkRevoke provides a mock function with given fields: ctx, filter, actor, reason +func (_m *GrantService) BulkRevoke(ctx context.Context, filter domain.RevokeGrantsFilter, actor string, reason string) ([]*domain.Grant, error) { + ret := _m.Called(ctx, filter, actor, reason) + + var r0 []*domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.RevokeGrantsFilter, string, string) ([]*domain.Grant, error)); ok { + return rf(ctx, filter, actor, reason) + } + if rf, ok := ret.Get(0).(func(context.Context, domain.RevokeGrantsFilter, string, string) []*domain.Grant); ok { + r0 = rf(ctx, filter, actor, reason) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*domain.Grant) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, domain.RevokeGrantsFilter, string, string) error); ok { + r1 = rf(ctx, filter, actor, reason) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // List provides a mock function with given fields: _a0, _a1 func (_m *GrantService) List(_a0 context.Context, _a1 domain.ListGrantsFilter) ([]domain.Grant, error) { ret := _m.Called(_a0, _a1) var r0 []domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, domain.ListGrantsFilter) ([]domain.Grant, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, domain.ListGrantsFilter) []domain.Grant); ok { r0 = rf(_a0, _a1) } else { @@ -29,7 +59,6 @@ func (_m *GrantService) List(_a0 context.Context, _a1 domain.ListGrantsFilter) ( } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, domain.ListGrantsFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -51,6 +80,10 @@ func (_m *GrantService) Revoke(ctx context.Context, id string, actor string, rea ret := _m.Called(_ca...) var r0 *domain.Grant + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string, ...grant.Option) (*domain.Grant, error)); ok { + return rf(ctx, id, actor, reason, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string, ...grant.Option) *domain.Grant); ok { r0 = rf(ctx, id, actor, reason, opts...) } else { @@ -59,7 +92,6 @@ func (_m *GrantService) Revoke(ctx context.Context, id string, actor string, rea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string, ...grant.Option) error); ok { r1 = rf(ctx, id, actor, reason, opts...) } else { @@ -68,3 +100,31 @@ func (_m *GrantService) Revoke(ctx context.Context, id string, actor string, rea return r0, r1 } + +// Update provides a mock function with given fields: _a0, _a1 +func (_m *GrantService) Update(_a0 context.Context, _a1 *domain.Grant) error { + ret := _m.Called(_a0, _a1) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, *domain.Grant) error); ok { + r0 = rf(_a0, _a1) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +// NewGrantService creates a new instance of GrantService. 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 NewGrantService(t interface { + mock.TestingT + Cleanup(func()) +}) *GrantService { + mock := &GrantService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/jobs/mocks/providerService.go b/jobs/mocks/providerService.go index 422af48ee..825c6b907 100644 --- a/jobs/mocks/providerService.go +++ b/jobs/mocks/providerService.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -26,3 +26,17 @@ func (_m *ProviderService) FetchResources(_a0 context.Context) error { return r0 } + +// NewProviderService creates a new instance of ProviderService. 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 NewProviderService(t interface { + mock.TestingT + Cleanup(func()) +}) *ProviderService { + mock := &ProviderService{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/ShieldClient.go b/mocks/ShieldClient.go index aa8c547ef..37c2c09f4 100644 --- a/mocks/ShieldClient.go +++ b/mocks/ShieldClient.go @@ -3,7 +3,7 @@ package mocks import ( - shield "github.com/raystack/guardian/plugins/providers/shield" + shield "github.com/raystack/guardian/plugins/providers/frontier" mock "github.com/stretchr/testify/mock" ) diff --git a/plugins/identities/http.go b/plugins/identities/http.go index ff8f4c619..171d93151 100644 --- a/plugins/identities/http.go +++ b/plugins/identities/http.go @@ -150,7 +150,7 @@ func NewHTTPClient(config *HTTPClientConfig) (*HTTPClient, error) { httpClient = http.DefaultClient } - if config.Auth.Type == "google_idtoken" { + if config.Auth != nil && config.Auth.Type == "google_idtoken" { ctx := context.Background() ts, err := idtoken.NewTokenSource(ctx, config.Auth.Audience, idtoken.WithCredentialsJSON([]byte(config.Auth.CredentialsJSON))) if err != nil { diff --git a/plugins/identities/service.go b/plugins/identities/service.go index 655e3ec28..204015498 100644 --- a/plugins/identities/service.go +++ b/plugins/identities/service.go @@ -33,14 +33,6 @@ func (m *manager) ParseConfig(iamConfig *domain.IAMConfig) (domain.SensitiveConf clientConfig.crypto = m.crypto clientConfig.validator = m.validator return &clientConfig, nil - case domain.IAMProviderTypeShield: - var clientConfig ShieldClientConfig - if err := mapstructure.Decode(iamConfig.Config, &clientConfig); err != nil { - return nil, fmt.Errorf("%w: %s", ErrInvalidConfig, err) - } - clientConfig.crypto = m.crypto - clientConfig.validator = m.validator - return &clientConfig, nil } return nil, ErrUnknownProviderType } @@ -49,9 +41,6 @@ func (m *manager) GetClient(config domain.SensitiveConfig) (domain.IAMClient, er if clientConfig, ok := config.(*HTTPClientConfig); ok { return NewHTTPClient(clientConfig) } - if clientConfig, ok := config.(*ShieldClientConfig); ok { - return NewShieldClient(clientConfig) - } return nil, ErrInvalidConfig } diff --git a/plugins/identities/shield.go b/plugins/identities/shield.go deleted file mode 100644 index 419514550..000000000 --- a/plugins/identities/shield.go +++ /dev/null @@ -1,231 +0,0 @@ -package identities - -import ( - "bytes" - "encoding/json" - "errors" - "fmt" - "io" - "net/http" - "net/url" - - "github.com/go-playground/validator/v10" - "github.com/raystack/guardian/domain" -) - -type ShieldClientConfig struct { - Host string `mapstructure:"host" json:"host" yaml:"host" validate:"required,url"` - - validator *validator.Validate - crypto domain.Crypto -} - -func (c *ShieldClientConfig) Validate() error { - return c.validator.Struct(c) -} - -func (c *ShieldClientConfig) Encrypt() error { - return nil -} - -func (c *ShieldClientConfig) Decrypt() error { - return nil -} - -type role struct { - ID string `json:"id"` - DisplayName string `json:"displayname"` -} - -type policy struct { - Subject map[string]string `json:"subject"` - Resource map[string]string `json:"resource"` - Action map[string]string `json:"action"` -} - -type group struct { - ID string `json:"id"` - IsMember bool `json:"isMember"` - UserPolicies []policy `json:"userPolicies"` -} - -type user struct { - ID string `json:"id"` - Username string `json:"username"` - Metadata map[string]string `json:"metadata"` - - TeamLeads []string `json:"team_leads"` -} - -type shieldClient struct { - baseURL *url.URL - - teamAdminRoleID string - userEmail string - users map[string]user - - httpClient *http.Client -} - -func NewShieldClient(config *ShieldClientConfig) (*shieldClient, error) { - if err := validator.New().Struct(config); err != nil { - return nil, err - } - - baseURL, err := url.Parse(config.Host) - if err != nil { - return nil, err - } - - return &shieldClient{ - baseURL: baseURL, - httpClient: http.DefaultClient, - }, nil -} - -func (c *shieldClient) GetUser(userEmail string) (interface{}, error) { - c.userEmail = userEmail - - if c.teamAdminRoleID == "" { - roles, err := c.getRoles() - if err != nil { - return nil, err - } - - for _, r := range roles { - if r.DisplayName == "Team Admin" { - c.teamAdminRoleID = r.ID - break - } - } - if c.teamAdminRoleID == "" { - return nil, errors.New("team admin role id not found") - } - } - - groups, err := c.getGroups() - if err != nil { - return nil, err - } - - users, err := c.getUsers() - if err != nil { - return nil, err - } - if c.users == nil { - c.users = map[string]user{} - } - - var userDetails user - for _, u := range users { - c.users[u.ID] = u - if u.Metadata["email"] == c.userEmail { - userDetails = u - } - } - - var teamLeadEmails []string - for _, g := range groups { - if g.IsMember { - for _, p := range g.UserPolicies { - teamLeadID := p.Subject["user"] - teamLeadEmail := c.users[teamLeadID].Metadata["email"] - teamLeadEmails = append(teamLeadEmails, teamLeadEmail) - } - } - } - - userDetails.TeamLeads = teamLeadEmails - - jsonBytes, err := json.Marshal(userDetails) - if err != nil { - return nil, err - } - var result map[string]interface{} - if err := json.Unmarshal(jsonBytes, &result); err != nil { - return nil, err - } - - return result, nil -} - -func (c *shieldClient) getRoles() ([]role, error) { - req, err := c.newRequest(http.MethodGet, "/api/roles", nil) - if err != nil { - return nil, err - } - - var roles []role - _, err = c.do(req, &roles) - if err != nil { - return nil, err - } - - return roles, nil -} - -func (c *shieldClient) getGroups() ([]group, error) { - url := fmt.Sprintf("/api/groups?user_role=%s", c.teamAdminRoleID) - req, err := c.newRequest(http.MethodGet, url, nil) - if err != nil { - return nil, err - } - - var groups []group - _, err = c.do(req, &groups) - if err != nil { - return nil, err - } - - return groups, nil -} - -func (c *shieldClient) getUsers() ([]user, error) { - req, err := c.newRequest(http.MethodGet, "/api/users", nil) - if err != nil { - return nil, err - } - - var users []user - _, err = c.do(req, &users) - if err != nil { - return nil, err - } - - return users, nil -} - -func (c *shieldClient) newRequest(method, path string, body interface{}) (*http.Request, error) { - u, err := c.baseURL.Parse(path) - if err != nil { - return nil, err - } - var buf io.ReadWriter - if body != nil { - buf = new(bytes.Buffer) - err := json.NewEncoder(buf).Encode(body) - if err != nil { - return nil, err - } - } - req, err := http.NewRequest(method, u.String(), buf) - if err != nil { - return nil, err - } - if body != nil { - req.Header.Set("Content-Type", "application/json") - } - req.Header.Set("Accept", "application/json") - req.Header.Set("X-Goog-Authenticated-User-Email", c.userEmail) - return req, nil -} - -func (c *shieldClient) do(req *http.Request, v interface{}) (*http.Response, error) { - resp, err := c.httpClient.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - err = json.NewDecoder(resp.Body).Decode(v) - return resp, err -} diff --git a/plugins/providers/bigquery/client.go b/plugins/providers/bigquery/client.go index 06240813a..ae10259c5 100644 --- a/plugins/providers/bigquery/client.go +++ b/plugins/providers/bigquery/client.go @@ -210,7 +210,7 @@ func (c *bigQueryClient) RevokeTableAccess(ctx context.Context, t *Table, accoun RequestedPolicyVersion: 1, }, } - policy, err := tableService.GetIamPolicy(resourceName, getIamPolicyRequest).Do() + policy, err := tableService.GetIamPolicy(resourceName, getIamPolicyRequest).Context(ctx).Do() if err != nil { return err } @@ -278,7 +278,7 @@ func (c *bigQueryClient) ListAccess(ctx context.Context, resources []*domain.Res getIamPolicyRequest := &bqApi.GetIamPolicyRequest{ Options: &bqApi.GetPolicyOptions{RequestedPolicyVersion: 1}, } - policy, err := c.apiClient.Tables.GetIamPolicy(resourceName, getIamPolicyRequest).Do() + policy, err := c.apiClient.Tables.GetIamPolicy(resourceName, getIamPolicyRequest).Context(ctx).Do() if err != nil { return nil, fmt.Errorf("getting table access entries of %q, %w", r.URN, err) } diff --git a/plugins/providers/bigquery/mocks/BigQueryClient.go b/plugins/providers/bigquery/mocks/BigQueryClient.go index e395df058..9cd9534d7 100644 --- a/plugins/providers/bigquery/mocks/BigQueryClient.go +++ b/plugins/providers/bigquery/mocks/BigQueryClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -32,6 +32,10 @@ func (_m *BigQueryClient) GetDatasets(_a0 context.Context) ([]*bigquery.Dataset, ret := _m.Called(_a0) var r0 []*bigquery.Dataset + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]*bigquery.Dataset, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(context.Context) []*bigquery.Dataset); ok { r0 = rf(_a0) } else { @@ -40,7 +44,6 @@ func (_m *BigQueryClient) GetDatasets(_a0 context.Context) ([]*bigquery.Dataset, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(_a0) } else { @@ -56,7 +59,7 @@ type BigQueryClient_GetDatasets_Call struct { } // GetDatasets is a helper method to define mock.On call -// - _a0 context.Context +// - _a0 context.Context func (_e *BigQueryClient_Expecter) GetDatasets(_a0 interface{}) *BigQueryClient_GetDatasets_Call { return &BigQueryClient_GetDatasets_Call{Call: _e.mock.On("GetDatasets", _a0)} } @@ -73,11 +76,20 @@ func (_c *BigQueryClient_GetDatasets_Call) Return(_a0 []*bigquery.Dataset, _a1 e return _c } +func (_c *BigQueryClient_GetDatasets_Call) RunAndReturn(run func(context.Context) ([]*bigquery.Dataset, error)) *BigQueryClient_GetDatasets_Call { + _c.Call.Return(run) + return _c +} + // GetRolePermissions provides a mock function with given fields: _a0, _a1 func (_m *BigQueryClient) GetRolePermissions(_a0 context.Context, _a1 string) ([]string, error) { ret := _m.Called(_a0, _a1) var r0 []string + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]string, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, string) []string); ok { r0 = rf(_a0, _a1) } else { @@ -86,7 +98,6 @@ func (_m *BigQueryClient) GetRolePermissions(_a0 context.Context, _a1 string) ([ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -102,8 +113,8 @@ type BigQueryClient_GetRolePermissions_Call struct { } // GetRolePermissions is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 string +// - _a0 context.Context +// - _a1 string func (_e *BigQueryClient_Expecter) GetRolePermissions(_a0 interface{}, _a1 interface{}) *BigQueryClient_GetRolePermissions_Call { return &BigQueryClient_GetRolePermissions_Call{Call: _e.mock.On("GetRolePermissions", _a0, _a1)} } @@ -120,11 +131,20 @@ func (_c *BigQueryClient_GetRolePermissions_Call) Return(_a0 []string, _a1 error return _c } +func (_c *BigQueryClient_GetRolePermissions_Call) RunAndReturn(run func(context.Context, string) ([]string, error)) *BigQueryClient_GetRolePermissions_Call { + _c.Call.Return(run) + return _c +} + // GetTables provides a mock function with given fields: ctx, datasetID func (_m *BigQueryClient) GetTables(ctx context.Context, datasetID string) ([]*bigquery.Table, error) { ret := _m.Called(ctx, datasetID) var r0 []*bigquery.Table + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]*bigquery.Table, error)); ok { + return rf(ctx, datasetID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []*bigquery.Table); ok { r0 = rf(ctx, datasetID) } else { @@ -133,7 +153,6 @@ func (_m *BigQueryClient) GetTables(ctx context.Context, datasetID string) ([]*b } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, datasetID) } else { @@ -149,8 +168,8 @@ type BigQueryClient_GetTables_Call struct { } // GetTables is a helper method to define mock.On call -// - ctx context.Context -// - datasetID string +// - ctx context.Context +// - datasetID string func (_e *BigQueryClient_Expecter) GetTables(ctx interface{}, datasetID interface{}) *BigQueryClient_GetTables_Call { return &BigQueryClient_GetTables_Call{Call: _e.mock.On("GetTables", ctx, datasetID)} } @@ -167,6 +186,11 @@ func (_c *BigQueryClient_GetTables_Call) Return(_a0 []*bigquery.Table, _a1 error return _c } +func (_c *BigQueryClient_GetTables_Call) RunAndReturn(run func(context.Context, string) ([]*bigquery.Table, error)) *BigQueryClient_GetTables_Call { + _c.Call.Return(run) + return _c +} + // GrantDatasetAccess provides a mock function with given fields: ctx, d, user, role func (_m *BigQueryClient) GrantDatasetAccess(ctx context.Context, d *bigquery.Dataset, user string, role string) error { ret := _m.Called(ctx, d, user, role) @@ -187,10 +211,10 @@ type BigQueryClient_GrantDatasetAccess_Call struct { } // GrantDatasetAccess is a helper method to define mock.On call -// - ctx context.Context -// - d *bigquery.Dataset -// - user string -// - role string +// - ctx context.Context +// - d *bigquery.Dataset +// - user string +// - role string func (_e *BigQueryClient_Expecter) GrantDatasetAccess(ctx interface{}, d interface{}, user interface{}, role interface{}) *BigQueryClient_GrantDatasetAccess_Call { return &BigQueryClient_GrantDatasetAccess_Call{Call: _e.mock.On("GrantDatasetAccess", ctx, d, user, role)} } @@ -207,6 +231,11 @@ func (_c *BigQueryClient_GrantDatasetAccess_Call) Return(_a0 error) *BigQueryCli return _c } +func (_c *BigQueryClient_GrantDatasetAccess_Call) RunAndReturn(run func(context.Context, *bigquery.Dataset, string, string) error) *BigQueryClient_GrantDatasetAccess_Call { + _c.Call.Return(run) + return _c +} + // GrantTableAccess provides a mock function with given fields: ctx, t, accountType, accountID, role func (_m *BigQueryClient) GrantTableAccess(ctx context.Context, t *bigquery.Table, accountType string, accountID string, role string) error { ret := _m.Called(ctx, t, accountType, accountID, role) @@ -227,11 +256,11 @@ type BigQueryClient_GrantTableAccess_Call struct { } // GrantTableAccess is a helper method to define mock.On call -// - ctx context.Context -// - t *bigquery.Table -// - accountType string -// - accountID string -// - role string +// - ctx context.Context +// - t *bigquery.Table +// - accountType string +// - accountID string +// - role string func (_e *BigQueryClient_Expecter) GrantTableAccess(ctx interface{}, t interface{}, accountType interface{}, accountID interface{}, role interface{}) *BigQueryClient_GrantTableAccess_Call { return &BigQueryClient_GrantTableAccess_Call{Call: _e.mock.On("GrantTableAccess", ctx, t, accountType, accountID, role)} } @@ -248,11 +277,20 @@ func (_c *BigQueryClient_GrantTableAccess_Call) Return(_a0 error) *BigQueryClien return _c } +func (_c *BigQueryClient_GrantTableAccess_Call) RunAndReturn(run func(context.Context, *bigquery.Table, string, string, string) error) *BigQueryClient_GrantTableAccess_Call { + _c.Call.Return(run) + return _c +} + // ListAccess provides a mock function with given fields: ctx, resources func (_m *BigQueryClient) ListAccess(ctx context.Context, resources []*domain.Resource) (domain.MapResourceAccess, error) { ret := _m.Called(ctx, resources) var r0 domain.MapResourceAccess + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, []*domain.Resource) (domain.MapResourceAccess, error)); ok { + return rf(ctx, resources) + } if rf, ok := ret.Get(0).(func(context.Context, []*domain.Resource) domain.MapResourceAccess); ok { r0 = rf(ctx, resources) } else { @@ -261,7 +299,6 @@ func (_m *BigQueryClient) ListAccess(ctx context.Context, resources []*domain.Re } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, []*domain.Resource) error); ok { r1 = rf(ctx, resources) } else { @@ -277,8 +314,8 @@ type BigQueryClient_ListAccess_Call struct { } // ListAccess is a helper method to define mock.On call -// - ctx context.Context -// - resources []*domain.Resource +// - ctx context.Context +// - resources []*domain.Resource func (_e *BigQueryClient_Expecter) ListAccess(ctx interface{}, resources interface{}) *BigQueryClient_ListAccess_Call { return &BigQueryClient_ListAccess_Call{Call: _e.mock.On("ListAccess", ctx, resources)} } @@ -295,18 +332,26 @@ func (_c *BigQueryClient_ListAccess_Call) Return(_a0 domain.MapResourceAccess, _ return _c } +func (_c *BigQueryClient_ListAccess_Call) RunAndReturn(run func(context.Context, []*domain.Resource) (domain.MapResourceAccess, error)) *BigQueryClient_ListAccess_Call { + _c.Call.Return(run) + return _c +} + // ResolveDatasetRole provides a mock function with given fields: role func (_m *BigQueryClient) ResolveDatasetRole(role string) (gobigquery.AccessRole, error) { ret := _m.Called(role) var r0 gobigquery.AccessRole + var r1 error + if rf, ok := ret.Get(0).(func(string) (gobigquery.AccessRole, error)); ok { + return rf(role) + } if rf, ok := ret.Get(0).(func(string) gobigquery.AccessRole); ok { r0 = rf(role) } else { r0 = ret.Get(0).(gobigquery.AccessRole) } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(role) } else { @@ -322,7 +367,7 @@ type BigQueryClient_ResolveDatasetRole_Call struct { } // ResolveDatasetRole is a helper method to define mock.On call -// - role string +// - role string func (_e *BigQueryClient_Expecter) ResolveDatasetRole(role interface{}) *BigQueryClient_ResolveDatasetRole_Call { return &BigQueryClient_ResolveDatasetRole_Call{Call: _e.mock.On("ResolveDatasetRole", role)} } @@ -339,6 +384,11 @@ func (_c *BigQueryClient_ResolveDatasetRole_Call) Return(_a0 gobigquery.AccessRo return _c } +func (_c *BigQueryClient_ResolveDatasetRole_Call) RunAndReturn(run func(string) (gobigquery.AccessRole, error)) *BigQueryClient_ResolveDatasetRole_Call { + _c.Call.Return(run) + return _c +} + // RevokeDatasetAccess provides a mock function with given fields: ctx, d, user, role func (_m *BigQueryClient) RevokeDatasetAccess(ctx context.Context, d *bigquery.Dataset, user string, role string) error { ret := _m.Called(ctx, d, user, role) @@ -359,10 +409,10 @@ type BigQueryClient_RevokeDatasetAccess_Call struct { } // RevokeDatasetAccess is a helper method to define mock.On call -// - ctx context.Context -// - d *bigquery.Dataset -// - user string -// - role string +// - ctx context.Context +// - d *bigquery.Dataset +// - user string +// - role string func (_e *BigQueryClient_Expecter) RevokeDatasetAccess(ctx interface{}, d interface{}, user interface{}, role interface{}) *BigQueryClient_RevokeDatasetAccess_Call { return &BigQueryClient_RevokeDatasetAccess_Call{Call: _e.mock.On("RevokeDatasetAccess", ctx, d, user, role)} } @@ -379,6 +429,11 @@ func (_c *BigQueryClient_RevokeDatasetAccess_Call) Return(_a0 error) *BigQueryCl return _c } +func (_c *BigQueryClient_RevokeDatasetAccess_Call) RunAndReturn(run func(context.Context, *bigquery.Dataset, string, string) error) *BigQueryClient_RevokeDatasetAccess_Call { + _c.Call.Return(run) + return _c +} + // RevokeTableAccess provides a mock function with given fields: ctx, t, accountType, accountID, role func (_m *BigQueryClient) RevokeTableAccess(ctx context.Context, t *bigquery.Table, accountType string, accountID string, role string) error { ret := _m.Called(ctx, t, accountType, accountID, role) @@ -399,11 +454,11 @@ type BigQueryClient_RevokeTableAccess_Call struct { } // RevokeTableAccess is a helper method to define mock.On call -// - ctx context.Context -// - t *bigquery.Table -// - accountType string -// - accountID string -// - role string +// - ctx context.Context +// - t *bigquery.Table +// - accountType string +// - accountID string +// - role string func (_e *BigQueryClient_Expecter) RevokeTableAccess(ctx interface{}, t interface{}, accountType interface{}, accountID interface{}, role interface{}) *BigQueryClient_RevokeTableAccess_Call { return &BigQueryClient_RevokeTableAccess_Call{Call: _e.mock.On("RevokeTableAccess", ctx, t, accountType, accountID, role)} } @@ -419,3 +474,22 @@ func (_c *BigQueryClient_RevokeTableAccess_Call) Return(_a0 error) *BigQueryClie _c.Call.Return(_a0) return _c } + +func (_c *BigQueryClient_RevokeTableAccess_Call) RunAndReturn(run func(context.Context, *bigquery.Table, string, string, string) error) *BigQueryClient_RevokeTableAccess_Call { + _c.Call.Return(run) + return _c +} + +// NewBigQueryClient creates a new instance of BigQueryClient. 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 NewBigQueryClient(t interface { + mock.TestingT + Cleanup(func()) +}) *BigQueryClient { + mock := &BigQueryClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/plugins/providers/bigquery/mocks/cloudLoggingClientI.go b/plugins/providers/bigquery/mocks/cloudLoggingClientI.go index bd2fb83dc..fac4d8135 100644 --- a/plugins/providers/bigquery/mocks/cloudLoggingClientI.go +++ b/plugins/providers/bigquery/mocks/cloudLoggingClientI.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -59,11 +59,20 @@ func (_c *CloudLoggingClientI_Close_Call) Return(_a0 error) *CloudLoggingClientI return _c } +func (_c *CloudLoggingClientI_Close_Call) RunAndReturn(run func() error) *CloudLoggingClientI_Close_Call { + _c.Call.Return(run) + return _c +} + // ListLogEntries provides a mock function with given fields: _a0, _a1 func (_m *CloudLoggingClientI) ListLogEntries(_a0 context.Context, _a1 bigquery.ImportActivitiesFilter) ([]*bigquery.Activity, error) { ret := _m.Called(_a0, _a1) var r0 []*bigquery.Activity + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, bigquery.ImportActivitiesFilter) ([]*bigquery.Activity, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, bigquery.ImportActivitiesFilter) []*bigquery.Activity); ok { r0 = rf(_a0, _a1) } else { @@ -72,7 +81,6 @@ func (_m *CloudLoggingClientI) ListLogEntries(_a0 context.Context, _a1 bigquery. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, bigquery.ImportActivitiesFilter) error); ok { r1 = rf(_a0, _a1) } else { @@ -88,8 +96,8 @@ type CloudLoggingClientI_ListLogEntries_Call struct { } // ListLogEntries is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 bigquery.ImportActivitiesFilter +// - _a0 context.Context +// - _a1 bigquery.ImportActivitiesFilter func (_e *CloudLoggingClientI_Expecter) ListLogEntries(_a0 interface{}, _a1 interface{}) *CloudLoggingClientI_ListLogEntries_Call { return &CloudLoggingClientI_ListLogEntries_Call{Call: _e.mock.On("ListLogEntries", _a0, _a1)} } @@ -105,3 +113,22 @@ func (_c *CloudLoggingClientI_ListLogEntries_Call) Return(_a0 []*bigquery.Activi _c.Call.Return(_a0, _a1) return _c } + +func (_c *CloudLoggingClientI_ListLogEntries_Call) RunAndReturn(run func(context.Context, bigquery.ImportActivitiesFilter) ([]*bigquery.Activity, error)) *CloudLoggingClientI_ListLogEntries_Call { + _c.Call.Return(run) + return _c +} + +// NewCloudLoggingClientI creates a new instance of CloudLoggingClientI. 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 NewCloudLoggingClientI(t interface { + mock.TestingT + Cleanup(func()) +}) *CloudLoggingClientI { + mock := &CloudLoggingClientI{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/plugins/providers/bigquery/mocks/encryptor.go b/plugins/providers/bigquery/mocks/encryptor.go index 2c9fd72dc..3aca60d03 100644 --- a/plugins/providers/bigquery/mocks/encryptor.go +++ b/plugins/providers/bigquery/mocks/encryptor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -22,13 +22,16 @@ func (_m *Encryptor) Decrypt(_a0 string) (string, error) { ret := _m.Called(_a0) var r0 string + var r1 error + if rf, ok := ret.Get(0).(func(string) (string, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(string) string); ok { r0 = rf(_a0) } else { r0 = ret.Get(0).(string) } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(_a0) } else { @@ -44,7 +47,7 @@ type Encryptor_Decrypt_Call struct { } // Decrypt is a helper method to define mock.On call -// - _a0 string +// - _a0 string func (_e *Encryptor_Expecter) Decrypt(_a0 interface{}) *Encryptor_Decrypt_Call { return &Encryptor_Decrypt_Call{Call: _e.mock.On("Decrypt", _a0)} } @@ -61,18 +64,26 @@ func (_c *Encryptor_Decrypt_Call) Return(_a0 string, _a1 error) *Encryptor_Decry return _c } +func (_c *Encryptor_Decrypt_Call) RunAndReturn(run func(string) (string, error)) *Encryptor_Decrypt_Call { + _c.Call.Return(run) + return _c +} + // Encrypt provides a mock function with given fields: _a0 func (_m *Encryptor) Encrypt(_a0 string) (string, error) { ret := _m.Called(_a0) var r0 string + var r1 error + if rf, ok := ret.Get(0).(func(string) (string, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(string) string); ok { r0 = rf(_a0) } else { r0 = ret.Get(0).(string) } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(_a0) } else { @@ -88,7 +99,7 @@ type Encryptor_Encrypt_Call struct { } // Encrypt is a helper method to define mock.On call -// - _a0 string +// - _a0 string func (_e *Encryptor_Expecter) Encrypt(_a0 interface{}) *Encryptor_Encrypt_Call { return &Encryptor_Encrypt_Call{Call: _e.mock.On("Encrypt", _a0)} } @@ -104,3 +115,22 @@ func (_c *Encryptor_Encrypt_Call) Return(_a0 string, _a1 error) *Encryptor_Encry _c.Call.Return(_a0, _a1) return _c } + +func (_c *Encryptor_Encrypt_Call) RunAndReturn(run func(string) (string, error)) *Encryptor_Encrypt_Call { + _c.Call.Return(run) + return _c +} + +// NewEncryptor creates a new instance of Encryptor. 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 NewEncryptor(t interface { + mock.TestingT + Cleanup(func()) +}) *Encryptor { + mock := &Encryptor{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/plugins/providers/shield/client.go b/plugins/providers/frontier/client.go similarity index 97% rename from plugins/providers/shield/client.go rename to plugins/providers/frontier/client.go index 7c6268083..670e6eb78 100644 --- a/plugins/providers/shield/client.go +++ b/plugins/providers/frontier/client.go @@ -1,4 +1,4 @@ -package shield +package frontier import ( "bytes" @@ -17,10 +17,10 @@ import ( ) const ( - groupsEndpoint = "/admin/v1beta1/groups" - projectsEndpoint = "/admin/v1beta1/projects" - organizationEndpoint = "/admin/v1beta1/organizations" - selfUserEndpoint = "admin/v1beta1/users/self" + groupsEndpoint = "/v1beta1/groups" + projectsEndpoint = "/v1beta1/projects" + organizationEndpoint = "/v1beta1/organizations" + selfUserEndpoint = "/v1beta1/users/self" groupsConst = "groups" projectsConst = "projects" @@ -31,7 +31,7 @@ const ( type successAccess interface{} -type ShieldClient interface { +type Client interface { GetTeams() ([]*Team, error) GetProjects() ([]*Project, error) GetOrganizations() ([]*Organization, error) diff --git a/plugins/providers/shield/client_test.go b/plugins/providers/frontier/client_test.go similarity index 88% rename from plugins/providers/shield/client_test.go rename to plugins/providers/frontier/client_test.go index 449b0fe2d..a532bfd54 100644 --- a/plugins/providers/shield/client_test.go +++ b/plugins/providers/frontier/client_test.go @@ -1,4 +1,4 @@ -package shield_test +package frontier_test import ( "bytes" @@ -14,29 +14,29 @@ import ( "github.com/raystack/salt/log" "github.com/raystack/guardian/mocks" - "github.com/raystack/guardian/plugins/providers/shield" + "github.com/raystack/guardian/plugins/providers/frontier" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) func TestNewClient(t *testing.T) { t.Run("should return error if config is invalid", func(t *testing.T) { - invalidConfig := &shield.ClientConfig{} + invalidConfig := &frontier.ClientConfig{} logger := log.NewLogrus(log.LogrusWithLevel("info")) - actualClient, actualError := shield.NewClient(invalidConfig, logger) + actualClient, actualError := frontier.NewClient(invalidConfig, logger) assert.Nil(t, actualClient) assert.Error(t, actualError) }) t.Run("should return error if config.Host is not a valid url", func(t *testing.T) { - invalidHostConfig := &shield.ClientConfig{ + invalidHostConfig := &frontier.ClientConfig{ AuthHeader: "X-Auth-Email", AuthEmail: "test-email", Host: "invalid-url", } logger := log.NewLogrus(log.LogrusWithLevel("info")) - actualClient, actualError := shield.NewClient(invalidHostConfig, logger) + actualClient, actualError := frontier.NewClient(invalidHostConfig, logger) assert.Nil(t, actualClient) assert.Error(t, actualError) @@ -45,7 +45,7 @@ func TestNewClient(t *testing.T) { t.Run("should return client and nil error on success", func(t *testing.T) { // TODO: test http request execution mockHttpClient := new(mocks.HTTPClient) - config := &shield.ClientConfig{ + config := &frontier.ClientConfig{ AuthHeader: "X-Auth-Email", AuthEmail: "test_email", Host: "http://localhost", @@ -53,7 +53,7 @@ func TestNewClient(t *testing.T) { } logger := log.NewLogrus(log.LogrusWithLevel("info")) - _, actualError := shield.NewClient(config, logger) + _, actualError := frontier.NewClient(config, logger) mockHttpClient.AssertExpectations(t) assert.Nil(t, actualError) }) @@ -63,7 +63,7 @@ type ClientTestSuite struct { suite.Suite mockHttpClient *mocks.HTTPClient - client shield.ShieldClient + client frontier.Client authHeader string auth string host string @@ -80,7 +80,7 @@ func (s *ClientTestSuite) setup() { s.host = "http://localhost" s.auth = "shield_admin" s.authHeader = "X-Auth-Email" - client, err := shield.NewClient(&shield.ClientConfig{ + client, err := frontier.NewClient(&frontier.ClientConfig{ AuthHeader: s.authHeader, AuthEmail: s.auth, Host: s.host, @@ -120,7 +120,7 @@ func (s *ClientTestSuite) TestGetTeams() { s.Run("should get teams and nil error on success", func() { s.setup() - testRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/groups", nil, "") + testRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/groups", nil, "") s.Require().NoError(err) teamResponseJSON := `{ @@ -156,13 +156,13 @@ func (s *ClientTestSuite) TestGetTeams() { teamResponse := http.Response{StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader([]byte(teamResponseJSON)))} s.mockHttpClient.On("Do", testRequest).Return(&teamResponse, nil).Once() - expectedTeams := []shield.Team{ + expectedTeams := []frontier.Team{ { ID: "team_id_1", Name: "team_1", Slug: "team_1", OrgId: "org_id_1", - Metadata: shield.Metadata{ + Metadata: frontier.Metadata{ Email: "team_1@email.com", Privacy: "public", Slack: "@team_1", @@ -174,7 +174,7 @@ func (s *ClientTestSuite) TestGetTeams() { Name: "team_2", Slug: "team_2", OrgId: "org_id_1", - Metadata: shield.Metadata{ + Metadata: frontier.Metadata{ Email: "team_2@email.com", Privacy: "public", Slack: "@team_2", @@ -183,10 +183,10 @@ func (s *ClientTestSuite) TestGetTeams() { }, } - testAdminsRequest1, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/groups/team_id_1/admins", nil, "") + testAdminsRequest1, err := s.getTestRequest(http.MethodGet, "/v1beta1/groups/team_id_1/admins", nil, "") s.Require().NoError(err) - testAdminsRequest2, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/groups/team_id_2/admins", nil, "") + testAdminsRequest2, err := s.getTestRequest(http.MethodGet, "/v1beta1/groups/team_id_2/admins", nil, "") s.Require().NoError(err) teamAdminResponse := `{ @@ -211,7 +211,7 @@ func (s *ClientTestSuite) TestGetTeams() { s.mockHttpClient.On("Do", testAdminsRequest2).Return(&teamAdminResponse2, nil).Once() result, err1 := s.client.GetTeams() - var teams []shield.Team + var teams []frontier.Team for _, team := range result { teams = append(teams, *team) } @@ -224,7 +224,7 @@ func (s *ClientTestSuite) TestGetProjects() { s.Run("should get projects and nil error on success", func() { s.setup() - testRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/projects", nil, "") + testRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/projects", nil, "") s.Require().NoError(err) projectResponseJSON := `{ @@ -247,7 +247,7 @@ func (s *ClientTestSuite) TestGetProjects() { projectResponse := http.Response{StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader([]byte(projectResponseJSON)))} s.mockHttpClient.On("Do", testRequest).Return(&projectResponse, nil).Once() - expectedProjects := []shield.Project{ + expectedProjects := []frontier.Project{ { ID: "project_id_1", Name: "project_1", @@ -257,7 +257,7 @@ func (s *ClientTestSuite) TestGetProjects() { }, } - testAdminsRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/projects/project_id_1/admins", nil, "") + testAdminsRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/projects/project_id_1/admins", nil, "") s.Require().NoError(err) projectAdminResponse := `{ @@ -280,7 +280,7 @@ func (s *ClientTestSuite) TestGetProjects() { s.mockHttpClient.On("Do", testAdminsRequest).Return(&projectAdminResponse1, nil).Once() result, err1 := s.client.GetProjects() - var projects []shield.Project + var projects []frontier.Project for _, project := range result { projects = append(projects, *project) } @@ -293,7 +293,7 @@ func (s *ClientTestSuite) TestGetOrganizations() { s.Run("should get organizations and nil error on success", func() { s.setup() - testRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/organizations", nil, "") + testRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/organizations", nil, "") s.Require().NoError(err) organizationsResponseJSON := `{ @@ -314,7 +314,7 @@ func (s *ClientTestSuite) TestGetOrganizations() { orgResponse := http.Response{StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader([]byte(organizationsResponseJSON)))} s.mockHttpClient.On("Do", testRequest).Return(&orgResponse, nil).Once() - expectedOrganizations := []shield.Organization{ + expectedOrganizations := []frontier.Organization{ { ID: "org_id_1", Name: "org_1", @@ -323,7 +323,7 @@ func (s *ClientTestSuite) TestGetOrganizations() { }, } - testAdminsRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/organizations/org_id_1/admins", nil, "") + testAdminsRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/organizations/org_id_1/admins", nil, "") s.Require().NoError(err) orgAdminResponse := `{ @@ -346,7 +346,7 @@ func (s *ClientTestSuite) TestGetOrganizations() { s.mockHttpClient.On("Do", testAdminsRequest).Return(&orgAdminResponse1, nil).Once() result, err1 := s.client.GetOrganizations() - var orgs []shield.Organization + var orgs []frontier.Organization for _, org := range result { orgs = append(orgs, *org) } @@ -364,8 +364,8 @@ func (s *ClientTestSuite) TestGrantTeamAccess() { body := make(map[string][]string) body["userIds"] = append(body["userIds"], testUserId) - var teamObj *shield.Team - teamObj = new(shield.Team) + var teamObj *frontier.Team + teamObj = new(frontier.Team) teamObj.ID = "test_team_id" role := "users" @@ -403,8 +403,8 @@ func (s *ClientTestSuite) TestGrantProjectAccess() { body := make(map[string][]string) body["userIds"] = append(body["userIds"], testUserId) - var projectObj *shield.Project - projectObj = new(shield.Project) + var projectObj *frontier.Project + projectObj = new(frontier.Project) projectObj.ID = "test_project_id" role := "admins" @@ -441,8 +441,8 @@ func (s *ClientTestSuite) TestGrantOrganizationAccess() { body := make(map[string][]string) body["userIds"] = append(body["userIds"], testUserId) - var orgObj *shield.Organization - orgObj = new(shield.Organization) + var orgObj *frontier.Organization + orgObj = new(frontier.Organization) orgObj.ID = "test_org_id" role := "admins" @@ -479,8 +479,8 @@ func (s *ClientTestSuite) TestRevokeTeamAccess() { body := make(map[string][]string) body["userIds"] = append(body["userIds"], testUserId) - var teamObj *shield.Team - teamObj = new(shield.Team) + var teamObj *frontier.Team + teamObj = new(frontier.Team) teamObj.ID = "test_team_id" role := "users" @@ -506,8 +506,8 @@ func (s *ClientTestSuite) TestRevokeProjectAccess() { body := make(map[string][]string) body["userIds"] = append(body["userIds"], testUserId) - var projectObj *shield.Project - projectObj = new(shield.Project) + var projectObj *frontier.Project + projectObj = new(frontier.Project) projectObj.ID = "test_project_id" role := "admins" @@ -532,8 +532,8 @@ func (s *ClientTestSuite) TestRevokeOrganizationAccess() { body := make(map[string][]string) body["userIds"] = append(body["userIds"], testUserId) - var orgObj *shield.Organization - orgObj = new(shield.Organization) + var orgObj *frontier.Organization + orgObj = new(frontier.Organization) orgObj.ID = "test_org_id" role := "admins" @@ -555,7 +555,7 @@ func (s *ClientTestSuite) TestGetSelfUser() { s.setup() testUserEmail := "" - testGetSelfRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/users/self", nil, testUserEmail) + testGetSelfRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/users/self", nil, testUserEmail) s.Require().NoError(err) responseJson := `{ @@ -574,7 +574,7 @@ func (s *ClientTestSuite) TestGetSelfUser() { s.setup() testUserEmail := "test_user@email.com" - testGetSelfRequest, err := s.getTestRequest(http.MethodGet, "/admin/v1beta1/users/self", nil, testUserEmail) + testGetSelfRequest, err := s.getTestRequest(http.MethodGet, "/v1beta1/users/self", nil, testUserEmail) s.Require().NoError(err) responseJson := `{ @@ -594,7 +594,7 @@ func (s *ClientTestSuite) TestGetSelfUser() { responseUser := http.Response{StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader([]byte(responseJson)))} s.mockHttpClient.On("Do", testGetSelfRequest).Return(&responseUser, nil).Once() - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test-user-id", Name: "test-user", Email: "test_user@email.com", diff --git a/plugins/providers/shield/config.go b/plugins/providers/frontier/config.go similarity index 99% rename from plugins/providers/shield/config.go rename to plugins/providers/frontier/config.go index 89bb7587e..fa22f3074 100644 --- a/plugins/providers/shield/config.go +++ b/plugins/providers/frontier/config.go @@ -1,4 +1,4 @@ -package shield +package frontier import ( "errors" diff --git a/plugins/providers/shield/config_test.go b/plugins/providers/frontier/config_test.go similarity index 85% rename from plugins/providers/shield/config_test.go rename to plugins/providers/frontier/config_test.go index c78c8fca5..b2c3c9e25 100644 --- a/plugins/providers/shield/config_test.go +++ b/plugins/providers/frontier/config_test.go @@ -1,9 +1,9 @@ -package shield_test +package frontier_test import ( "testing" - "github.com/raystack/guardian/plugins/providers/shield" + "github.com/raystack/guardian/plugins/providers/frontier" "github.com/raystack/guardian/domain" "github.com/stretchr/testify/assert" @@ -14,7 +14,7 @@ func TestNewConfig(t *testing.T) { pc := &domain.ProviderConfig{} expectedProviderConfig := pc - c := shield.NewConfig(pc) + c := frontier.NewConfig(pc) actualProviderConfig := c.ProviderConfig assert.NotNil(t, c) @@ -23,7 +23,7 @@ func TestNewConfig(t *testing.T) { } func TestValidate(t *testing.T) { - validCredentials := shield.Credentials{ + validCredentials := frontier.Credentials{ Host: "http://localhost:1234", AuthEmail: "guardian_test@test.com", } @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { validResourceConfig := []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { Permissions: []interface{}{"users", "admins"}, @@ -39,7 +39,7 @@ func TestValidate(t *testing.T) { }, }, { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { Permissions: []interface{}{"admins"}, @@ -47,7 +47,7 @@ func TestValidate(t *testing.T) { }, }, { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, Roles: []*domain.Role{ { Permissions: []interface{}{"admins"}, @@ -58,7 +58,7 @@ func TestValidate(t *testing.T) { inValidResourcePermissionConfig := []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { Permissions: []interface{}{"member"}, @@ -66,7 +66,7 @@ func TestValidate(t *testing.T) { }, }, { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { Permissions: []interface{}{"admin"}, @@ -115,7 +115,7 @@ func TestValidate(t *testing.T) { Credentials: tc.credentials, Resources: tc.resourceConfig, } - err := shield.NewConfig(pc).ParseAndValidate() + err := frontier.NewConfig(pc).ParseAndValidate() assert.Error(t, err) }) } diff --git a/plugins/providers/shield/errors.go b/plugins/providers/frontier/errors.go similarity index 90% rename from plugins/providers/shield/errors.go rename to plugins/providers/frontier/errors.go index 39d3d3de9..21c81b2ba 100644 --- a/plugins/providers/shield/errors.go +++ b/plugins/providers/frontier/errors.go @@ -1,4 +1,4 @@ -package shield +package frontier import "errors" diff --git a/plugins/providers/shield/provider.go b/plugins/providers/frontier/provider.go similarity index 97% rename from plugins/providers/shield/provider.go rename to plugins/providers/frontier/provider.go index dd20e26c7..a95727826 100644 --- a/plugins/providers/shield/provider.go +++ b/plugins/providers/frontier/provider.go @@ -1,4 +1,4 @@ -package shield +package frontier import ( "github.com/mitchellh/mapstructure" @@ -7,12 +7,13 @@ import ( "github.com/raystack/salt/log" ) +// TODO: fix this to use latest frontier APIs type provider struct { pv.UnimplementedClient pv.PermissionManager typeName string - Clients map[string]ShieldClient + Clients map[string]Client logger log.Logger } @@ -25,7 +26,7 @@ func (p *provider) GetAccountTypes() []string { func NewProvider(typeName string, logger log.Logger) *provider { return &provider{ typeName: typeName, - Clients: map[string]ShieldClient{}, + Clients: map[string]Client{}, logger: logger, } } @@ -119,7 +120,7 @@ func (p *provider) addOrganizations(pc *domain.ProviderConfig, organizations []* return resources } -func (p *provider) getClient(providerURN string, credentials Credentials) (ShieldClient, error) { +func (p *provider) getClient(providerURN string, credentials Credentials) (Client, error) { if p.Clients[providerURN] != nil { return p.Clients[providerURN], nil } diff --git a/plugins/providers/shield/provider_test.go b/plugins/providers/frontier/provider_test.go similarity index 85% rename from plugins/providers/shield/provider_test.go rename to plugins/providers/frontier/provider_test.go index 1cae6691c..a702e5697 100644 --- a/plugins/providers/shield/provider_test.go +++ b/plugins/providers/frontier/provider_test.go @@ -1,4 +1,4 @@ -package shield_test +package frontier_test import ( "errors" @@ -9,16 +9,16 @@ import ( "github.com/raystack/guardian/core/provider" "github.com/raystack/guardian/domain" "github.com/raystack/guardian/mocks" - "github.com/raystack/guardian/plugins/providers/shield" + "github.com/raystack/guardian/plugins/providers/frontier" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) func TestGetType(t *testing.T) { t.Run("should return provider type name", func(t *testing.T) { - expectedTypeName := domain.ProviderTypeShield + expectedTypeName := domain.ProviderTypeFrontier logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider(expectedTypeName, logger) + p := frontier.NewProvider(expectedTypeName, logger) actualTypeName := p.GetType() @@ -31,8 +31,8 @@ func TestCreateConfig(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -41,7 +41,7 @@ func TestCreateConfig(t *testing.T) { }{ { pc: &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test-email", }, @@ -54,13 +54,13 @@ func TestCreateConfig(t *testing.T) { }, { pc: &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test-email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { ID: "member", @@ -83,8 +83,8 @@ func TestCreateConfig(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -94,14 +94,14 @@ func TestCreateConfig(t *testing.T) { }{ { pc: &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test-email", AuthHeader: "X-Auth-Email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { ID: "member", @@ -120,14 +120,14 @@ func TestCreateConfig(t *testing.T) { }, { pc: &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test-email", AuthHeader: "X-Auth-Email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { ID: "admin", @@ -142,14 +142,14 @@ func TestCreateConfig(t *testing.T) { }, { pc: &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test-email", AuthHeader: "X-Auth-Email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, Roles: []*domain.Role{ { ID: "admin", @@ -174,7 +174,7 @@ func TestCreateConfig(t *testing.T) { func TestGetResources(t *testing.T) { t.Run("should return error if credentials is invalid", func(t *testing.T) { logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) pc := &domain.ProviderConfig{ Credentials: "invalid-creds", @@ -190,8 +190,8 @@ func TestGetResources(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -200,7 +200,7 @@ func TestGetResources(t *testing.T) { Credentials: map[string]interface{}{}, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, }, }, } @@ -217,8 +217,8 @@ func TestGetResources(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -227,7 +227,7 @@ func TestGetResources(t *testing.T) { Credentials: map[string]interface{}{}, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, }, }, } @@ -244,8 +244,8 @@ func TestGetResources(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -254,7 +254,7 @@ func TestGetResources(t *testing.T) { Credentials: map[string]interface{}{}, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, }, }, } @@ -271,8 +271,8 @@ func TestGetResources(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -281,22 +281,22 @@ func TestGetResources(t *testing.T) { Credentials: map[string]interface{}{}, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, }, { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, }, { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, }, }, } - expectedTeams := []*shield.Team{ + expectedTeams := []*frontier.Team{ { ID: "team_id", Name: "team_1", OrgId: "org_id", - Metadata: shield.Metadata{ + Metadata: frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", @@ -306,7 +306,7 @@ func TestGetResources(t *testing.T) { } client.On("GetTeams").Return(expectedTeams, nil).Once() - expectedProjects := []*shield.Project{ + expectedProjects := []*frontier.Project{ { ID: "project_id", Name: "project_1", @@ -316,7 +316,7 @@ func TestGetResources(t *testing.T) { } client.On("GetProjects").Return(expectedProjects, nil).Once() - expectedOrganizations := []*shield.Organization{ + expectedOrganizations := []*frontier.Organization{ { ID: "org_id", Name: "org_1", @@ -328,7 +328,7 @@ func TestGetResources(t *testing.T) { expectedResources := []*domain.Resource{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, URN: "team:team_id", ProviderURN: providerURN, Name: "team_1", @@ -336,14 +336,14 @@ func TestGetResources(t *testing.T) { "id": "team_id", "orgId": "org_id", "admins": []string{"testTeamAdmin@gmail.com"}, - "metadata": shield.Metadata{ + "metadata": frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", }, }, }, { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, URN: "project:project_id", ProviderURN: providerURN, Name: "project_1", @@ -354,7 +354,7 @@ func TestGetResources(t *testing.T) { }, }, { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, URN: "organization:org_id", ProviderURN: providerURN, Name: "org_1", @@ -375,7 +375,7 @@ func TestGetResources(t *testing.T) { func TestGrantAccess(t *testing.T) { t.Run("should return error if credentials is invalid", func(t *testing.T) { logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) pc := &domain.ProviderConfig{ Credentials: "invalid-credentials", @@ -407,14 +407,14 @@ func TestGrantAccess(t *testing.T) { expectedError := errors.New("invalid resource type") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -423,7 +423,7 @@ func TestGrantAccess(t *testing.T) { client.On("GetSelfUser", expectedUserEmail).Return(expectedUser, nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "http://localhost/", AuthEmail: "test-email", }, @@ -460,13 +460,13 @@ func TestGrantAccess(t *testing.T) { expectedError := errors.New("client error") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -476,13 +476,13 @@ func TestGrantAccess(t *testing.T) { client.On("GrantTeamAccess", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(expectedError).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { ID: "test-role", @@ -495,14 +495,14 @@ func TestGrantAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, URN: "team:team_id", Name: "team_1", Details: map[string]interface{}{ "id": "team_id", "orgId": "456", "admins": []interface{}{"testAdmin@email.com"}, - "metadata": shield.Metadata{ + "metadata": frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", @@ -523,34 +523,34 @@ func TestGrantAccess(t *testing.T) { providerURN := "test-provider-urn" logger := log.NewLogrus(log.LogrusWithLevel("info")) client := new(mocks.ShieldClient) - expectedTeam := &shield.Team{ + expectedTeam := &frontier.Team{ Name: "team_1", ID: "team_id", } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, } expectedRole := "users" - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } client.On("GetSelfUser", expectedUserEmail).Return(expectedUser, nil).Once() client.On("GrantTeamAccess", expectedTeam, expectedUser.ID, expectedRole).Return(nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { ID: "member", @@ -563,14 +563,14 @@ func TestGrantAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, URN: "team:team_id", Name: "team_1", Details: map[string]interface{}{ "id": "team_id", "orgId": "456", "admins": []interface{}{"testAdmin@email.com"}, - "metadata": shield.Metadata{ + "metadata": frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", @@ -595,13 +595,13 @@ func TestGrantAccess(t *testing.T) { expectedError := errors.New("client error") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -611,13 +611,13 @@ func TestGrantAccess(t *testing.T) { client.On("GrantProjectAccess", mock.Anything, mock.Anything, mock.Anything).Return(expectedError).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { ID: "test-role", @@ -630,7 +630,7 @@ func TestGrantAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, URN: "project:project_id", Name: "project_1", Details: map[string]interface{}{ @@ -653,20 +653,20 @@ func TestGrantAccess(t *testing.T) { providerURN := "test-provider-urn" logger := log.NewLogrus(log.LogrusWithLevel("info")) client := new(mocks.ShieldClient) - expectedProject := &shield.Project{ + expectedProject := &frontier.Project{ Name: "project_1", ID: "project_id", } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, } expectedRole := "admins" - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -674,13 +674,13 @@ func TestGrantAccess(t *testing.T) { client.On("GrantProjectAccess", expectedProject, expectedUser.ID, expectedRole).Return(nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { ID: "admin", @@ -693,7 +693,7 @@ func TestGrantAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, URN: "project:project_id", Name: "project_1", Details: map[string]interface{}{ @@ -720,13 +720,13 @@ func TestGrantAccess(t *testing.T) { expectedError := errors.New("client error") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -736,13 +736,13 @@ func TestGrantAccess(t *testing.T) { client.On("GrantOrganizationAccess", mock.Anything, mock.Anything, mock.Anything).Return(expectedError).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, Roles: []*domain.Role{ { ID: "test-role", @@ -755,7 +755,7 @@ func TestGrantAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, URN: "organization:org_id", Name: "org_1", Details: map[string]interface{}{ @@ -777,20 +777,20 @@ func TestGrantAccess(t *testing.T) { providerURN := "test-provider-urn" logger := log.NewLogrus(log.LogrusWithLevel("info")) client := new(mocks.ShieldClient) - expectedOrganization := &shield.Organization{ + expectedOrganization := &frontier.Organization{ Name: "org_1", ID: "org_id", } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, } expectedRole := "admins" - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } @@ -798,13 +798,13 @@ func TestGrantAccess(t *testing.T) { client.On("GrantOrganizationAccess", expectedOrganization, expectedUser.ID, expectedRole).Return(nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, Roles: []*domain.Role{ { ID: "admin", @@ -817,7 +817,7 @@ func TestGrantAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, URN: "organization:org_id", Name: "org_1", Details: map[string]interface{}{ @@ -841,7 +841,7 @@ func TestGrantAccess(t *testing.T) { func TestRevokeAccess(t *testing.T) { t.Run("should return error if credentials is invalid", func(t *testing.T) { logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) pc := &domain.ProviderConfig{ Credentials: "invalid-credentials", @@ -872,14 +872,14 @@ func TestRevokeAccess(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedError := errors.New("invalid resource type") expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -888,7 +888,7 @@ func TestRevokeAccess(t *testing.T) { client.On("GetSelfUser", expectedUserEmail).Return(expectedUser, nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "http://localhost/", AuthEmail: "test_email", }, @@ -923,13 +923,13 @@ func TestRevokeAccess(t *testing.T) { expectedError := errors.New("client error") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -939,13 +939,13 @@ func TestRevokeAccess(t *testing.T) { client.On("RevokeTeamAccess", mock.Anything, mock.Anything, mock.Anything).Return(expectedError).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { ID: "test-role", @@ -958,14 +958,14 @@ func TestRevokeAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, URN: "team:team_id", Name: "team_1", Details: map[string]interface{}{ "id": "team_id", "orgId": "456", "admins": []interface{}{"testAdmin@email.com"}, - "metadata": shield.Metadata{ + "metadata": frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", @@ -986,11 +986,11 @@ func TestRevokeAccess(t *testing.T) { providerURN := "test-provider-urn" logger := log.NewLogrus(log.LogrusWithLevel("info")) client := new(mocks.ShieldClient) - expectedTeam := &shield.Team{ + expectedTeam := &frontier.Team{ Name: "team_1", ID: "team_id", OrgId: "456", - Metadata: shield.Metadata{ + Metadata: frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", @@ -999,13 +999,13 @@ func TestRevokeAccess(t *testing.T) { } expectedRole := "admins" - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -1015,13 +1015,13 @@ func TestRevokeAccess(t *testing.T) { client.On("RevokeTeamAccess", expectedTeam, expectedUser.ID, expectedRole).Return(nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, Roles: []*domain.Role{ { ID: "admin", @@ -1034,14 +1034,14 @@ func TestRevokeAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeTeam, + Type: frontier.ResourceTypeTeam, URN: "team:team_id", Name: "team_1", Details: map[string]interface{}{ "id": "team_id", "orgId": "456", "admins": []interface{}{"testAdmin@email.com"}, - "metadata": shield.Metadata{ + "metadata": frontier.Metadata{ Email: "team_1@gojek.com", Privacy: "public", Slack: "team_1_slack", @@ -1068,13 +1068,13 @@ func TestRevokeAccess(t *testing.T) { expectedError := errors.New("client error") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -1085,13 +1085,13 @@ func TestRevokeAccess(t *testing.T) { client.On("RevokeProjectAccess", mock.Anything, mock.Anything, mock.Anything).Return(expectedError).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { ID: "test-role", @@ -1104,7 +1104,7 @@ func TestRevokeAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, URN: "project:project_id", Name: "project_1", Details: map[string]interface{}{ @@ -1126,7 +1126,7 @@ func TestRevokeAccess(t *testing.T) { t.Run("should return nil error if revoking access is successful", func(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) - expectedProject := &shield.Project{ + expectedProject := &frontier.Project{ Name: "project_1", ID: "project_id", OrgId: "456", @@ -1134,14 +1134,14 @@ func TestRevokeAccess(t *testing.T) { } expectedRole := "admins" logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -1151,13 +1151,13 @@ func TestRevokeAccess(t *testing.T) { client.On("RevokeProjectAccess", expectedProject, expectedUser.ID, expectedRole).Return(nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, Roles: []*domain.Role{ { ID: "admin", @@ -1170,7 +1170,7 @@ func TestRevokeAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeProject, + Type: frontier.ResourceTypeProject, URN: "project:project_id", Name: "project_1", Details: map[string]interface{}{ @@ -1199,13 +1199,13 @@ func TestRevokeAccess(t *testing.T) { expectedError := errors.New("client error") client := new(mocks.ShieldClient) logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p := frontier.NewProvider("", logger) + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -1215,13 +1215,13 @@ func TestRevokeAccess(t *testing.T) { client.On("RevokeOrganizationAccess", mock.Anything, mock.Anything, mock.Anything).Return(expectedError).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, Roles: []*domain.Role{ { ID: "test-role", @@ -1235,7 +1235,7 @@ func TestRevokeAccess(t *testing.T) { a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, URN: "organization:org_id", Name: "org_1", Details: map[string]interface{}{ @@ -1256,20 +1256,20 @@ func TestRevokeAccess(t *testing.T) { t.Run("should return nil error if revoking access is successful", func(t *testing.T) { providerURN := "test-provider-urn" client := new(mocks.ShieldClient) - expectedOrganization := &shield.Organization{ + expectedOrganization := &frontier.Organization{ Name: "org_1", ID: "org_id", Admins: []string{"testAdmin@email.com"}, } expectedRole := "admins" logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) - p.Clients = map[string]shield.ShieldClient{ + p.Clients = map[string]frontier.Client{ providerURN: client, } expectedUserEmail := "test@email.com" - expectedUser := &shield.User{ + expectedUser := &frontier.User{ ID: "test_user_id", Name: "test_user", Email: expectedUserEmail, @@ -1279,13 +1279,13 @@ func TestRevokeAccess(t *testing.T) { client.On("RevokeOrganizationAccess", expectedOrganization, expectedUser.ID, expectedRole).Return(nil).Once() pc := &domain.ProviderConfig{ - Credentials: shield.Credentials{ + Credentials: frontier.Credentials{ Host: "localhost", AuthEmail: "test_email", }, Resources: []*domain.ResourceConfig{ { - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, Roles: []*domain.Role{ { ID: "admin", @@ -1298,7 +1298,7 @@ func TestRevokeAccess(t *testing.T) { } a := domain.Grant{ Resource: &domain.Resource{ - Type: shield.ResourceTypeOrganization, + Type: frontier.ResourceTypeOrganization, URN: "organization:org_id", Name: "org_1", Details: map[string]interface{}{ @@ -1324,7 +1324,7 @@ func TestRevokeAccess(t *testing.T) { func TestGetAccountTypes(t *testing.T) { expectedAccountType := []string{"user"} logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("", logger) + p := frontier.NewProvider("", logger) actualAccountType := p.GetAccountTypes() @@ -1334,7 +1334,7 @@ func TestGetAccountTypes(t *testing.T) { func TestGetRoles(t *testing.T) { t.Run("should return error if resource type is invalid", func(t *testing.T) { logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("shield", logger) + p := frontier.NewProvider("shield", logger) validConfig := &domain.ProviderConfig{ Type: "shield", URN: "test-URN", @@ -1373,7 +1373,7 @@ func TestGetRoles(t *testing.T) { t.Run("should return roles specified in the provider config", func(t *testing.T) { logger := log.NewLogrus(log.LogrusWithLevel("info")) - p := shield.NewProvider("shield", logger) + p := frontier.NewProvider("shield", logger) expectedRoles := []*domain.Role{ { diff --git a/plugins/providers/shield/resource.go b/plugins/providers/frontier/resource.go similarity index 99% rename from plugins/providers/shield/resource.go rename to plugins/providers/frontier/resource.go index b370b0304..6502ea37c 100644 --- a/plugins/providers/shield/resource.go +++ b/plugins/providers/frontier/resource.go @@ -1,4 +1,4 @@ -package shield +package frontier import ( "fmt" diff --git a/plugins/providers/gcloudiam/mocks/GcloudIamClient.go b/plugins/providers/gcloudiam/mocks/GcloudIamClient.go index 26aa63fdf..0e6058afb 100644 --- a/plugins/providers/gcloudiam/mocks/GcloudIamClient.go +++ b/plugins/providers/gcloudiam/mocks/GcloudIamClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *GcloudIamClient) GetRoles() ([]*gcloudiam.Role, error) { ret := _m.Called() var r0 []*gcloudiam.Role + var r1 error + if rf, ok := ret.Get(0).(func() ([]*gcloudiam.Role, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() []*gcloudiam.Role); ok { r0 = rf() } else { @@ -37,7 +41,6 @@ func (_m *GcloudIamClient) GetRoles() ([]*gcloudiam.Role, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -69,6 +72,11 @@ func (_c *GcloudIamClient_GetRoles_Call) Return(_a0 []*gcloudiam.Role, _a1 error return _c } +func (_c *GcloudIamClient_GetRoles_Call) RunAndReturn(run func() ([]*gcloudiam.Role, error)) *GcloudIamClient_GetRoles_Call { + _c.Call.Return(run) + return _c +} + // GrantAccess provides a mock function with given fields: accountType, accountID, role func (_m *GcloudIamClient) GrantAccess(accountType string, accountID string, role string) error { ret := _m.Called(accountType, accountID, role) @@ -89,9 +97,9 @@ type GcloudIamClient_GrantAccess_Call struct { } // GrantAccess is a helper method to define mock.On call -// - accountType string -// - accountID string -// - role string +// - accountType string +// - accountID string +// - role string func (_e *GcloudIamClient_Expecter) GrantAccess(accountType interface{}, accountID interface{}, role interface{}) *GcloudIamClient_GrantAccess_Call { return &GcloudIamClient_GrantAccess_Call{Call: _e.mock.On("GrantAccess", accountType, accountID, role)} } @@ -108,11 +116,20 @@ func (_c *GcloudIamClient_GrantAccess_Call) Return(_a0 error) *GcloudIamClient_G return _c } +func (_c *GcloudIamClient_GrantAccess_Call) RunAndReturn(run func(string, string, string) error) *GcloudIamClient_GrantAccess_Call { + _c.Call.Return(run) + return _c +} + // ListAccess provides a mock function with given fields: ctx, resources func (_m *GcloudIamClient) ListAccess(ctx context.Context, resources []*domain.Resource) (domain.MapResourceAccess, error) { ret := _m.Called(ctx, resources) var r0 domain.MapResourceAccess + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, []*domain.Resource) (domain.MapResourceAccess, error)); ok { + return rf(ctx, resources) + } if rf, ok := ret.Get(0).(func(context.Context, []*domain.Resource) domain.MapResourceAccess); ok { r0 = rf(ctx, resources) } else { @@ -121,7 +138,6 @@ func (_m *GcloudIamClient) ListAccess(ctx context.Context, resources []*domain.R } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, []*domain.Resource) error); ok { r1 = rf(ctx, resources) } else { @@ -137,8 +153,8 @@ type GcloudIamClient_ListAccess_Call struct { } // ListAccess is a helper method to define mock.On call -// - ctx context.Context -// - resources []*domain.Resource +// - ctx context.Context +// - resources []*domain.Resource func (_e *GcloudIamClient_Expecter) ListAccess(ctx interface{}, resources interface{}) *GcloudIamClient_ListAccess_Call { return &GcloudIamClient_ListAccess_Call{Call: _e.mock.On("ListAccess", ctx, resources)} } @@ -155,6 +171,11 @@ func (_c *GcloudIamClient_ListAccess_Call) Return(_a0 domain.MapResourceAccess, return _c } +func (_c *GcloudIamClient_ListAccess_Call) RunAndReturn(run func(context.Context, []*domain.Resource) (domain.MapResourceAccess, error)) *GcloudIamClient_ListAccess_Call { + _c.Call.Return(run) + return _c +} + // RevokeAccess provides a mock function with given fields: accountType, accountID, role func (_m *GcloudIamClient) RevokeAccess(accountType string, accountID string, role string) error { ret := _m.Called(accountType, accountID, role) @@ -175,9 +196,9 @@ type GcloudIamClient_RevokeAccess_Call struct { } // RevokeAccess is a helper method to define mock.On call -// - accountType string -// - accountID string -// - role string +// - accountType string +// - accountID string +// - role string func (_e *GcloudIamClient_Expecter) RevokeAccess(accountType interface{}, accountID interface{}, role interface{}) *GcloudIamClient_RevokeAccess_Call { return &GcloudIamClient_RevokeAccess_Call{Call: _e.mock.On("RevokeAccess", accountType, accountID, role)} } @@ -193,3 +214,22 @@ func (_c *GcloudIamClient_RevokeAccess_Call) Return(_a0 error) *GcloudIamClient_ _c.Call.Return(_a0) return _c } + +func (_c *GcloudIamClient_RevokeAccess_Call) RunAndReturn(run func(string, string, string) error) *GcloudIamClient_RevokeAccess_Call { + _c.Call.Return(run) + return _c +} + +// NewGcloudIamClient creates a new instance of GcloudIamClient. 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 NewGcloudIamClient(t interface { + mock.TestingT + Cleanup(func()) +}) *GcloudIamClient { + mock := &GcloudIamClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/plugins/providers/gcloudiam/mocks/encryptor.go b/plugins/providers/gcloudiam/mocks/encryptor.go index 2c9fd72dc..3aca60d03 100644 --- a/plugins/providers/gcloudiam/mocks/encryptor.go +++ b/plugins/providers/gcloudiam/mocks/encryptor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -22,13 +22,16 @@ func (_m *Encryptor) Decrypt(_a0 string) (string, error) { ret := _m.Called(_a0) var r0 string + var r1 error + if rf, ok := ret.Get(0).(func(string) (string, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(string) string); ok { r0 = rf(_a0) } else { r0 = ret.Get(0).(string) } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(_a0) } else { @@ -44,7 +47,7 @@ type Encryptor_Decrypt_Call struct { } // Decrypt is a helper method to define mock.On call -// - _a0 string +// - _a0 string func (_e *Encryptor_Expecter) Decrypt(_a0 interface{}) *Encryptor_Decrypt_Call { return &Encryptor_Decrypt_Call{Call: _e.mock.On("Decrypt", _a0)} } @@ -61,18 +64,26 @@ func (_c *Encryptor_Decrypt_Call) Return(_a0 string, _a1 error) *Encryptor_Decry return _c } +func (_c *Encryptor_Decrypt_Call) RunAndReturn(run func(string) (string, error)) *Encryptor_Decrypt_Call { + _c.Call.Return(run) + return _c +} + // Encrypt provides a mock function with given fields: _a0 func (_m *Encryptor) Encrypt(_a0 string) (string, error) { ret := _m.Called(_a0) var r0 string + var r1 error + if rf, ok := ret.Get(0).(func(string) (string, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(string) string); ok { r0 = rf(_a0) } else { r0 = ret.Get(0).(string) } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(_a0) } else { @@ -88,7 +99,7 @@ type Encryptor_Encrypt_Call struct { } // Encrypt is a helper method to define mock.On call -// - _a0 string +// - _a0 string func (_e *Encryptor_Expecter) Encrypt(_a0 interface{}) *Encryptor_Encrypt_Call { return &Encryptor_Encrypt_Call{Call: _e.mock.On("Encrypt", _a0)} } @@ -104,3 +115,22 @@ func (_c *Encryptor_Encrypt_Call) Return(_a0 string, _a1 error) *Encryptor_Encry _c.Call.Return(_a0, _a1) return _c } + +func (_c *Encryptor_Encrypt_Call) RunAndReturn(run func(string) (string, error)) *Encryptor_Encrypt_Call { + _c.Call.Return(run) + return _c +} + +// NewEncryptor creates a new instance of Encryptor. 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 NewEncryptor(t interface { + mock.TestingT + Cleanup(func()) +}) *Encryptor { + mock := &Encryptor{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/plugins/providers/gcs/mocks/Crypto.go b/plugins/providers/gcs/mocks/Crypto.go index 2e1b0c165..d554c9638 100644 --- a/plugins/providers/gcs/mocks/Crypto.go +++ b/plugins/providers/gcs/mocks/Crypto.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.20.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -121,13 +121,12 @@ func (_c *Crypto_Encrypt_Call) RunAndReturn(run func(string) (string, error)) *C return _c } -type mockConstructorTestingTNewCrypto interface { +// NewCrypto creates a new instance of Crypto. 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 NewCrypto(t interface { mock.TestingT Cleanup(func()) -} - -// NewCrypto creates a new instance of Crypto. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewCrypto(t mockConstructorTestingTNewCrypto) *Crypto { +}) *Crypto { mock := &Crypto{} mock.Mock.Test(t) diff --git a/plugins/providers/gcs/mocks/GCSClient.go b/plugins/providers/gcs/mocks/GCSClient.go index df33ecd1c..be3a545c9 100644 --- a/plugins/providers/gcs/mocks/GCSClient.go +++ b/plugins/providers/gcs/mocks/GCSClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.20.0. DO NOT EDIT. +// Code generated by mockery v2.32.4. DO NOT EDIT. package mocks @@ -225,13 +225,12 @@ func (_c *GCSClient_RevokeBucketAccess_Call) RunAndReturn(run func(context.Conte return _c } -type mockConstructorTestingTNewGCSClient interface { +// NewGCSClient creates a new instance of GCSClient. 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 NewGCSClient(t interface { mock.TestingT Cleanup(func()) -} - -// NewGCSClient creates a new instance of GCSClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewGCSClient(t mockConstructorTestingTNewGCSClient) *GCSClient { +}) *GCSClient { mock := &GCSClient{} mock.Mock.Test(t)