public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename AddHandlerCtx to AddHandler (#43557)

Browse Source
This commit is contained in:
idafurjes
2021-12-28 16:08:07 +01:00
committed by GitHub
parent ec9d6b9ca9
commit 7936c4c522
95 changed files with 417 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/alert.go
+8 -8
View File
@@ -15,14 +15,14 @@ import (
var timeNow = time.Now
func (ss *SQLStore) addAlertQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", SaveAlerts)
bus.AddHandlerCtx("sql", ss.HandleAlertsQuery)
bus.AddHandlerCtx("sql", ss.GetAlertById)
bus.AddHandlerCtx("sql", ss.GetAllAlertQueryHandler)
bus.AddHandlerCtx("sql", ss.SetAlertState)
bus.AddHandlerCtx("sql", ss.GetAlertStatesForDashboard)
bus.AddHandlerCtx("sql", PauseAlert)
bus.AddHandlerCtx("sql", PauseAllAlerts)
bus.AddHandler("sql", SaveAlerts)
bus.AddHandler("sql", ss.HandleAlertsQuery)
bus.AddHandler("sql", ss.GetAlertById)
bus.AddHandler("sql", ss.GetAllAlertQueryHandler)
bus.AddHandler("sql", ss.SetAlertState)
bus.AddHandler("sql", ss.GetAlertStatesForDashboard)
bus.AddHandler("sql", PauseAlert)
bus.AddHandler("sql", PauseAllAlerts)
}
func (ss *SQLStore) GetAlertById(ctx context.Context, query *models.GetAlertByIdQuery) error {
pkg/services/sqlstore/alert_notification.go
+1 -1
View File
@@ -64,7 +64,7 @@ func (ss *SQLStore) GetAlertNotifications(ctx context.Context, query *models.Get
}
func (ss *SQLStore) addAlertNotificationUidByIdHandler() {
bus.AddHandlerCtx("sql", ss.GetAlertNotificationUidWithId)
bus.AddHandler("sql", ss.GetAlertNotificationUidWithId)
}
func (ss *SQLStore) GetAlertNotificationUidWithId(ctx context.Context, query *models.GetAlertNotificationUidQuery) error {
pkg/services/sqlstore/alert_notification_test.go
+1 -1
View File
@@ -23,7 +23,7 @@ func TestAlertNotificationSQLAccess(t *testing.T) {
sqlStore := InitTestDB(t)
// Set up bus handlers
bus.AddHandlerCtx("deleteAlertNotification", func(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error {
bus.AddHandler("deleteAlertNotification", func(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error {
return sqlStore.DeleteAlertNotification(ctx, cmd)
})
}
pkg/services/sqlstore/apikey.go
+5 -5
View File
@@ -11,11 +11,11 @@ import (
)
func (ss *SQLStore) addAPIKeysQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.GetAPIKeys)
bus.AddHandlerCtx("sql", ss.GetApiKeyById)
bus.AddHandlerCtx("sql", ss.GetApiKeyByName)
bus.AddHandlerCtx("sql", ss.DeleteApiKey)
bus.AddHandlerCtx("sql", ss.AddAPIKey)
bus.AddHandler("sql", ss.GetAPIKeys)
bus.AddHandler("sql", ss.GetApiKeyById)
bus.AddHandler("sql", ss.GetApiKeyByName)
bus.AddHandler("sql", ss.DeleteApiKey)
bus.AddHandler("sql", ss.AddAPIKey)
}
// GetAPIKeys queries the database based
pkg/services/sqlstore/dashboard.go
+12 -12
View File
@@ -27,23 +27,23 @@ var shadowSearchCounter = prometheus.NewCounterVec(
)
func init() {
bus.AddHandlerCtx("sql", GetDashboard)
bus.AddHandlerCtx("sql", GetDashboards)
bus.AddHandlerCtx("sql", DeleteDashboard)
bus.AddHandlerCtx("sql", GetDashboardTags)
bus.AddHandlerCtx("sql", GetDashboardSlugById)
bus.AddHandlerCtx("sql", GetDashboardsByPluginId)
bus.AddHandlerCtx("sql", GetDashboardPermissionsForUser)
bus.AddHandlerCtx("sql", GetDashboardsBySlug)
bus.AddHandlerCtx("sql", HasEditPermissionInFolders)
bus.AddHandlerCtx("sql", HasAdminPermissionInFolders)
bus.AddHandler("sql", GetDashboard)
bus.AddHandler("sql", GetDashboards)
bus.AddHandler("sql", DeleteDashboard)
bus.AddHandler("sql", GetDashboardTags)
bus.AddHandler("sql", GetDashboardSlugById)
bus.AddHandler("sql", GetDashboardsByPluginId)
bus.AddHandler("sql", GetDashboardPermissionsForUser)
bus.AddHandler("sql", GetDashboardsBySlug)
bus.AddHandler("sql", HasEditPermissionInFolders)
bus.AddHandler("sql", HasAdminPermissionInFolders)
prometheus.MustRegister(shadowSearchCounter)
}
func (ss *SQLStore) addDashboardQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.GetDashboardUIDById)
bus.AddHandlerCtx("sql", ss.SearchDashboards)
bus.AddHandler("sql", ss.GetDashboardUIDById)
bus.AddHandler("sql", ss.SearchDashboards)
}
var generateNewUid func() string = util.GenerateShortUID
pkg/services/sqlstore/dashboard_acl.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
)
func (ss *SQLStore) addDashboardACLQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.GetDashboardAclInfoList)
bus.AddHandler("sql", ss.GetDashboardAclInfoList)
}
func (ss *SQLStore) UpdateDashboardACL(ctx context.Context, dashboardID int64, items []*models.DashboardAcl) error {
pkg/services/sqlstore/dashboard_provisioning.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
)
func init() {
bus.AddHandlerCtx("sql", UnprovisionDashboard)
bus.AddHandlerCtx("sql", DeleteOrphanedProvisionedDashboards)
bus.AddHandler("sql", UnprovisionDashboard)
bus.AddHandler("sql", DeleteOrphanedProvisionedDashboards)
}
type DashboardExtras struct {
pkg/services/sqlstore/dashboard_version.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
)
func (ss *SQLStore) addDashboardVersionQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.GetDashboardVersion)
bus.AddHandlerCtx("sql", ss.GetDashboardVersions)
bus.AddHandlerCtx("sql", ss.DeleteExpiredVersions)
bus.AddHandler("sql", ss.GetDashboardVersion)
bus.AddHandler("sql", ss.GetDashboardVersions)
bus.AddHandler("sql", ss.DeleteExpiredVersions)
}
// GetDashboardVersion gets the dashboard version for the given dashboard ID and version number.
pkg/services/sqlstore/health.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
bus.AddHandlerCtx("sql", GetDBHealthQuery)
bus.AddHandler("sql", GetDBHealthQuery)
}
// GetDBHealthQuery executes a query to check
pkg/services/sqlstore/login_attempt.go
+3 -3
View File
@@ -12,9 +12,9 @@ import (
var getTimeNow = time.Now
func init() {
bus.AddHandlerCtx("sql", CreateLoginAttempt)
bus.AddHandlerCtx("sql", DeleteOldLoginAttempts)
bus.AddHandlerCtx("sql", GetUserLoginAttemptCount)
bus.AddHandler("sql", CreateLoginAttempt)
bus.AddHandler("sql", DeleteOldLoginAttempts)
bus.AddHandler("sql", GetUserLoginAttemptCount)
}
func CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error {
pkg/services/sqlstore/org.go
+7 -7
View File
@@ -16,13 +16,13 @@ import (
const MainOrgName = "Main Org."
func init() {
bus.AddHandlerCtx("sql", GetOrgById)
bus.AddHandlerCtx("sql", CreateOrg)
bus.AddHandlerCtx("sql", UpdateOrg)
bus.AddHandlerCtx("sql", UpdateOrgAddress)
bus.AddHandlerCtx("sql", GetOrgByName)
bus.AddHandlerCtx("sql", SearchOrgs)
bus.AddHandlerCtx("sql", DeleteOrg)
bus.AddHandler("sql", GetOrgById)
bus.AddHandler("sql", CreateOrg)
bus.AddHandler("sql", UpdateOrg)
bus.AddHandler("sql", UpdateOrgAddress)
bus.AddHandler("sql", GetOrgByName)
bus.AddHandler("sql", SearchOrgs)
bus.AddHandler("sql", DeleteOrg)
}
func SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error {
pkg/services/sqlstore/org_users.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
)
func (ss *SQLStore) addOrgUsersQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.AddOrgUser)
bus.AddHandlerCtx("sql", ss.RemoveOrgUser)
bus.AddHandlerCtx("sql", ss.GetOrgUsers)
bus.AddHandlerCtx("sql", ss.UpdateOrgUser)
bus.AddHandler("sql", ss.AddOrgUser)
bus.AddHandler("sql", ss.RemoveOrgUser)
bus.AddHandler("sql", ss.GetOrgUsers)
bus.AddHandler("sql", ss.UpdateOrgUser)
}
func (ss *SQLStore) AddOrgUser(ctx context.Context, cmd *models.AddOrgUserCommand) error {
pkg/services/sqlstore/playlist.go
+6 -6
View File
@@ -8,12 +8,12 @@ import (
)
func (ss *SQLStore) addPlaylistQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.CreatePlaylist)
bus.AddHandlerCtx("sql", ss.UpdatePlaylist)
bus.AddHandlerCtx("sql", ss.DeletePlaylist)
bus.AddHandlerCtx("sql", ss.SearchPlaylists)
bus.AddHandlerCtx("sql", ss.GetPlaylist)
bus.AddHandlerCtx("sql", ss.GetPlaylistItem)
bus.AddHandler("sql", ss.CreatePlaylist)
bus.AddHandler("sql", ss.UpdatePlaylist)
bus.AddHandler("sql", ss.DeletePlaylist)
bus.AddHandler("sql", ss.SearchPlaylists)
bus.AddHandler("sql", ss.GetPlaylist)
bus.AddHandler("sql", ss.GetPlaylistItem)
}
func (ss *SQLStore) CreatePlaylist(ctx context.Context, cmd *models.CreatePlaylistCommand) error {
pkg/services/sqlstore/preferences.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
)
func (ss *SQLStore) addPreferencesQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.GetPreferences)
bus.AddHandlerCtx("sql", ss.GetPreferencesWithDefaults)
bus.AddHandlerCtx("sql", ss.SavePreferences)
bus.AddHandler("sql", ss.GetPreferences)
bus.AddHandler("sql", ss.GetPreferencesWithDefaults)
bus.AddHandler("sql", ss.SavePreferences)
}
func (ss *SQLStore) GetPreferencesWithDefaults(ctx context.Context, query *models.GetPreferencesWithDefaultsQuery) error {
pkg/services/sqlstore/quota.go
+7 -7
View File
@@ -16,13 +16,13 @@ const (
)
func (ss *SQLStore) addQuotaQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.GetOrgQuotaByTarget)
bus.AddHandlerCtx("sql", ss.GetOrgQuotas)
bus.AddHandlerCtx("sql", ss.UpdateOrgQuota)
bus.AddHandlerCtx("sql", ss.GetUserQuotaByTarget)
bus.AddHandlerCtx("sql", ss.GetUserQuotas)
bus.AddHandlerCtx("sql", ss.UpdateUserQuota)
bus.AddHandlerCtx("sql", ss.GetGlobalQuotaByTarget)
bus.AddHandler("sql", ss.GetOrgQuotaByTarget)
bus.AddHandler("sql", ss.GetOrgQuotas)
bus.AddHandler("sql", ss.UpdateOrgQuota)
bus.AddHandler("sql", ss.GetUserQuotaByTarget)
bus.AddHandler("sql", ss.GetUserQuotas)
bus.AddHandler("sql", ss.UpdateUserQuota)
bus.AddHandler("sql", ss.GetGlobalQuotaByTarget)
}
type targetCount struct {
pkg/services/sqlstore/star.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
)
func (ss *SQLStore) addStarQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.StarDashboard)
bus.AddHandlerCtx("sql", ss.UnstarDashboard)
bus.AddHandlerCtx("sql", ss.GetUserStars)
bus.AddHandlerCtx("sql", ss.IsStarredByUserCtx)
bus.AddHandler("sql", ss.StarDashboard)
bus.AddHandler("sql", ss.UnstarDashboard)
bus.AddHandler("sql", ss.GetUserStars)
bus.AddHandler("sql", ss.IsStarredByUserCtx)
}
func (ss *SQLStore) IsStarredByUserCtx(ctx context.Context, query *models.IsStarredByUserQuery) error {
pkg/services/sqlstore/stats.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
)
func init() {
bus.AddHandlerCtx("sql", GetSystemStats)
bus.AddHandlerCtx("sql", GetDataSourceStats)
bus.AddHandlerCtx("sql", GetDataSourceAccessStats)
bus.AddHandlerCtx("sql", GetAdminStats)
bus.AddHandlerCtx("sql", GetAlertNotifiersUsageStats)
bus.AddHandlerCtx("sql", GetSystemUserCountStats)
bus.AddHandler("sql", GetSystemStats)
bus.AddHandler("sql", GetDataSourceStats)
bus.AddHandler("sql", GetDataSourceAccessStats)
bus.AddHandler("sql", GetAdminStats)
bus.AddHandler("sql", GetAlertNotifiersUsageStats)
bus.AddHandler("sql", GetSystemUserCountStats)
}
const activeUserTimeLimit = time.Hour * 24 * 30
pkg/services/sqlstore/team.go
+9 -9
View File
@@ -12,16 +12,16 @@ import (
)
func init() {
bus.AddHandlerCtx("sql", UpdateTeam)
bus.AddHandlerCtx("sql", DeleteTeam)
bus.AddHandlerCtx("sql", SearchTeams)
bus.AddHandlerCtx("sql", GetTeamById)
bus.AddHandlerCtx("sql", GetTeamsByUser)
bus.AddHandler("sql", UpdateTeam)
bus.AddHandler("sql", DeleteTeam)
bus.AddHandler("sql", SearchTeams)
bus.AddHandler("sql", GetTeamById)
bus.AddHandler("sql", GetTeamsByUser)
bus.AddHandlerCtx("sql", UpdateTeamMember)
bus.AddHandlerCtx("sql", RemoveTeamMember)
bus.AddHandlerCtx("sql", GetTeamMembers)
bus.AddHandlerCtx("sql", IsAdminOfTeams)
bus.AddHandler("sql", UpdateTeamMember)
bus.AddHandler("sql", RemoveTeamMember)
bus.AddHandler("sql", GetTeamMembers)
bus.AddHandler("sql", IsAdminOfTeams)
}
func getFilteredUsers(signedInUser *models.SignedInUser, hiddenUsers map[string]struct{}) []string {
pkg/services/sqlstore/temp_user.go
+6 -6
View File
@@ -9,12 +9,12 @@ import (
)
func (ss *SQLStore) addTempUserQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", ss.CreateTempUser)
bus.AddHandlerCtx("sql", ss.GetTempUsersQuery)
bus.AddHandlerCtx("sql", ss.UpdateTempUserStatus)
bus.AddHandlerCtx("sql", ss.GetTempUserByCode)
bus.AddHandlerCtx("sql", ss.UpdateTempUserWithEmailSent)
bus.AddHandlerCtx("sql", ss.ExpireOldUserInvites)
bus.AddHandler("sql", ss.CreateTempUser)
bus.AddHandler("sql", ss.GetTempUsersQuery)
bus.AddHandler("sql", ss.UpdateTempUserStatus)
bus.AddHandler("sql", ss.GetTempUserByCode)
bus.AddHandler("sql", ss.UpdateTempUserWithEmailSent)
bus.AddHandler("sql", ss.ExpireOldUserInvites)
}
func (ss *SQLStore) UpdateTempUserStatus(ctx context.Context, cmd *models.UpdateTempUserStatusCommand) error {
pkg/services/sqlstore/user.go
+15 -15
View File
@@ -18,22 +18,22 @@ import (
)
func (ss *SQLStore) addUserQueryAndCommandHandlers() {
ss.Bus.AddHandlerCtx(ss.GetSignedInUserWithCacheCtx)
ss.Bus.AddHandler(ss.GetSignedInUserWithCacheCtx)
bus.AddHandlerCtx("sql", GetUserById)
bus.AddHandlerCtx("sql", UpdateUser)
bus.AddHandlerCtx("sql", ChangeUserPassword)
bus.AddHandlerCtx("sql", ss.GetUserByLogin)
bus.AddHandlerCtx("sql", ss.GetUserByEmail)
bus.AddHandlerCtx("sql", SetUsingOrg)
bus.AddHandlerCtx("sql", UpdateUserLastSeenAt)
bus.AddHandlerCtx("sql", ss.GetUserProfile)
bus.AddHandlerCtx("sql", SearchUsers)
bus.AddHandlerCtx("sql", GetUserOrgList)
bus.AddHandlerCtx("sql", DisableUser)
bus.AddHandlerCtx("sql", BatchDisableUsers)
bus.AddHandlerCtx("sql", DeleteUser)
bus.AddHandlerCtx("sql", SetUserHelpFlag)
bus.AddHandler("sql", GetUserById)
bus.AddHandler("sql", UpdateUser)
bus.AddHandler("sql", ChangeUserPassword)
bus.AddHandler("sql", ss.GetUserByLogin)
bus.AddHandler("sql", ss.GetUserByEmail)
bus.AddHandler("sql", SetUsingOrg)
bus.AddHandler("sql", UpdateUserLastSeenAt)
bus.AddHandler("sql", ss.GetUserProfile)
bus.AddHandler("sql", SearchUsers)
bus.AddHandler("sql", GetUserOrgList)
bus.AddHandler("sql", DisableUser)
bus.AddHandler("sql", BatchDisableUsers)
bus.AddHandler("sql", DeleteUser)
bus.AddHandler("sql", SetUserHelpFlag)
}
func getOrgIdForNewUser(sess *DBSession, cmd models.CreateUserCommand) (int64, error) {