From 1bda67ab113a745772fdc8a659610433b1e2ee7f Mon Sep 17 00:00:00 2001 From: idafurjes <36131195+idafurjes@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:00:22 +0200 Subject: [PATCH] Chore: Delete unused mocks (#57512) * Chore: Delete unused mocks * Add back used methods * Add back used mocks 2 * Add back used mocks 3 * Add back used mocks 4 * Add back the alerting mocks * Remove mock variables * Add bacl needed mock var --- pkg/services/sqlstore/mockstore/mockstore.go | 271 +++---------------- 1 file changed, 34 insertions(+), 237 deletions(-) diff --git a/pkg/services/sqlstore/mockstore/mockstore.go b/pkg/services/sqlstore/mockstore/mockstore.go index bbce7358589..bf23c79e8a2 100644 --- a/pkg/services/sqlstore/mockstore/mockstore.go +++ b/pkg/services/sqlstore/mockstore/mockstore.go @@ -5,9 +5,7 @@ import ( "xorm.io/core" - "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/models" - "github.com/grafana/grafana/pkg/services/apikey" "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/grafana/grafana/pkg/services/sqlstore/session" @@ -21,30 +19,18 @@ type OrgListResponse []struct { type SQLStoreMock struct { LastGetAlertsQuery *models.GetAlertsQuery LastLoginAttemptCommand *models.CreateLoginAttemptCommand - LatestUserId int64 ExpectedUser *user.User - ExpectedAlert *models.Alert - ExpectedPluginSetting *models.PluginSetting - ExpectedDashboards []*models.Dashboard - ExpectedDashboardACLInfoList []*models.DashboardACLInfoDTO - ExpectedUserOrgList []*models.UserOrgDTO - ExpectedOrgListResponse OrgListResponse ExpectedTeamsByUser []*models.TeamDTO - ExpectedSearchOrgList []*models.OrgDTO - ExpectedSearchUsers models.SearchUserQueryResult - ExpectedOrg *models.Org + ExpectedAlert *models.Alert ExpectedSystemStats *models.SystemStats ExpectedDataSourceStats []*models.DataSourceStats ExpectedDataSourcesAccessStats []*models.DataSourceAccessStats ExpectedNotifierUsageStats []*models.NotifierUsageStats - ExpectedPersistedDashboards models.HitList ExpectedSignedInUser *user.SignedInUser - ExpectedUserStars map[int64]bool ExpectedLoginAttempts int64 - ExpectedError error - ExpectedSetUsingOrgError error + ExpectedError error } func NewSQLStoreMock() *SQLStoreMock { @@ -83,49 +69,6 @@ func (m *SQLStoreMock) GetDBType() core.DbType { return "" } -func (m *SQLStoreMock) HasEditPermissionInFolders(ctx context.Context, query *models.HasEditPermissionInFoldersQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetOrgById(ctx context.Context, cmd *models.GetOrgByIdQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetOrgByName(name string) (*models.Org, error) { - return m.ExpectedOrg, m.ExpectedError -} - -func (m *SQLStoreMock) GetOrgByNameHandler(ctx context.Context, query *models.GetOrgByNameQuery) error { - query.Result = m.ExpectedOrg - return m.ExpectedError -} - -func (m *SQLStoreMock) UpdateOrgAddress(ctx context.Context, cmd *models.UpdateOrgAddressCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) DeleteOrg(ctx context.Context, cmd *models.DeleteOrgCommand) error { - return m.ExpectedError -} - -func (m SQLStoreMock) DeleteOrphanedProvisionedDashboards(ctx context.Context, cmd *models.DeleteOrphanedProvisionedDashboardsCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error { - m.LastLoginAttemptCommand = cmd - return m.ExpectedError -} - -func (m *SQLStoreMock) GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error { - query.Result = m.ExpectedLoginAttempts - return m.ExpectedError -} - -func (m *SQLStoreMock) DeleteOldLoginAttempts(ctx context.Context, cmd *models.DeleteOldLoginAttemptsCommand) error { - return m.ExpectedError -} - func (m *SQLStoreMock) CreateUser(ctx context.Context, cmd user.CreateUserCommand) (*user.User, error) { return nil, m.ExpectedError } @@ -139,14 +82,6 @@ func (m *SQLStoreMock) GetSignedInUser(ctx context.Context, query *models.GetSig return m.ExpectedError } -func (m *SQLStoreMock) UpdateUserPermissions(userID int64, isAdmin bool) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) SetUserHelpFlag(ctx context.Context, cmd *models.SetUserHelpFlagCommand) error { - return m.ExpectedError -} - func (m *SQLStoreMock) CreateTeam(name string, email string, orgID int64) (models.Team, error) { return models.Team{ Name: name, @@ -155,55 +90,6 @@ func (m *SQLStoreMock) CreateTeam(name string, email string, orgID int64) (model }, nil } -func (m *SQLStoreMock) UpdateTeam(ctx context.Context, cmd *models.UpdateTeamCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) DeleteTeam(ctx context.Context, cmd *models.DeleteTeamCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) SearchTeams(ctx context.Context, query *models.SearchTeamsQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetTeamById(ctx context.Context, query *models.GetTeamByIdQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetTeamsByUser(ctx context.Context, query *models.GetTeamsByUserQuery) error { - query.Result = m.ExpectedTeamsByUser - return m.ExpectedError -} - -func (m *SQLStoreMock) AddTeamMember(userID int64, orgID int64, teamID int64, isExternal bool, permission models.PermissionType) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) UpdateTeamMember(ctx context.Context, cmd *models.UpdateTeamMemberCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) IsTeamMember(orgId int64, teamId int64, userId int64) (bool, error) { - return false, nil -} - -func (m *SQLStoreMock) RemoveTeamMember(ctx context.Context, cmd *models.RemoveTeamMemberCommand) error { - return m.ExpectedError -} - -func (m SQLStoreMock) GetUserTeamMemberships(ctx context.Context, orgID, userID int64, external bool) ([]*models.TeamMemberDTO, error) { - return nil, m.ExpectedError -} - -func (m SQLStoreMock) GetTeamMembers(ctx context.Context, query *models.GetTeamMembersQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) NewSession(ctx context.Context) *db.Session { - return nil -} - func (m *SQLStoreMock) WithDbSession(ctx context.Context, callback sqlstore.DBTransactionFunc) error { return m.ExpectedError } @@ -248,66 +134,6 @@ func (m *SQLStoreMock) InTransaction(ctx context.Context, fn func(ctx context.Co return m.ExpectedError } -func (m SQLStoreMock) GetDashboardACLInfoList(ctx context.Context, query *models.GetDashboardACLInfoListQuery) error { - query.Result = m.ExpectedDashboardACLInfoList - return m.ExpectedError -} - -func (m *SQLStoreMock) GetAlertById(ctx context.Context, query *models.GetAlertByIdQuery) error { - query.Result = m.ExpectedAlert - return m.ExpectedError -} - -func (m *SQLStoreMock) GetAllAlertQueryHandler(ctx context.Context, query *models.GetAllAlertsQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) HandleAlertsQuery(ctx context.Context, query *models.GetAlertsQuery) error { - m.LastGetAlertsQuery = query - return m.ExpectedError -} - -func (m SQLStoreMock) SetAlertState(ctx context.Context, cmd *models.SetAlertStateCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) PauseAlert(ctx context.Context, cmd *models.PauseAlertCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) PauseAllAlerts(ctx context.Context, cmd *models.PauseAllAlertCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetAlertStatesForDashboard(ctx context.Context, query *models.GetAlertStatesForDashboardQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) AddOrgUser(ctx context.Context, cmd *models.AddOrgUserCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) UpdateOrgUser(ctx context.Context, cmd *models.UpdateOrgUserCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetOrgUsers(ctx context.Context, query *models.GetOrgUsersQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) SearchOrgUsers(ctx context.Context, query *models.SearchOrgUsersQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetDashboardTags(ctx context.Context, query *models.GetDashboardTagsQuery) error { - return nil // TODO: Implement -} - -func (m *SQLStoreMock) GetDashboards(ctx context.Context, query *models.GetDashboardsQuery) error { - query.Result = m.ExpectedDashboards - return m.ExpectedError -} - func (m *SQLStoreMock) Migrate(_ bool) error { return m.ExpectedError } @@ -324,15 +150,21 @@ func (m *SQLStoreMock) Quote(value string) string { return "" } -func (m *SQLStoreMock) DeleteAlertNotification(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error { +func (m *SQLStoreMock) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error { return m.ExpectedError } -func (m *SQLStoreMock) DeleteAlertNotificationWithUid(ctx context.Context, cmd *models.DeleteAlertNotificationWithUidCommand) error { +func (m *SQLStoreMock) GetSqlxSession() *session.SessionDB { + return nil +} + +func (m *SQLStoreMock) CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error { + m.LastLoginAttemptCommand = cmd return m.ExpectedError } -func (m *SQLStoreMock) GetAlertNotifications(ctx context.Context, query *models.GetAlertNotificationsQuery) error { +func (m *SQLStoreMock) GetAlertById(ctx context.Context, query *models.GetAlertByIdQuery) error { + query.Result = m.ExpectedAlert return m.ExpectedError } @@ -340,11 +172,7 @@ func (m *SQLStoreMock) GetAlertNotificationUidWithId(ctx context.Context, query return m.ExpectedError } -func (m *SQLStoreMock) GetAlertNotificationsWithUid(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetAllAlertNotifications(ctx context.Context, query *models.GetAllAlertNotificationsQuery) error { +func (m *SQLStoreMock) DeleteOldLoginAttempts(ctx context.Context, cmd *models.DeleteOldLoginAttemptsCommand) error { return m.ExpectedError } @@ -352,15 +180,33 @@ func (m *SQLStoreMock) GetAlertNotificationsWithUidToSend(ctx context.Context, q return m.ExpectedError } -func (m *SQLStoreMock) CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) error { +func (m *SQLStoreMock) GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error { + query.Result = m.ExpectedLoginAttempts return m.ExpectedError } -func (m *SQLStoreMock) UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) error { +func (m *SQLStoreMock) GetAlertStatesForDashboard(ctx context.Context, query *models.GetAlertStatesForDashboardQuery) error { return m.ExpectedError } -func (m *SQLStoreMock) UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) error { +func (m *SQLStoreMock) GetAllAlertQueryHandler(ctx context.Context, query *models.GetAllAlertsQuery) error { + return m.ExpectedError +} + +func (m *SQLStoreMock) GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) error { + return m.ExpectedError +} + +func (m *SQLStoreMock) HandleAlertsQuery(ctx context.Context, query *models.GetAlertsQuery) error { + m.LastGetAlertsQuery = query + return m.ExpectedError +} + +func (m *SQLStoreMock) PauseAlert(ctx context.Context, cmd *models.PauseAlertCommand) error { + return m.ExpectedError +} + +func (m *SQLStoreMock) PauseAllAlerts(ctx context.Context, cmd *models.PauseAllAlertCommand) error { return m.ExpectedError } @@ -372,55 +218,6 @@ func (m *SQLStoreMock) SetAlertNotificationStateToPendingCommand(ctx context.Con return m.ExpectedError } -func (m *SQLStoreMock) GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) error { +func (m SQLStoreMock) SetAlertState(ctx context.Context, cmd *models.SetAlertStateCommand) error { return m.ExpectedError } - -func (m *SQLStoreMock) UpdateTempUserStatus(ctx context.Context, cmd *models.UpdateTempUserStatusCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) CreateTempUser(ctx context.Context, cmd *models.CreateTempUserCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) UpdateTempUserWithEmailSent(ctx context.Context, cmd *models.UpdateTempUserWithEmailSentCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetTempUsersQuery(ctx context.Context, query *models.GetTempUsersQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetTempUserByCode(ctx context.Context, query *models.GetTempUserByCodeQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error { - query.Result = m.ExpectedSearchOrgList - return m.ExpectedError -} - -func (m *SQLStoreMock) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) IsAdminOfTeams(ctx context.Context, query *models.IsAdminOfTeamsQuery) error { - return m.ExpectedError -} - -func (m *SQLStoreMock) GetAPIKeyByHash(ctx context.Context, hash string) (*apikey.APIKey, error) { - return nil, m.ExpectedError -} - -func (m *SQLStoreMock) GetSqlxSession() *session.SessionDB { - return nil -}