From 8e6d6af744cf37381314dc53a19c2a31374fcd78 Mon Sep 17 00:00:00 2001 From: idafurjes <36131195+idafurjes@users.noreply.github.com> Date: Tue, 28 Dec 2021 17:36:22 +0100 Subject: [PATCH] Rename DispatchCtx to Dispatch (#43563) --- pkg/api/admin.go | 2 +- pkg/api/admin_users.go | 14 +++---- pkg/api/alerting.go | 42 +++++++++---------- pkg/api/apikey.go | 8 ++-- pkg/api/dashboard.go | 22 +++++----- pkg/api/dashboard_snapshot.go | 14 +++---- pkg/api/datasources.go | 26 ++++++------ pkg/api/frontendsettings.go | 4 +- pkg/api/health.go | 2 +- pkg/api/index.go | 4 +- pkg/api/ldap_debug.go | 10 ++--- pkg/api/login.go | 2 +- pkg/api/login_oauth.go | 2 +- pkg/api/org_invite.go | 24 +++++------ pkg/api/password.go | 8 ++-- pkg/api/playlist.go | 14 +++---- pkg/api/playlist_play.go | 4 +- pkg/api/pluginproxy/pluginproxy.go | 2 +- pkg/api/plugins.go | 4 +- pkg/api/preferences.go | 2 +- pkg/api/quota.go | 4 +- pkg/api/search.go | 2 +- pkg/api/signup.go | 8 ++-- pkg/api/stars.go | 4 +- pkg/api/team.go | 8 ++-- pkg/api/team_members.go | 6 +-- pkg/api/user.go | 28 ++++++------- pkg/api/user_token.go | 6 +-- pkg/bus/bus.go | 8 ++-- pkg/bus/bus_test.go | 16 +++---- .../commands/reset_password_command.go | 4 +- pkg/components/dashdiffs/compare.go | 4 +- pkg/infra/usagestats/service/usage_stats.go | 14 +++---- pkg/login/brute_force_login_protection.go | 4 +- pkg/login/grafana_login.go | 2 +- pkg/login/ldap_login.go | 6 +-- pkg/middleware/org_redirect.go | 2 +- pkg/plugins/manager/dashboards.go | 2 +- pkg/plugins/plugincontext/plugincontext.go | 2 +- pkg/plugins/plugindashboards/service.go | 10 ++--- pkg/services/alerting/alerting_usage.go | 4 +- pkg/services/alerting/conditions/query.go | 2 +- pkg/services/alerting/eval_context.go | 2 +- pkg/services/alerting/extractor.go | 6 +-- pkg/services/alerting/notifier.go | 8 ++-- .../alerting/notifiers/alertmanager.go | 2 +- pkg/services/alerting/notifiers/dingding.go | 2 +- pkg/services/alerting/notifiers/discord.go | 2 +- pkg/services/alerting/notifiers/email.go | 2 +- pkg/services/alerting/notifiers/googlechat.go | 2 +- pkg/services/alerting/notifiers/hipchat.go | 2 +- pkg/services/alerting/notifiers/kafka.go | 2 +- pkg/services/alerting/notifiers/line.go | 2 +- pkg/services/alerting/notifiers/opsgenie.go | 4 +- pkg/services/alerting/notifiers/pagerduty.go | 2 +- pkg/services/alerting/notifiers/pushover.go | 2 +- pkg/services/alerting/notifiers/sensu.go | 2 +- pkg/services/alerting/notifiers/sensugo.go | 2 +- pkg/services/alerting/notifiers/slack.go | 2 +- pkg/services/alerting/notifiers/teams.go | 2 +- pkg/services/alerting/notifiers/telegram.go | 2 +- pkg/services/alerting/notifiers/threema.go | 2 +- pkg/services/alerting/notifiers/victorops.go | 2 +- pkg/services/alerting/notifiers/webhook.go | 2 +- pkg/services/alerting/reader.go | 2 +- pkg/services/alerting/result_handler.go | 2 +- pkg/services/alerting/rule.go | 2 +- pkg/services/cleanup/cleanup.go | 8 ++-- pkg/services/contexthandler/auth_jwt.go | 2 +- .../contexthandler/authproxy/authproxy.go | 6 +-- pkg/services/contexthandler/contexthandler.go | 12 +++--- pkg/services/dashboards/dashboard_service.go | 4 +- pkg/services/dashboards/folder_service.go | 6 +-- pkg/services/guardian/guardian.go | 6 +-- pkg/services/live/features/dashboard.go | 4 +- .../login/authinfoservice/database.go | 4 +- .../login/loginservice/loginservice.go | 18 ++++---- .../ngalert/notifier/channels/dingding.go | 2 +- .../ngalert/notifier/channels/discord.go | 2 +- .../ngalert/notifier/channels/email.go | 2 +- .../ngalert/notifier/channels/googlechat.go | 2 +- .../ngalert/notifier/channels/kafka.go | 2 +- .../ngalert/notifier/channels/line.go | 2 +- .../ngalert/notifier/channels/opsgenie.go | 2 +- .../ngalert/notifier/channels/pagerduty.go | 2 +- .../ngalert/notifier/channels/pushover.go | 2 +- .../ngalert/notifier/channels/sensugo.go | 2 +- .../ngalert/notifier/channels/teams.go | 2 +- .../ngalert/notifier/channels/telegram.go | 2 +- .../ngalert/notifier/channels/threema.go | 2 +- .../ngalert/notifier/channels/victorops.go | 2 +- .../ngalert/notifier/channels/webhook.go | 2 +- .../ngalert/notifier/channels/wecom.go | 2 +- pkg/services/notifications/notifications.go | 4 +- pkg/services/oauthtoken/oauth_token.go | 4 +- .../provisioning/dashboards/dashboard.go | 2 +- .../provisioning/dashboards/file_reader.go | 2 +- .../provisioning/datasources/datasources.go | 8 ++-- .../notifiers/alert_notifications.go | 14 +++---- .../plugins/plugin_provisioner.go | 6 +-- pkg/services/provisioning/utils/utils.go | 2 +- pkg/services/quota/quota.go | 6 +-- pkg/services/search/service.go | 4 +- pkg/services/searchusers/searchusers.go | 2 +- pkg/services/sqlstore/alert_notification.go | 4 +- pkg/services/teamguardian/team.go | 2 +- pkg/services/thumbs/service.go | 2 +- 107 files changed, 291 insertions(+), 291 deletions(-) diff --git a/pkg/api/admin.go b/pkg/api/admin.go index e2e0c39eb3a..4c6aceec32d 100644 --- a/pkg/api/admin.go +++ b/pkg/api/admin.go @@ -22,7 +22,7 @@ func (hs *HTTPServer) AdminGetSettings(c *models.ReqContext) response.Response { func AdminGetStats(c *models.ReqContext) response.Response { statsQuery := models.GetAdminStatsQuery{} - if err := bus.DispatchCtx(c.Req.Context(), &statsQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &statsQuery); err != nil { return response.Error(500, "Failed to get admin stats from database", err) } diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index 602d57f52d3..01f595faa72 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -75,7 +75,7 @@ func AdminUpdateUserPassword(c *models.ReqContext) response.Response { userQuery := models.GetUserByIdQuery{Id: userID} - if err := bus.DispatchCtx(c.Req.Context(), &userQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &userQuery); err != nil { return response.Error(500, "Could not read user from database", err) } @@ -89,7 +89,7 @@ func AdminUpdateUserPassword(c *models.ReqContext) response.Response { NewPassword: passwordHashed, } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to update user password", err) } @@ -121,7 +121,7 @@ func AdminDeleteUser(c *models.ReqContext) response.Response { cmd := models.DeleteUserCommand{UserId: userID} - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } @@ -137,12 +137,12 @@ func (hs *HTTPServer) AdminDisableUser(c *models.ReqContext) response.Response { // External users shouldn't be disabled from API authInfoQuery := &models.GetAuthInfoQuery{UserId: userID} - if err := bus.DispatchCtx(c.Req.Context(), authInfoQuery); !errors.Is(err, models.ErrUserNotFound) { + if err := bus.Dispatch(c.Req.Context(), authInfoQuery); !errors.Is(err, models.ErrUserNotFound) { return response.Error(500, "Could not disable external user", nil) } disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: true} - if err := bus.DispatchCtx(c.Req.Context(), &disableCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &disableCmd); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } @@ -163,12 +163,12 @@ func AdminEnableUser(c *models.ReqContext) response.Response { // External users shouldn't be disabled from API authInfoQuery := &models.GetAuthInfoQuery{UserId: userID} - if err := bus.DispatchCtx(c.Req.Context(), authInfoQuery); !errors.Is(err, models.ErrUserNotFound) { + if err := bus.Dispatch(c.Req.Context(), authInfoQuery); !errors.Is(err, models.ErrUserNotFound) { return response.Error(500, "Could not enable external user", nil) } disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: false} - if err := bus.DispatchCtx(c.Req.Context(), &disableCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &disableCmd); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index c1899c72da6..739cde47e5b 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -24,7 +24,7 @@ func ValidateOrgAlert(c *models.ReqContext) { id := c.ParamsInt64(":alertId") query := models.GetAlertByIdQuery{Id: id} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { c.JsonApiErr(404, "Alert not found", nil) return } @@ -47,7 +47,7 @@ func GetAlertStatesForDashboard(c *models.ReqContext) response.Response { DashboardId: c.QueryInt64("dashboardId"), } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to fetch alert states", err) } @@ -90,7 +90,7 @@ func GetAlerts(c *models.ReqContext) response.Response { Permission: models.PERMISSION_VIEW, } - err := bus.DispatchCtx(c.Req.Context(), &searchQuery) + err := bus.Dispatch(c.Req.Context(), &searchQuery) if err != nil { return response.Error(500, "List alerts failed", err) } @@ -121,7 +121,7 @@ func GetAlerts(c *models.ReqContext) response.Response { query.State = states } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "List alerts failed", err) } @@ -181,7 +181,7 @@ func GetAlert(c *models.ReqContext) response.Response { id := c.ParamsInt64(":alertId") query := models.GetAlertByIdQuery{Id: id} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "List alerts failed", err) } @@ -232,7 +232,7 @@ func GetAlertNotifications(c *models.ReqContext) response.Response { func getAlertNotificationsInternal(c *models.ReqContext) ([]*models.AlertNotification, error) { query := &models.GetAllAlertNotificationsQuery{OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), query); err != nil { + if err := bus.Dispatch(c.Req.Context(), query); err != nil { return nil, err } @@ -249,7 +249,7 @@ func GetAlertNotificationByID(c *models.ReqContext) response.Response { return response.Error(404, "Alert notification not found", nil) } - if err := bus.DispatchCtx(c.Req.Context(), query); err != nil { + if err := bus.Dispatch(c.Req.Context(), query); err != nil { return response.Error(500, "Failed to get alert notifications", err) } @@ -270,7 +270,7 @@ func GetAlertNotificationByUID(c *models.ReqContext) response.Response { return response.Error(404, "Alert notification not found", nil) } - if err := bus.DispatchCtx(c.Req.Context(), query); err != nil { + if err := bus.Dispatch(c.Req.Context(), query); err != nil { return response.Error(500, "Failed to get alert notifications", err) } @@ -288,7 +288,7 @@ func CreateAlertNotification(c *models.ReqContext) response.Response { } cmd.OrgId = c.OrgId - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrAlertNotificationWithSameNameExists) || errors.Is(err, models.ErrAlertNotificationWithSameUIDExists) { return response.Error(409, "Failed to create alert notification", err) } @@ -314,7 +314,7 @@ func (hs *HTTPServer) UpdateAlertNotification(c *models.ReqContext) response.Res return response.Error(500, "Failed to update alert notification", err) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrAlertNotificationNotFound) { return response.Error(404, err.Error(), err) } @@ -330,7 +330,7 @@ func (hs *HTTPServer) UpdateAlertNotification(c *models.ReqContext) response.Res Id: cmd.Id, } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to get alert notification", err) } @@ -350,7 +350,7 @@ func (hs *HTTPServer) UpdateAlertNotificationByUID(c *models.ReqContext) respons return response.Error(500, "Failed to update alert notification", err) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrAlertNotificationNotFound) { return response.Error(404, err.Error(), nil) } @@ -362,7 +362,7 @@ func (hs *HTTPServer) UpdateAlertNotificationByUID(c *models.ReqContext) respons Uid: cmd.Uid, } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to get alert notification", err) } @@ -379,7 +379,7 @@ func (hs *HTTPServer) fillWithSecureSettingsData(ctx context.Context, cmd *model Id: cmd.Id, } - if err := bus.DispatchCtx(ctx, query); err != nil { + if err := bus.Dispatch(ctx, query); err != nil { return err } @@ -407,7 +407,7 @@ func (hs *HTTPServer) fillWithSecureSettingsDataByUID(ctx context.Context, cmd * Uid: cmd.Uid, } - if err := bus.DispatchCtx(ctx, query); err != nil { + if err := bus.Dispatch(ctx, query); err != nil { return err } @@ -431,7 +431,7 @@ func DeleteAlertNotification(c *models.ReqContext) response.Response { Id: c.ParamsInt64(":notificationId"), } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrAlertNotificationNotFound) { return response.Error(404, err.Error(), nil) } @@ -447,7 +447,7 @@ func DeleteAlertNotificationByUID(c *models.ReqContext) response.Response { Uid: web.Params(c.Req)[":uid"], } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrAlertNotificationNotFound) { return response.Error(404, err.Error(), nil) } @@ -475,7 +475,7 @@ func NotificationTest(c *models.ReqContext) response.Response { SecureSettings: dto.SecureSettings, } - if err := bus.DispatchCtx(c.Req.Context(), cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), cmd); err != nil { if errors.Is(err, models.ErrSmtpNotEnabled) { return response.Error(412, err.Error(), err) } @@ -501,7 +501,7 @@ func PauseAlert(c *models.ReqContext) response.Response { result["alertId"] = alertID query := models.GetAlertByIdQuery{Id: alertID} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Get Alert failed", err) } @@ -531,7 +531,7 @@ func PauseAlert(c *models.ReqContext) response.Response { Paused: dto.Paused, } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "", err) } @@ -557,7 +557,7 @@ func PauseAllAlerts(c *models.ReqContext) response.Response { Paused: dto.Paused, } - if err := bus.DispatchCtx(c.Req.Context(), &updateCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &updateCmd); err != nil { return response.Error(500, "Failed to pause alerts", err) } diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go index ad5a75a7fc1..dfb3b98a810 100644 --- a/pkg/api/apikey.go +++ b/pkg/api/apikey.go @@ -17,7 +17,7 @@ import ( func GetAPIKeys(c *models.ReqContext) response.Response { query := models.GetApiKeysQuery{OrgId: c.OrgId, IncludeExpired: c.QueryBool("includeExpired")} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to list api keys", err) } @@ -45,7 +45,7 @@ func DeleteAPIKey(c *models.ReqContext) response.Response { cmd := &models.DeleteApiKeyCommand{Id: id, OrgId: c.OrgId} - err := bus.DispatchCtx(c.Req.Context(), cmd) + err := bus.Dispatch(c.Req.Context(), cmd) if err != nil { var status int if errors.Is(err, models.ErrApiKeyNotFound) { @@ -94,7 +94,7 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext) response.Response { //Check if user and service account are in the same org query := models.GetUserByIdQuery{Id: cmd.ServiceAccountId} - err = bus.DispatchCtx(c.Req.Context(), &query) + err = bus.Dispatch(c.Req.Context(), &query) if err != nil { hs.log.Warn("Unable to link new API key to existing service account", "err", err, "query", query) return response.Error(500, "Unable to link new API key to existing service account", err) @@ -118,7 +118,7 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext) response.Response { cmd.Key = newKeyInfo.HashedKey - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrInvalidApiKeyExpiration) { return response.Error(400, err.Error(), nil) } diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 812c3ad0881..f0e6e6e505c 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -34,7 +34,7 @@ func isDashboardStarredByUser(c *models.ReqContext, dashID int64) (bool, error) } query := models.IsStarredByUserQuery{UserId: c.UserId, DashboardId: dashID} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return false, err } @@ -142,7 +142,7 @@ func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response { // lookup folder title if dash.FolderId > 0 { query := models.GetDashboardQuery{Id: dash.FolderId, OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrFolderNotFound) { return response.Error(404, "Folder not found", err) } @@ -196,7 +196,7 @@ func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response { func getUserLogin(ctx context.Context, userID int64) string { query := models.GetUserByIdQuery{Id: userID} - err := bus.DispatchCtx(ctx, &query) + err := bus.Dispatch(ctx, &query) if err != nil { return anonString } @@ -212,7 +212,7 @@ func getDashboardHelper(ctx context.Context, orgID int64, id int64, uid string) query = models.GetDashboardQuery{Id: id, OrgId: orgID} } - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return nil, response.Error(404, "Dashboard not found", err) } @@ -222,7 +222,7 @@ func getDashboardHelper(ctx context.Context, orgID int64, id int64, uid string) func (hs *HTTPServer) DeleteDashboardBySlug(c *models.ReqContext) response.Response { query := models.GetDashboardsBySlugQuery{OrgId: c.OrgId, Slug: web.Params(c.Req)[":slug"]} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to retrieve dashboards by slug", err) } @@ -448,7 +448,7 @@ func (hs *HTTPServer) GetHomeDashboard(c *models.ReqContext) response.Response { prefsQuery := models.GetPreferencesWithDefaultsQuery{User: c.SignedInUser} homePage := hs.Cfg.HomePage - if err := hs.Bus.DispatchCtx(c.Req.Context(), &prefsQuery); err != nil { + if err := hs.Bus.Dispatch(c.Req.Context(), &prefsQuery); err != nil { return response.Error(500, "Failed to get preferences", err) } @@ -459,7 +459,7 @@ func (hs *HTTPServer) GetHomeDashboard(c *models.ReqContext) response.Response { if prefsQuery.Result.HomeDashboardId != 0 { slugQuery := models.GetDashboardRefByIdQuery{Id: prefsQuery.Result.HomeDashboardId} - err := hs.Bus.DispatchCtx(c.Req.Context(), &slugQuery) + err := hs.Bus.Dispatch(c.Req.Context(), &slugQuery) if err == nil { url := models.GetDashboardUrl(slugQuery.Result.Uid, slugQuery.Result.Slug) dashRedirect := dtos.DashboardRedirect{RedirectUri: url} @@ -543,7 +543,7 @@ func GetDashboardVersions(c *models.ReqContext) response.Response { Start: c.QueryInt("start"), } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(404, fmt.Sprintf("No versions found for dashboardId %d", dashID), err) } @@ -582,7 +582,7 @@ func GetDashboardVersion(c *models.ReqContext) response.Response { Version: int(version), } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, fmt.Sprintf("Dashboard version %d not found for dashboardId %d", query.Version, dashID), err) } @@ -671,7 +671,7 @@ func (hs *HTTPServer) RestoreDashboardVersion(c *models.ReqContext) response.Res } versionQuery := models.GetDashboardVersionQuery{DashboardId: dash.Id, Version: apiCmd.Version, OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &versionQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &versionQuery); err != nil { return response.Error(404, "Dashboard version not found", nil) } @@ -692,7 +692,7 @@ func (hs *HTTPServer) RestoreDashboardVersion(c *models.ReqContext) response.Res func GetDashboardTags(c *models.ReqContext) { query := models.GetDashboardTagsQuery{OrgId: c.OrgId} - err := bus.DispatchCtx(c.Req.Context(), &query) + err := bus.Dispatch(c.Req.Context(), &query) if err != nil { c.JsonApiErr(500, "Failed to get tags from database", err) return diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go index 10dde77e97b..d088a380608 100644 --- a/pkg/api/dashboard_snapshot.go +++ b/pkg/api/dashboard_snapshot.go @@ -134,7 +134,7 @@ func CreateDashboardSnapshot(c *models.ReqContext) response.Response { metrics.MApiDashboardSnapshotCreate.Inc() } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { c.JsonApiErr(500, "Failed to create snapshot", err) return nil } @@ -158,7 +158,7 @@ func GetDashboardSnapshot(c *models.ReqContext) response.Response { query := &models.GetDashboardSnapshotQuery{Key: key} - err := bus.DispatchCtx(c.Req.Context(), query) + err := bus.Dispatch(c.Req.Context(), query) if err != nil { return response.Error(500, "Failed to get dashboard snapshot", err) } @@ -226,7 +226,7 @@ func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response query := &models.GetDashboardSnapshotQuery{DeleteKey: key} - err := bus.DispatchCtx(c.Req.Context(), query) + err := bus.Dispatch(c.Req.Context(), query) if err != nil { return response.Error(500, "Failed to get dashboard snapshot", err) } @@ -240,7 +240,7 @@ func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response cmd := &models.DeleteDashboardSnapshotCommand{DeleteKey: query.Result.DeleteKey} - if err := bus.DispatchCtx(c.Req.Context(), cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), cmd); err != nil { return response.Error(500, "Failed to delete dashboard snapshot", err) } @@ -259,7 +259,7 @@ func DeleteDashboardSnapshot(c *models.ReqContext) response.Response { query := &models.GetDashboardSnapshotQuery{Key: key} - err := bus.DispatchCtx(c.Req.Context(), query) + err := bus.Dispatch(c.Req.Context(), query) if err != nil { return response.Error(500, "Failed to get dashboard snapshot", err) } @@ -288,7 +288,7 @@ func DeleteDashboardSnapshot(c *models.ReqContext) response.Response { cmd := &models.DeleteDashboardSnapshotCommand{DeleteKey: query.Result.DeleteKey} - if err := bus.DispatchCtx(c.Req.Context(), cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), cmd); err != nil { return response.Error(500, "Failed to delete dashboard snapshot", err) } @@ -314,7 +314,7 @@ func SearchDashboardSnapshots(c *models.ReqContext) response.Response { SignedInUser: c.SignedInUser, } - err := bus.DispatchCtx(c.Req.Context(), &searchQuery) + err := bus.Dispatch(c.Req.Context(), &searchQuery) if err != nil { return response.Error(500, "Search failed", err) } diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index 9a6c18c32e3..1de23a88143 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -26,7 +26,7 @@ var datasourcesLogger = log.New("datasources") func (hs *HTTPServer) GetDataSources(c *models.ReqContext) response.Response { query := models.GetDataSourcesQuery{OrgId: c.OrgId, DataSourceLimit: hs.Cfg.DataSourceLimit} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to query datasources", err) } @@ -92,7 +92,7 @@ func (hs *HTTPServer) GetDataSourceById(c *models.ReqContext) response.Response OrgId: c.OrgId, } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrDataSourceNotFound) { return response.Error(404, "Data source not found", nil) } @@ -136,7 +136,7 @@ func (hs *HTTPServer) DeleteDataSourceById(c *models.ReqContext) response.Respon cmd := &models.DeleteDataSourceCommand{ID: id, OrgID: c.OrgId} - err = bus.DispatchCtx(c.Req.Context(), cmd) + err = bus.Dispatch(c.Req.Context(), cmd) if err != nil { return response.Error(500, "Failed to delete datasource", err) } @@ -191,7 +191,7 @@ func (hs *HTTPServer) DeleteDataSourceByUID(c *models.ReqContext) response.Respo cmd := &models.DeleteDataSourceCommand{UID: uid, OrgID: c.OrgId} - err = bus.DispatchCtx(c.Req.Context(), cmd) + err = bus.Dispatch(c.Req.Context(), cmd) if err != nil { return response.Error(500, "Failed to delete datasource", err) } @@ -212,7 +212,7 @@ func (hs *HTTPServer) DeleteDataSourceByName(c *models.ReqContext) response.Resp } getCmd := &models.GetDataSourceQuery{Name: name, OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), getCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), getCmd); err != nil { if errors.Is(err, models.ErrDataSourceNotFound) { return response.Error(404, "Data source not found", nil) } @@ -224,7 +224,7 @@ func (hs *HTTPServer) DeleteDataSourceByName(c *models.ReqContext) response.Resp } cmd := &models.DeleteDataSourceCommand{Name: name, OrgID: c.OrgId} - err := bus.DispatchCtx(c.Req.Context(), cmd) + err := bus.Dispatch(c.Req.Context(), cmd) if err != nil { return response.Error(500, "Failed to delete datasource", err) } @@ -260,7 +260,7 @@ func AddDataSource(c *models.ReqContext) response.Response { return resp } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrDataSourceNameExists) || errors.Is(err, models.ErrDataSourceUidExists) { return response.Error(409, err.Error(), err) } @@ -294,7 +294,7 @@ func (hs *HTTPServer) UpdateDataSource(c *models.ReqContext) response.Response { return response.Error(500, "Failed to update datasource", err) } - err = bus.DispatchCtx(c.Req.Context(), &cmd) + err = bus.Dispatch(c.Req.Context(), &cmd) if err != nil { if errors.Is(err, models.ErrDataSourceUpdatingOldVersion) { return response.Error(409, "Datasource has already been updated by someone else. Please reload and try again", err) @@ -307,7 +307,7 @@ func (hs *HTTPServer) UpdateDataSource(c *models.ReqContext) response.Response { OrgId: c.OrgId, } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrDataSourceNotFound) { return response.Error(404, "Data source not found", nil) } @@ -359,7 +359,7 @@ func getRawDataSourceById(ctx context.Context, id int64, orgID int64) (*models.D OrgId: orgID, } - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return nil, err } @@ -372,7 +372,7 @@ func getRawDataSourceByUID(ctx context.Context, uid string, orgID int64) (*model OrgId: orgID, } - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return nil, err } @@ -383,7 +383,7 @@ func getRawDataSourceByUID(ctx context.Context, uid string, orgID int64) (*model func GetDataSourceByName(c *models.ReqContext) response.Response { query := models.GetDataSourceQuery{Name: web.Params(c.Req)[":name"], OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrDataSourceNotFound) { return response.Error(404, "Data source not found", nil) } @@ -398,7 +398,7 @@ func GetDataSourceByName(c *models.ReqContext) response.Response { func GetDataSourceIdByName(c *models.ReqContext) response.Response { query := models.GetDataSourceQuery{Name: web.Params(c.Req)[":name"], OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrDataSourceNotFound) { return response.Error(404, "Data source not found", nil) } diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 466bcada691..28461012518 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -19,7 +19,7 @@ func (hs *HTTPServer) getFSDataSources(c *models.ReqContext, enabledPlugins Enab if c.OrgId != 0 { query := models.GetDataSourcesQuery{OrgId: c.OrgId, DataSourceLimit: hs.Cfg.DataSourceLimit} - err := bus.DispatchCtx(c.Req.Context(), &query) + err := bus.Dispatch(c.Req.Context(), &query) if err != nil { return nil, err @@ -30,7 +30,7 @@ func (hs *HTTPServer) getFSDataSources(c *models.ReqContext, enabledPlugins Enab Datasources: query.Result, } - if err := bus.DispatchCtx(c.Req.Context(), &dsFilterQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &dsFilterQuery); err != nil { if !errors.Is(err, bus.ErrHandlerNotFound) { return nil, err } diff --git a/pkg/api/health.go b/pkg/api/health.go index a6aafd7b070..95a486be297 100644 --- a/pkg/api/health.go +++ b/pkg/api/health.go @@ -15,7 +15,7 @@ func (hs *HTTPServer) databaseHealthy(ctx context.Context) bool { return cached.(bool) } - healthy := bus.DispatchCtx(ctx, &models.GetDBHealthQuery{}) == nil + healthy := bus.Dispatch(ctx, &models.GetDBHealthQuery{}) == nil hs.CacheService.Set(cacheKey, healthy, time.Second*5) return healthy diff --git a/pkg/api/index.go b/pkg/api/index.go index 31f7e3a5e8d..0163474db3b 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -519,7 +519,7 @@ func (hs *HTTPServer) buildAdminNavLinks(c *models.ReqContext) []*dtos.NavLink { func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewData, error) { hasEditPermissionInFoldersQuery := models.HasEditPermissionInFoldersQuery{SignedInUser: c.SignedInUser} - if err := bus.DispatchCtx(c.Req.Context(), &hasEditPermissionInFoldersQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &hasEditPermissionInFoldersQuery); err != nil { return nil, err } hasEditPerm := hasEditPermissionInFoldersQuery.Result @@ -532,7 +532,7 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat settings["dateFormats"] = hs.Cfg.DateFormats prefsQuery := models.GetPreferencesWithDefaultsQuery{User: c.SignedInUser} - if err := bus.DispatchCtx(c.Req.Context(), &prefsQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &prefsQuery); err != nil { return nil, err } prefs := prefsQuery.Result diff --git a/pkg/api/ldap_debug.go b/pkg/api/ldap_debug.go index 71b9d1d98cb..838820445c8 100644 --- a/pkg/api/ldap_debug.go +++ b/pkg/api/ldap_debug.go @@ -73,7 +73,7 @@ func (user *LDAPUserDTO) FetchOrgs(ctx context.Context) error { q := &models.SearchOrgsQuery{} q.Ids = orgIds - if err := bus.DispatchCtx(ctx, q); err != nil { + if err := bus.Dispatch(ctx, q); err != nil { return err } @@ -167,7 +167,7 @@ func (hs *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) response.Respon query := models.GetUserByIdQuery{Id: userId} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { // validate the userId exists + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { // validate the userId exists if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } @@ -177,7 +177,7 @@ func (hs *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) response.Respon authModuleQuery := &models.GetAuthInfoQuery{UserId: query.Result.Id, AuthModule: models.AuthModuleLDAP} - if err := bus.DispatchCtx(c.Req.Context(), authModuleQuery); err != nil { // validate the userId comes from LDAP + if err := bus.Dispatch(c.Req.Context(), authModuleQuery); err != nil { // validate the userId comes from LDAP if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } @@ -219,7 +219,7 @@ func (hs *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) response.Respon SignupAllowed: hs.Cfg.LDAPAllowSignup, } - err = bus.DispatchCtx(c.Req.Context(), upsertCmd) + err = bus.Dispatch(c.Req.Context(), upsertCmd) if err != nil { return response.Error(http.StatusInternalServerError, "Failed to update the user", err) } @@ -308,7 +308,7 @@ func (hs *HTTPServer) GetUserFromLDAP(c *models.ReqContext) response.Response { } cmd := &models.GetTeamsForLDAPGroupCommand{Groups: user.Groups} - err = bus.DispatchCtx(c.Req.Context(), cmd) + err = bus.Dispatch(c.Req.Context(), cmd) if err != nil && !errors.Is(err, bus.ErrHandlerNotFound) { return response.Error(http.StatusBadRequest, "Unable to find the teams for this user", err) } diff --git a/pkg/api/login.go b/pkg/api/login.go index a33ddf98836..48a9ebf174b 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -207,7 +207,7 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext) response.Response { Cfg: hs.Cfg, } - err := bus.DispatchCtx(c.Req.Context(), authQuery) + err := bus.Dispatch(c.Req.Context(), authQuery) authModule = authQuery.AuthModule if err != nil { resp = response.Error(401, "Invalid username or password", err) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index bf2c7d0c197..8060092a4a6 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -313,7 +313,7 @@ func syncUser( ExternalUser: extUser, SignupAllowed: connect.IsSignupAllowed(), } - if err := bus.DispatchCtx(ctx.Req.Context(), cmd); err != nil { + if err := bus.Dispatch(ctx.Req.Context(), cmd); err != nil { return nil, err } diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go index 7a4e2db7763..5dec2160c8e 100644 --- a/pkg/api/org_invite.go +++ b/pkg/api/org_invite.go @@ -20,7 +20,7 @@ import ( func GetPendingOrgInvites(c *models.ReqContext) response.Response { query := models.GetTempUsersQuery{OrgId: c.OrgId, Status: models.TmpUserInvitePending} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to get invites from db", err) } @@ -42,7 +42,7 @@ func AddOrgInvite(c *models.ReqContext) response.Response { // first try get existing user userQuery := models.GetUserByLoginQuery{LoginOrEmail: inviteDto.LoginOrEmail} - if err := bus.DispatchCtx(c.Req.Context(), &userQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &userQuery); err != nil { if !errors.Is(err, models.ErrUserNotFound) { return response.Error(500, "Failed to query db for existing user check", err) } @@ -68,7 +68,7 @@ func AddOrgInvite(c *models.ReqContext) response.Response { cmd.Role = inviteDto.Role cmd.RemoteAddr = c.Req.RemoteAddr - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to save invite to database", err) } @@ -86,7 +86,7 @@ func AddOrgInvite(c *models.ReqContext) response.Response { }, } - if err := bus.DispatchCtx(c.Req.Context(), &emailCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &emailCmd); err != nil { if errors.Is(err, models.ErrSmtpNotEnabled) { return response.Error(412, err.Error(), err) } @@ -95,7 +95,7 @@ func AddOrgInvite(c *models.ReqContext) response.Response { } emailSentCmd := models.UpdateTempUserWithEmailSentCommand{Code: cmd.Result.Code} - if err := bus.DispatchCtx(c.Req.Context(), &emailSentCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &emailSentCmd); err != nil { return response.Error(500, "Failed to update invite with email sent info", err) } @@ -108,7 +108,7 @@ func AddOrgInvite(c *models.ReqContext) response.Response { func inviteExistingUserToOrg(c *models.ReqContext, user *models.User, inviteDto *dtos.AddInviteForm) response.Response { // user exists, add org role createOrgUserCmd := models.AddOrgUserCommand{OrgId: c.OrgId, UserId: user.Id, Role: inviteDto.Role} - if err := bus.DispatchCtx(c.Req.Context(), &createOrgUserCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &createOrgUserCmd); err != nil { if errors.Is(err, models.ErrOrgUserAlreadyAdded) { return response.Error(412, fmt.Sprintf("User %s is already added to organization", inviteDto.LoginOrEmail), err) } @@ -126,7 +126,7 @@ func inviteExistingUserToOrg(c *models.ReqContext, user *models.User, inviteDto }, } - if err := bus.DispatchCtx(c.Req.Context(), &emailCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &emailCmd); err != nil { return response.Error(500, "Failed to send email invited_to_org", err) } } @@ -150,7 +150,7 @@ func RevokeInvite(c *models.ReqContext) response.Response { // If a (pending) invite is not found, 404 is returned. func GetInviteInfoByCode(c *models.ReqContext) response.Response { query := models.GetTempUserByCodeQuery{Code: web.Params(c.Req)[":code"]} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrTempUserNotFound) { return response.Error(404, "Invite not found", nil) } @@ -177,7 +177,7 @@ func (hs *HTTPServer) CompleteInvite(c *models.ReqContext) response.Response { } query := models.GetTempUserByCodeQuery{Code: completeInvite.InviteCode} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrTempUserNotFound) { return response.Error(404, "Invite not found", nil) } @@ -234,7 +234,7 @@ func (hs *HTTPServer) CompleteInvite(c *models.ReqContext) response.Response { func updateTempUserStatus(ctx context.Context, code string, status models.TempUserStatus) (bool, response.Response) { // update temp user status updateTmpUserCmd := models.UpdateTempUserStatusCommand{Code: code, Status: status} - if err := bus.DispatchCtx(ctx, &updateTmpUserCmd); err != nil { + if err := bus.Dispatch(ctx, &updateTmpUserCmd); err != nil { return false, response.Error(500, "Failed to update invite status", err) } @@ -244,7 +244,7 @@ func updateTempUserStatus(ctx context.Context, code string, status models.TempUs func applyUserInvite(ctx context.Context, user *models.User, invite *models.TempUserDTO, setActive bool) (bool, response.Response) { // add to org addOrgUserCmd := models.AddOrgUserCommand{OrgId: invite.OrgId, UserId: user.Id, Role: invite.Role} - if err := bus.DispatchCtx(ctx, &addOrgUserCmd); err != nil { + if err := bus.Dispatch(ctx, &addOrgUserCmd); err != nil { if !errors.Is(err, models.ErrOrgUserAlreadyAdded) { return false, response.Error(500, "Error while trying to create org user", err) } @@ -257,7 +257,7 @@ func applyUserInvite(ctx context.Context, user *models.User, invite *models.Temp if setActive { // set org to active - if err := bus.DispatchCtx(ctx, &models.SetUsingOrgCommand{OrgId: invite.OrgId, UserId: user.Id}); err != nil { + if err := bus.Dispatch(ctx, &models.SetUsingOrgCommand{OrgId: invite.OrgId, UserId: user.Id}); err != nil { return false, response.Error(500, "Failed to set org as active", err) } } diff --git a/pkg/api/password.go b/pkg/api/password.go index bf624e2f5a3..04c09a7470b 100644 --- a/pkg/api/password.go +++ b/pkg/api/password.go @@ -27,13 +27,13 @@ func SendResetPasswordEmail(c *models.ReqContext) response.Response { userQuery := models.GetUserByLoginQuery{LoginOrEmail: form.UserOrEmail} - if err := bus.DispatchCtx(c.Req.Context(), &userQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &userQuery); err != nil { c.Logger.Info("Requested password reset for user that was not found", "user", userQuery.LoginOrEmail) return response.Error(200, "Email sent", err) } emailCmd := models.SendResetPasswordEmailCommand{User: userQuery.Result} - if err := bus.DispatchCtx(c.Req.Context(), &emailCmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &emailCmd); err != nil { return response.Error(500, "Failed to send email", err) } @@ -47,7 +47,7 @@ func ResetPassword(c *models.ReqContext) response.Response { } query := models.ValidateResetPasswordCodeQuery{Code: form.Code} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrInvalidEmailCode) { return response.Error(400, "Invalid or expired reset password code", nil) } @@ -66,7 +66,7 @@ func ResetPassword(c *models.ReqContext) response.Response { return response.Error(500, "Failed to encode password", err) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to change user password", err) } diff --git a/pkg/api/playlist.go b/pkg/api/playlist.go index 9f5577739dc..4557ac2d159 100644 --- a/pkg/api/playlist.go +++ b/pkg/api/playlist.go @@ -13,7 +13,7 @@ import ( func ValidateOrgPlaylist(c *models.ReqContext) { id := c.ParamsInt64(":id") query := models.GetPlaylistByIdQuery{Id: id} - err := bus.DispatchCtx(c.Req.Context(), &query) + err := bus.Dispatch(c.Req.Context(), &query) if err != nil { c.JsonApiErr(404, "Playlist not found", err) @@ -45,7 +45,7 @@ func SearchPlaylists(c *models.ReqContext) response.Response { OrgId: c.OrgId, } - err := bus.DispatchCtx(c.Req.Context(), &searchQuery) + err := bus.Dispatch(c.Req.Context(), &searchQuery) if err != nil { return response.Error(500, "Search failed", err) } @@ -57,7 +57,7 @@ func GetPlaylist(c *models.ReqContext) response.Response { id := c.ParamsInt64(":id") cmd := models.GetPlaylistByIdQuery{Id: id} - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Playlist not found", err) } @@ -99,7 +99,7 @@ func LoadPlaylistItemDTOs(ctx context.Context, id int64) ([]models.PlaylistItemD func LoadPlaylistItems(ctx context.Context, id int64) ([]models.PlaylistItem, error) { itemQuery := models.GetPlaylistItemsByIdQuery{PlaylistId: id} - if err := bus.DispatchCtx(ctx, &itemQuery); err != nil { + if err := bus.Dispatch(ctx, &itemQuery); err != nil { return nil, err } @@ -133,7 +133,7 @@ func DeletePlaylist(c *models.ReqContext) response.Response { id := c.ParamsInt64(":id") cmd := models.DeletePlaylistCommand{Id: id, OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to delete playlist", err) } @@ -147,7 +147,7 @@ func CreatePlaylist(c *models.ReqContext) response.Response { } cmd.OrgId = c.OrgId - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to create playlist", err) } @@ -162,7 +162,7 @@ func UpdatePlaylist(c *models.ReqContext) response.Response { cmd.OrgId = c.OrgId cmd.Id = c.ParamsInt64(":id") - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to save playlist", err) } diff --git a/pkg/api/playlist_play.go b/pkg/api/playlist_play.go index dc3328d74e3..c7ea1737444 100644 --- a/pkg/api/playlist_play.go +++ b/pkg/api/playlist_play.go @@ -17,7 +17,7 @@ func populateDashboardsByID(ctx context.Context, dashboardByIDs []int64, dashboa if len(dashboardByIDs) > 0 { dashboardQuery := models.GetDashboardsQuery{DashboardIds: dashboardByIDs} - if err := bus.DispatchCtx(ctx, &dashboardQuery); err != nil { + if err := bus.Dispatch(ctx, &dashboardQuery); err != nil { return result, err } @@ -49,7 +49,7 @@ func populateDashboardsByTag(ctx context.Context, orgID int64, signedInUser *mod OrgId: orgID, } - if err := bus.DispatchCtx(ctx, &searchQuery); err == nil { + if err := bus.Dispatch(ctx, &searchQuery); err == nil { for _, item := range searchQuery.Result { result = append(result, dtos.PlaylistDashboard{ Id: item.ID, diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go index a972d3d500a..d2f88ff0a31 100644 --- a/pkg/api/pluginproxy/pluginproxy.go +++ b/pkg/api/pluginproxy/pluginproxy.go @@ -25,7 +25,7 @@ func NewApiPluginProxy(ctx *models.ReqContext, proxyPath string, route *plugins. appID string, cfg *setting.Cfg, secretsService secrets.Service) *httputil.ReverseProxy { director := func(req *http.Request) { query := models.GetPluginSettingByIdQuery{OrgId: ctx.OrgId, PluginId: appID} - if err := bus.DispatchCtx(ctx.Req.Context(), &query); err != nil { + if err := bus.Dispatch(ctx.Req.Context(), &query); err != nil { ctx.JsonApiErr(500, "Failed to fetch plugin settings", err) return } diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go index 639d0804ddf..ef2bc8827f4 100644 --- a/pkg/api/plugins.go +++ b/pkg/api/plugins.go @@ -141,7 +141,7 @@ func (hs *HTTPServer) GetPluginSettingByID(c *models.ReqContext) response.Respon } query := models.GetPluginSettingByIdQuery{PluginId: pluginID, OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if !errors.Is(err, models.ErrPluginSettingNotFound) { return response.Error(500, "Failed to get login settings", nil) } @@ -167,7 +167,7 @@ func (hs *HTTPServer) UpdatePluginSetting(c *models.ReqContext) response.Respons cmd.OrgId = c.OrgId cmd.PluginId = pluginID - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to update plugin setting", err) } diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go index bbe7908df0d..c7da91a0fdf 100644 --- a/pkg/api/preferences.go +++ b/pkg/api/preferences.go @@ -26,7 +26,7 @@ func SetHomeDashboard(c *models.ReqContext) response.Response { cmd.UserId = c.UserId cmd.OrgId = c.OrgId - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to set home dashboard", err) } diff --git a/pkg/api/quota.go b/pkg/api/quota.go index b9aa899ad38..485a72dbf44 100644 --- a/pkg/api/quota.go +++ b/pkg/api/quota.go @@ -58,7 +58,7 @@ func GetUserQuotas(c *models.ReqContext) response.Response { } query := models.GetUserQuotasQuery{UserId: c.ParamsInt64(":id")} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to get org quotas", err) } @@ -80,7 +80,7 @@ func UpdateUserQuota(c *models.ReqContext) response.Response { return response.Error(404, "Invalid quota target", nil) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to update org quotas", err) } return response.Success("Organization quota updated") diff --git a/pkg/api/search.go b/pkg/api/search.go index ce1355bbaef..fa691138967 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -62,7 +62,7 @@ func Search(c *models.ReqContext) response.Response { Sort: sort, } - err := bus.DispatchCtx(c.Req.Context(), &searchQuery) + err := bus.Dispatch(c.Req.Context(), &searchQuery) if err != nil { return response.Error(500, "Search failed", err) } diff --git a/pkg/api/signup.go b/pkg/api/signup.go index 414810248c0..259882b25d5 100644 --- a/pkg/api/signup.go +++ b/pkg/api/signup.go @@ -35,7 +35,7 @@ func SignUp(c *models.ReqContext) response.Response { } existing := models.GetUserByLoginQuery{LoginOrEmail: form.Email} - if err := bus.DispatchCtx(c.Req.Context(), &existing); err == nil { + if err := bus.Dispatch(c.Req.Context(), &existing); err == nil { return response.Error(422, "User with same email address already exists", nil) } @@ -51,7 +51,7 @@ func SignUp(c *models.ReqContext) response.Response { } cmd.RemoteAddr = c.Req.RemoteAddr - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to create signup", err) } @@ -116,7 +116,7 @@ func (hs *HTTPServer) SignUpStep2(c *models.ReqContext) response.Response { // check for pending invites invitesQuery := models.GetTempUsersQuery{Email: form.Email, Status: models.TmpUserInvitePending} - if err := bus.DispatchCtx(c.Req.Context(), &invitesQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &invitesQuery); err != nil { return response.Error(500, "Failed to query database for invites", err) } @@ -141,7 +141,7 @@ func (hs *HTTPServer) SignUpStep2(c *models.ReqContext) response.Response { func verifyUserSignUpEmail(ctx context.Context, email string, code string) (bool, response.Response) { query := models.GetTempUserByCodeQuery{Code: code} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { if errors.Is(err, models.ErrTempUserNotFound) { return false, response.Error(404, "Invalid email verification code", nil) } diff --git a/pkg/api/stars.go b/pkg/api/stars.go index 3e4b68c2995..ff65c4b225d 100644 --- a/pkg/api/stars.go +++ b/pkg/api/stars.go @@ -13,7 +13,7 @@ func StarDashboard(c *models.ReqContext) response.Response { return response.Error(400, "Missing dashboard id", nil) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to star dashboard", err) } @@ -27,7 +27,7 @@ func UnstarDashboard(c *models.ReqContext) response.Response { return response.Error(400, "Missing dashboard id", nil) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to unstar dashboard", err) } diff --git a/pkg/api/team.go b/pkg/api/team.go index 1bbb2e03e57..65b25bd2490 100644 --- a/pkg/api/team.go +++ b/pkg/api/team.go @@ -65,7 +65,7 @@ func (hs *HTTPServer) UpdateTeam(c *models.ReqContext) response.Response { return response.Error(403, "Not allowed to update team", err) } - if err := hs.Bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := hs.Bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrTeamNameTaken) { return response.Error(400, "Team name taken", err) } @@ -85,7 +85,7 @@ func (hs *HTTPServer) DeleteTeamByID(c *models.ReqContext) response.Response { return response.Error(403, "Not allowed to delete team", err) } - if err := hs.Bus.DispatchCtx(c.Req.Context(), &models.DeleteTeamCommand{OrgId: orgId, Id: teamId}); err != nil { + if err := hs.Bus.Dispatch(c.Req.Context(), &models.DeleteTeamCommand{OrgId: orgId, Id: teamId}); err != nil { if errors.Is(err, models.ErrTeamNotFound) { return response.Error(404, "Failed to delete Team. ID not found", nil) } @@ -121,7 +121,7 @@ func (hs *HTTPServer) SearchTeams(c *models.ReqContext) response.Response { HiddenUsers: hs.Cfg.HiddenUsers, } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to search Teams", err) } @@ -144,7 +144,7 @@ func (hs *HTTPServer) GetTeamByID(c *models.ReqContext) response.Response { HiddenUsers: hs.Cfg.HiddenUsers, } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrTeamNotFound) { return response.Error(404, "Team not found", err) } diff --git a/pkg/api/team_members.go b/pkg/api/team_members.go index 75cd4b7e75b..934e0d12ebf 100644 --- a/pkg/api/team_members.go +++ b/pkg/api/team_members.go @@ -18,7 +18,7 @@ import ( func (hs *HTTPServer) GetTeamMembers(c *models.ReqContext) response.Response { query := models.GetTeamMembersQuery{OrgId: c.OrgId, TeamId: c.ParamsInt64(":teamId")} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return response.Error(500, "Failed to get Team Members", err) } @@ -94,7 +94,7 @@ func (hs *HTTPServer) UpdateTeamMember(c *models.ReqContext) response.Response { cmd.UserId = c.ParamsInt64(":userId") cmd.OrgId = orgId - if err := hs.Bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := hs.Bus.Dispatch(c.Req.Context(), &cmd); err != nil { if errors.Is(err, models.ErrTeamMemberNotFound) { return response.Error(404, "Team member not found.", nil) } @@ -118,7 +118,7 @@ func (hs *HTTPServer) RemoveTeamMember(c *models.ReqContext) response.Response { protectLastAdmin = true } - if err := hs.Bus.DispatchCtx(c.Req.Context(), &models.RemoveTeamMemberCommand{OrgId: orgId, TeamId: teamId, UserId: userId, ProtectLastAdmin: protectLastAdmin}); err != nil { + if err := hs.Bus.Dispatch(c.Req.Context(), &models.RemoveTeamMemberCommand{OrgId: orgId, TeamId: teamId, UserId: userId, ProtectLastAdmin: protectLastAdmin}); err != nil { if errors.Is(err, models.ErrTeamNotFound) { return response.Error(404, "Team not found", nil) } diff --git a/pkg/api/user.go b/pkg/api/user.go index 242d7dff02c..7ccf2915a9d 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -27,7 +27,7 @@ func GetUserByID(c *models.ReqContext) response.Response { func getUserUserProfile(ctx context.Context, userID int64) response.Response { query := models.GetUserProfileQuery{UserId: userID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } @@ -36,7 +36,7 @@ func getUserUserProfile(ctx context.Context, userID int64) response.Response { getAuthQuery := models.GetAuthInfoQuery{UserId: userID} query.Result.AuthLabels = []string{} - if err := bus.DispatchCtx(ctx, &getAuthQuery); err == nil { + if err := bus.Dispatch(ctx, &getAuthQuery); err == nil { authLabel := GetAuthProviderLabel(getAuthQuery.Result.AuthModule) query.Result.AuthLabels = append(query.Result.AuthLabels, authLabel) query.Result.IsExternal = true @@ -50,7 +50,7 @@ func getUserUserProfile(ctx context.Context, userID int64) response.Response { // GET /api/users/lookup func GetUserByLoginOrEmail(c *models.ReqContext) response.Response { query := models.GetUserByLoginQuery{LoginOrEmail: c.Query("loginOrEmail")} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, models.ErrUserNotFound.Error(), nil) } @@ -110,7 +110,7 @@ func UpdateUserActiveOrg(c *models.ReqContext) response.Response { cmd := models.SetUsingOrgCommand{UserId: userID, OrgId: orgID} - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to change active organization", err) } @@ -125,7 +125,7 @@ func handleUpdateUser(ctx context.Context, cmd models.UpdateUserCommand) respons } } - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { return response.Error(500, "Failed to update user", err) } @@ -150,7 +150,7 @@ func GetUserTeams(c *models.ReqContext) response.Response { func getUserTeamList(ctx context.Context, orgID int64, userID int64) response.Response { query := models.GetTeamsByUserQuery{OrgId: orgID, UserId: userID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return response.Error(500, "Failed to get user teams", err) } @@ -168,7 +168,7 @@ func GetUserOrgList(c *models.ReqContext) response.Response { func getUserOrgList(ctx context.Context, userID int64) response.Response { query := models.GetUserOrgListQuery{UserId: userID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return response.Error(500, "Failed to get user organizations", err) } @@ -178,7 +178,7 @@ func getUserOrgList(ctx context.Context, userID int64) response.Response { func validateUsingOrg(ctx context.Context, userID int64, orgID int64) bool { query := models.GetUserOrgListQuery{UserId: userID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return false } @@ -203,7 +203,7 @@ func UserSetUsingOrg(c *models.ReqContext) response.Response { cmd := models.SetUsingOrgCommand{UserId: c.UserId, OrgId: orgID} - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to change active organization", err) } @@ -220,7 +220,7 @@ func (hs *HTTPServer) ChangeActiveOrgAndRedirectToHome(c *models.ReqContext) { cmd := models.SetUsingOrgCommand{UserId: c.UserId, OrgId: orgID} - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { hs.NotFoundHandler(c) } @@ -238,7 +238,7 @@ func ChangeUserPassword(c *models.ReqContext) response.Response { userQuery := models.GetUserByIdQuery{Id: c.UserId} - if err := bus.DispatchCtx(c.Req.Context(), &userQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &userQuery); err != nil { return response.Error(500, "Could not read user from database", err) } @@ -261,7 +261,7 @@ func ChangeUserPassword(c *models.ReqContext) response.Response { return response.Error(500, "Failed to encode password", err) } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to change user password", err) } @@ -284,7 +284,7 @@ func SetHelpFlag(c *models.ReqContext) response.Response { HelpFlags1: *bitmask, } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to update help flag", err) } @@ -297,7 +297,7 @@ func ClearHelpFlags(c *models.ReqContext) response.Response { HelpFlags1: models.HelpFlags1(0), } - if err := bus.DispatchCtx(c.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to update help flag", err) } diff --git a/pkg/api/user_token.go b/pkg/api/user_token.go index 5f15a0f7fac..5eb8c153b83 100644 --- a/pkg/api/user_token.go +++ b/pkg/api/user_token.go @@ -32,7 +32,7 @@ func (hs *HTTPServer) RevokeUserAuthToken(c *models.ReqContext) response.Respons func (hs *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context, userID int64) response.Response { userQuery := models.GetUserByIdQuery{Id: userID} - if err := bus.DispatchCtx(ctx, &userQuery); err != nil { + if err := bus.Dispatch(ctx, &userQuery); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, "User not found", err) } @@ -52,7 +52,7 @@ func (hs *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context, user func (hs *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID int64) response.Response { userQuery := models.GetUserByIdQuery{Id: userID} - if err := bus.DispatchCtx(c.Req.Context(), &userQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &userQuery); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, "User not found", err) } @@ -119,7 +119,7 @@ func (hs *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID int func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID int64, cmd models.RevokeAuthTokenCmd) response.Response { userQuery := models.GetUserByIdQuery{Id: userID} - if err := bus.DispatchCtx(c.Req.Context(), &userQuery); err != nil { + if err := bus.Dispatch(c.Req.Context(), &userQuery); err != nil { if errors.Is(err, models.ErrUserNotFound) { return response.Error(404, "User not found", err) } diff --git a/pkg/bus/bus.go b/pkg/bus/bus.go index 6e137bc509d..82434d60b8d 100644 --- a/pkg/bus/bus.go +++ b/pkg/bus/bus.go @@ -27,7 +27,7 @@ type TransactionManager interface { // Bus type defines the bus interface structure type Bus interface { - DispatchCtx(ctx context.Context, msg Msg) error + Dispatch(ctx context.Context, msg Msg) error PublishCtx(ctx context.Context, msg Msg) error @@ -92,7 +92,7 @@ func (b *InProcBus) SetTransactionManager(tm TransactionManager) { } // DispatchCtx function dispatch a message to the bus context. -func (b *InProcBus) DispatchCtx(ctx context.Context, msg Msg) error { +func (b *InProcBus) Dispatch(ctx context.Context, msg Msg) error { var msgName = reflect.TypeOf(msg).Elem().Name() span, ctx := opentracing.StartSpanFromContext(ctx, "bus - "+msgName) @@ -205,8 +205,8 @@ func AddEventListenerCtx(handler HandlerFunc) { globalBus.AddEventListenerCtx(handler) } -func DispatchCtx(ctx context.Context, msg Msg) error { - return globalBus.DispatchCtx(ctx, msg) +func Dispatch(ctx context.Context, msg Msg) error { + return globalBus.Dispatch(ctx, msg) } func PublishCtx(ctx context.Context, msg Msg) error { diff --git a/pkg/bus/bus_test.go b/pkg/bus/bus_test.go index e27161c5086..1ad35aa5212 100644 --- a/pkg/bus/bus_test.go +++ b/pkg/bus/bus_test.go @@ -23,7 +23,7 @@ func TestDispatch(t *testing.T) { return nil }) - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.NoError(t, err) require.True(t, invoked, "expected handler to be called") @@ -32,7 +32,7 @@ func TestDispatch(t *testing.T) { func TestDispatch_NoRegisteredHandler(t *testing.T) { bus := New() - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.Equal(t, err, ErrHandlerNotFound, "expected bus to return HandlerNotFound since no handler is registered") } @@ -47,7 +47,7 @@ func TestDispatch_ContextHandler(t *testing.T) { return nil }) - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.NoError(t, err) require.True(t, invoked, "expected handler to be called") @@ -63,7 +63,7 @@ func TestDispatchCtx(t *testing.T) { return nil }) - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.NoError(t, err) require.True(t, invoked, "expected handler to be called") @@ -79,7 +79,7 @@ func TestDispatchCtx_NoContextHandler(t *testing.T) { return nil }) - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.NoError(t, err) require.True(t, invoked, "expected handler to be called") @@ -88,7 +88,7 @@ func TestDispatchCtx_NoContextHandler(t *testing.T) { func TestDispatchCtx_NoRegisteredHandler(t *testing.T) { bus := New() - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.Equal(t, err, ErrHandlerNotFound, "expected bus to return HandlerNotFound since no handler is registered") } @@ -105,7 +105,7 @@ func TestQuery(t *testing.T) { q := &testQuery{} - err := bus.DispatchCtx(context.Background(), q) + err := bus.Dispatch(context.Background(), q) require.NoError(t, err, "unable to dispatch query") require.Equal(t, want, q.Resp) @@ -118,7 +118,7 @@ func TestQuery_HandlerReturnsError(t *testing.T) { return errors.New("handler error") }) - err := bus.DispatchCtx(context.Background(), &testQuery{}) + err := bus.Dispatch(context.Background(), &testQuery{}) require.Error(t, err, "expected error but got none") } diff --git a/pkg/cmd/grafana-cli/commands/reset_password_command.go b/pkg/cmd/grafana-cli/commands/reset_password_command.go index a4b4f0ad094..4fd09a65b30 100644 --- a/pkg/cmd/grafana-cli/commands/reset_password_command.go +++ b/pkg/cmd/grafana-cli/commands/reset_password_command.go @@ -43,7 +43,7 @@ func resetPasswordCommand(c utils.CommandLine, sqlStore *sqlstore.SQLStore) erro userQuery := models.GetUserByIdQuery{Id: AdminUserId} - if err := bus.DispatchCtx(context.Background(), &userQuery); err != nil { + if err := bus.Dispatch(context.Background(), &userQuery); err != nil { return fmt.Errorf("could not read user from database. Error: %v", err) } @@ -57,7 +57,7 @@ func resetPasswordCommand(c utils.CommandLine, sqlStore *sqlstore.SQLStore) erro NewPassword: passwordHashed, } - if err := bus.DispatchCtx(context.Background(), &cmd); err != nil { + if err := bus.Dispatch(context.Background(), &cmd); err != nil { return errutil.Wrapf(err, "failed to update user password") } diff --git a/pkg/components/dashdiffs/compare.go b/pkg/components/dashdiffs/compare.go index 5fb36ff34cc..0658c88ac44 100644 --- a/pkg/components/dashdiffs/compare.go +++ b/pkg/components/dashdiffs/compare.go @@ -65,7 +65,7 @@ func CalculateDiff(ctx context.Context, options *Options) (*Result, error) { OrgId: options.OrgId, } - if err := bus.DispatchCtx(ctx, &baseVersionQuery); err != nil { + if err := bus.Dispatch(ctx, &baseVersionQuery); err != nil { return nil, err } @@ -75,7 +75,7 @@ func CalculateDiff(ctx context.Context, options *Options) (*Result, error) { OrgId: options.OrgId, } - if err := bus.DispatchCtx(ctx, &newVersionQuery); err != nil { + if err := bus.Dispatch(ctx, &newVersionQuery); err != nil { return nil, err } diff --git a/pkg/infra/usagestats/service/usage_stats.go b/pkg/infra/usagestats/service/usage_stats.go index 91b79d4c396..b2048c07e24 100644 --- a/pkg/infra/usagestats/service/usage_stats.go +++ b/pkg/infra/usagestats/service/usage_stats.go @@ -39,7 +39,7 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e } statsQuery := models.GetSystemStatsQuery{} - if err := uss.Bus.DispatchCtx(ctx, &statsQuery); err != nil { + if err := uss.Bus.Dispatch(ctx, &statsQuery); err != nil { uss.log.Error("Failed to get system stats", "error", err) return report, err } @@ -113,7 +113,7 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e metrics["stats.avg_auth_token_per_user.count"] = avgAuthTokensPerUser dsStats := models.GetDataSourceStatsQuery{} - if err := uss.Bus.DispatchCtx(ctx, &dsStats); err != nil { + if err := uss.Bus.Dispatch(ctx, &dsStats); err != nil { uss.log.Error("Failed to get datasource stats", "error", err) return report, err } @@ -132,7 +132,7 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e metrics["stats.ds.other.count"] = dsOtherCount esDataSourcesQuery := models.GetDataSourcesByTypeQuery{Type: models.DS_ES} - if err := uss.Bus.DispatchCtx(ctx, &esDataSourcesQuery); err != nil { + if err := uss.Bus.Dispatch(ctx, &esDataSourcesQuery); err != nil { uss.log.Error("Failed to get elasticsearch json data", "error", err) return report, err } @@ -155,7 +155,7 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e // fetch datasource access stats dsAccessStats := models.GetDataSourceAccessStatsQuery{} - if err := uss.Bus.DispatchCtx(ctx, &dsAccessStats); err != nil { + if err := uss.Bus.Dispatch(ctx, &dsAccessStats); err != nil { uss.log.Error("Failed to get datasource access stats", "error", err) return report, err } @@ -185,7 +185,7 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e // get stats about alert notifier usage anStats := models.GetAlertNotifierUsageStatsQuery{} - if err := uss.Bus.DispatchCtx(ctx, &anStats); err != nil { + if err := uss.Bus.Dispatch(ctx, &anStats); err != nil { uss.log.Error("Failed to get alert notification stats", "error", err) return report, err } @@ -296,7 +296,7 @@ func (uss *UsageStats) updateTotalStats(ctx context.Context) { } statsQuery := models.GetSystemStatsQuery{} - if err := uss.Bus.DispatchCtx(ctx, &statsQuery); err != nil { + if err := uss.Bus.Dispatch(ctx, &statsQuery); err != nil { uss.log.Error("Failed to get system stats", "error", err) return } @@ -320,7 +320,7 @@ func (uss *UsageStats) updateTotalStats(ctx context.Context) { metrics.StatsTotalLibraryVariables.Set(float64(statsQuery.Result.LibraryVariables)) dsStats := models.GetDataSourceStatsQuery{} - if err := uss.Bus.DispatchCtx(ctx, &dsStats); err != nil { + if err := uss.Bus.Dispatch(ctx, &dsStats); err != nil { uss.log.Error("Failed to get datasource stats", "error", err) return } diff --git a/pkg/login/brute_force_login_protection.go b/pkg/login/brute_force_login_protection.go index 2026ff6a076..6e4084152d0 100644 --- a/pkg/login/brute_force_login_protection.go +++ b/pkg/login/brute_force_login_protection.go @@ -23,7 +23,7 @@ var validateLoginAttempts = func(ctx context.Context, query *models.LoginUserQue Since: time.Now().Add(-loginAttemptsWindow), } - if err := bus.DispatchCtx(ctx, &loginAttemptCountQuery); err != nil { + if err := bus.Dispatch(ctx, &loginAttemptCountQuery); err != nil { return err } @@ -44,5 +44,5 @@ var saveInvalidLoginAttempt = func(ctx context.Context, query *models.LoginUserQ IpAddress: query.IpAddress, } - return bus.DispatchCtx(ctx, &loginAttemptCommand) + return bus.Dispatch(ctx, &loginAttemptCommand) } diff --git a/pkg/login/grafana_login.go b/pkg/login/grafana_login.go index ab1acdb9d27..593cfc1c85a 100644 --- a/pkg/login/grafana_login.go +++ b/pkg/login/grafana_login.go @@ -24,7 +24,7 @@ var validatePassword = func(providedPassword string, userPassword string, userSa var loginUsingGrafanaDB = func(ctx context.Context, query *models.LoginUserQuery) error { userQuery := models.GetUserByLoginQuery{LoginOrEmail: query.Username} - if err := bus.DispatchCtx(ctx, &userQuery); err != nil { + if err := bus.Dispatch(ctx, &userQuery); err != nil { return err } diff --git a/pkg/login/ldap_login.go b/pkg/login/ldap_login.go index 604b6c9a431..2658de7fd9d 100644 --- a/pkg/login/ldap_login.go +++ b/pkg/login/ldap_login.go @@ -58,7 +58,7 @@ var loginUsingLDAP = func(ctx context.Context, query *models.LoginUserQuery) (bo ExternalUser: externalUser, SignupAllowed: setting.LDAPAllowSignup, } - err = bus.DispatchCtx(ctx, upsert) + err = bus.Dispatch(ctx, upsert) if err != nil { return true, err } @@ -74,7 +74,7 @@ func DisableExternalUser(ctx context.Context, username string) error { LoginOrEmail: username, } - if err := bus.DispatchCtx(ctx, userQuery); err != nil { + if err := bus.Dispatch(ctx, userQuery); err != nil { return err } @@ -92,7 +92,7 @@ func DisableExternalUser(ctx context.Context, username string) error { IsDisabled: true, } - if err := bus.DispatchCtx(ctx, disableUserCmd); err != nil { + if err := bus.Dispatch(ctx, disableUserCmd); err != nil { ldapLogger.Debug( "Error disabling external user", "user", diff --git a/pkg/middleware/org_redirect.go b/pkg/middleware/org_redirect.go index dfde5259ca9..16463a0c68d 100644 --- a/pkg/middleware/org_redirect.go +++ b/pkg/middleware/org_redirect.go @@ -34,7 +34,7 @@ func OrgRedirect(cfg *setting.Cfg) web.Handler { } cmd := models.SetUsingOrgCommand{UserId: ctx.UserId, OrgId: orgId} - if err := bus.DispatchCtx(ctx.Req.Context(), &cmd); err != nil { + if err := bus.Dispatch(ctx.Req.Context(), &cmd); err != nil { if ctx.IsApiRequest() { ctx.JsonApiErr(404, "Not found", nil) } else { diff --git a/pkg/plugins/manager/dashboards.go b/pkg/plugins/manager/dashboards.go index f49fea5291e..1982f27e62e 100644 --- a/pkg/plugins/manager/dashboards.go +++ b/pkg/plugins/manager/dashboards.go @@ -22,7 +22,7 @@ func (m *PluginManager) GetPluginDashboards(ctx context.Context, orgID int64, pl // load current dashboards query := models.GetDashboardsByPluginIdQuery{OrgId: orgID, PluginId: pluginID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return nil, err } diff --git a/pkg/plugins/plugincontext/plugincontext.go b/pkg/plugins/plugincontext/plugincontext.go index 839543ea662..7dc16d586fe 100644 --- a/pkg/plugins/plugincontext/plugincontext.go +++ b/pkg/plugins/plugincontext/plugincontext.go @@ -114,7 +114,7 @@ func (p *Provider) getCachedPluginSettings(ctx context.Context, pluginID string, } query := models.GetPluginSettingByIdQuery{PluginId: pluginID, OrgId: user.OrgId} - if err := p.Bus.DispatchCtx(ctx, &query); err != nil { + if err := p.Bus.Dispatch(ctx, &query); err != nil { return nil, err } diff --git a/pkg/plugins/plugindashboards/service.go b/pkg/plugins/plugindashboards/service.go index 5e2cabceb69..90112181307 100644 --- a/pkg/plugins/plugindashboards/service.go +++ b/pkg/plugins/plugindashboards/service.go @@ -72,7 +72,7 @@ func (s *Service) syncPluginDashboards(ctx context.Context, plugin plugins.Plugi s.logger.Info("Deleting plugin dashboard", "pluginId", plugin.ID, "dashboard", dash.Slug) deleteCmd := models.DeleteDashboardCommand{OrgId: orgID, Id: dash.DashboardId} - if err := bus.DispatchCtx(ctx, &deleteCmd); err != nil { + if err := bus.Dispatch(ctx, &deleteCmd); err != nil { s.logger.Error("Failed to auto update app dashboard", "pluginId", plugin.ID, "error", err) return } @@ -91,7 +91,7 @@ func (s *Service) syncPluginDashboards(ctx context.Context, plugin plugins.Plugi // update version in plugin_setting table to mark that we have processed the update query := models.GetPluginSettingByIdQuery{PluginId: plugin.ID, OrgId: orgID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { s.logger.Error("Failed to read plugin setting by ID", "error", err) return } @@ -103,7 +103,7 @@ func (s *Service) syncPluginDashboards(ctx context.Context, plugin plugins.Plugi PluginVersion: plugin.Info.Version, } - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { s.logger.Error("Failed to update plugin setting version", "error", err) } } @@ -120,14 +120,14 @@ func (s *Service) handlePluginStateChanged(ctx context.Context, event *models.Pl s.syncPluginDashboards(ctx, p, event.OrgId) } else { query := models.GetDashboardsByPluginIdQuery{PluginId: event.PluginId, OrgId: event.OrgId} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return err } for _, dash := range query.Result { s.logger.Info("Deleting plugin dashboard", "pluginId", event.PluginId, "dashboard", dash.Slug) deleteCmd := models.DeleteDashboardCommand{OrgId: dash.OrgId, Id: dash.Id} - if err := bus.DispatchCtx(ctx, &deleteCmd); err != nil { + if err := bus.Dispatch(ctx, &deleteCmd); err != nil { return err } } diff --git a/pkg/services/alerting/alerting_usage.go b/pkg/services/alerting/alerting_usage.go index 6a5cf9c09b9..44e1152ab23 100644 --- a/pkg/services/alerting/alerting_usage.go +++ b/pkg/services/alerting/alerting_usage.go @@ -28,7 +28,7 @@ type UsageStatsQuerier interface { // configured in Grafana. func (e *AlertEngine) QueryUsageStats(ctx context.Context) (*UsageStats, error) { cmd := &models.GetAllAlertsQuery{} - err := e.Bus.DispatchCtx(ctx, cmd) + err := e.Bus.Dispatch(ctx, cmd) if err != nil { return nil, err } @@ -63,7 +63,7 @@ func (e *AlertEngine) mapRulesToUsageStats(ctx context.Context, rules []*models. result := map[string]int{} for k, v := range typeCount { query := &models.GetDataSourceQuery{Id: k} - err := e.Bus.DispatchCtx(ctx, query) + err := e.Bus.Dispatch(ctx, query) if err != nil { return map[string]int{}, nil } diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go index eed8c69eb46..d6363416976 100644 --- a/pkg/services/alerting/conditions/query.go +++ b/pkg/services/alerting/conditions/query.go @@ -140,7 +140,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange l OrgId: context.Rule.OrgID, } - if err := bus.DispatchCtx(context.Ctx, getDsInfo); err != nil { + if err := bus.Dispatch(context.Ctx, getDsInfo); err != nil { return nil, fmt.Errorf("could not find datasource: %w", err) } diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go index 51a09afcc70..8d3c5f46faa 100644 --- a/pkg/services/alerting/eval_context.go +++ b/pkg/services/alerting/eval_context.go @@ -108,7 +108,7 @@ func (c *EvalContext) GetDashboardUID() (*models.DashboardRef, error) { } uidQuery := &models.GetDashboardRefByIdQuery{Id: c.Rule.DashboardID} - if err := bus.DispatchCtx(c.Ctx, uidQuery); err != nil { + if err := bus.Dispatch(c.Ctx, uidQuery); err != nil { return nil, err } diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go index c5ebabe3344..c3273ed6ca6 100644 --- a/pkg/services/alerting/extractor.go +++ b/pkg/services/alerting/extractor.go @@ -48,14 +48,14 @@ func (e *DashAlertExtractor) lookupQueryDataSource(ctx context.Context, panel *s if dsName == "" && dsUid == "" { query := &models.GetDefaultDataSourceQuery{OrgId: e.OrgID} - if err := bus.DispatchCtx(ctx, query); err != nil { + if err := bus.Dispatch(ctx, query); err != nil { return nil, err } return query.Result, nil } query := &models.GetDataSourceQuery{Name: dsName, Uid: dsUid, OrgId: e.OrgID} - if err := bus.DispatchCtx(ctx, query); err != nil { + if err := bus.Dispatch(ctx, query); err != nil { return nil, err } @@ -208,7 +208,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(ctx context.Context, jsonWithPan Datasources: []*models.DataSource{datasource}, } - if err := bus.DispatchCtx(ctx, &dsFilterQuery); err != nil { + if err := bus.Dispatch(ctx, &dsFilterQuery); err != nil { if !errors.Is(err, bus.ErrHandlerNotFound) { return nil, err } diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index a2624b6a39f..8874261fd1b 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -152,7 +152,7 @@ func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, no Version: notifierState.state.Version, } - return bus.DispatchCtx(evalContext.Ctx, cmd) + return bus.Dispatch(evalContext.Ctx, cmd) } func (n *notificationService) sendNotification(evalContext *EvalContext, notifierState *notifierState) error { @@ -163,7 +163,7 @@ func (n *notificationService) sendNotification(evalContext *EvalContext, notifie AlertRuleStateUpdatedVersion: evalContext.Rule.StateChanges, } - err := bus.DispatchCtx(evalContext.Ctx, setPendingCmd) + err := bus.Dispatch(evalContext.Ctx, setPendingCmd) if err != nil { if errors.Is(err, models.ErrAlertNotificationStateVersionConflict) { return nil @@ -247,7 +247,7 @@ func (n *notificationService) renderAndUploadImage(evalCtx *EvalContext, timeout func (n *notificationService) getNeededNotifiers(orgID int64, notificationUids []string, evalContext *EvalContext) (notifierStateSlice, error) { query := &models.GetAlertNotificationsWithUidToSendQuery{OrgId: orgID, Uids: notificationUids} - if err := bus.DispatchCtx(evalContext.Ctx, query); err != nil { + if err := bus.Dispatch(evalContext.Ctx, query); err != nil { return nil, err } @@ -265,7 +265,7 @@ func (n *notificationService) getNeededNotifiers(orgID int64, notificationUids [ OrgId: evalContext.Rule.OrgID, } - err = bus.DispatchCtx(evalContext.Ctx, query) + err = bus.Dispatch(evalContext.Ctx, query) if err != nil { n.log.Error("Could not get notification state.", "notifier", notification.Id, "error", err) continue diff --git a/pkg/services/alerting/notifiers/alertmanager.go b/pkg/services/alerting/notifiers/alertmanager.go index 8b999e9a14f..d8146b54811 100644 --- a/pkg/services/alerting/notifiers/alertmanager.go +++ b/pkg/services/alerting/notifiers/alertmanager.go @@ -183,7 +183,7 @@ func (am *AlertmanagerNotifier) Notify(evalContext *alerting.EvalContext) error Body: string(body), } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { am.log.Error("Failed to send alertmanager", "error", err, "alertmanager", am.Name, "url", url) errCnt++ } diff --git a/pkg/services/alerting/notifiers/dingding.go b/pkg/services/alerting/notifiers/dingding.go index 0ac1913cbbb..5313700f405 100644 --- a/pkg/services/alerting/notifiers/dingding.go +++ b/pkg/services/alerting/notifiers/dingding.go @@ -91,7 +91,7 @@ func (dd *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error { Body: string(body), } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { dd.log.Error("Failed to send DingDing", "error", err, "dingding", dd.Name) return err } diff --git a/pkg/services/alerting/notifiers/discord.go b/pkg/services/alerting/notifiers/discord.go index d0ac7036f7f..9d2eaf18f5b 100644 --- a/pkg/services/alerting/notifiers/discord.go +++ b/pkg/services/alerting/notifiers/discord.go @@ -177,7 +177,7 @@ func (dn *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error { } } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { dn.log.Error("Failed to send notification to Discord", "error", err) return err } diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go index 59bfb0bd196..1e348eb44b4 100644 --- a/pkg/services/alerting/notifiers/email.go +++ b/pkg/services/alerting/notifiers/email.go @@ -117,7 +117,7 @@ func (en *EmailNotifier) Notify(evalContext *alerting.EvalContext) error { } } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { en.log.Error("Failed to send alert notification email", "error", err) return err } diff --git a/pkg/services/alerting/notifiers/googlechat.go b/pkg/services/alerting/notifiers/googlechat.go index 49a12479268..24ef91ad398 100644 --- a/pkg/services/alerting/notifiers/googlechat.go +++ b/pkg/services/alerting/notifiers/googlechat.go @@ -220,7 +220,7 @@ func (gcn *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error { Body: string(body), } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { gcn.log.Error("Failed to send Google Hangouts Chat alert", "error", err, "webhook", gcn.Name) return err } diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go index 77520e4b275..21db0e1b02e 100644 --- a/pkg/services/alerting/notifiers/hipchat.go +++ b/pkg/services/alerting/notifiers/hipchat.go @@ -177,7 +177,7 @@ func (hc *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error { hc.log.Info("Request payload", "json", string(data)) cmd := &models.SendWebhookSync{Url: hipURL, Body: string(data)} - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { hc.log.Error("Failed to send hipchat notification", "error", err, "webhook", hc.Name) return err } diff --git a/pkg/services/alerting/notifiers/kafka.go b/pkg/services/alerting/notifiers/kafka.go index ed02f10cd5a..e0511f53468 100644 --- a/pkg/services/alerting/notifiers/kafka.go +++ b/pkg/services/alerting/notifiers/kafka.go @@ -124,7 +124,7 @@ func (kn *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error { }, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { kn.log.Error("Failed to send notification to Kafka", "error", err, "body", string(body)) return err } diff --git a/pkg/services/alerting/notifiers/line.go b/pkg/services/alerting/notifiers/line.go index 4b760ff4570..c9e5771459c 100644 --- a/pkg/services/alerting/notifiers/line.go +++ b/pkg/services/alerting/notifiers/line.go @@ -92,7 +92,7 @@ func (ln *LineNotifier) createAlert(evalContext *alerting.EvalContext) error { Body: form.Encode(), } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { ln.log.Error("Failed to send notification to LINE", "error", err, "body", body) return err } diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go index 5f52f045e48..6c13ee382d6 100644 --- a/pkg/services/alerting/notifiers/opsgenie.go +++ b/pkg/services/alerting/notifiers/opsgenie.go @@ -205,7 +205,7 @@ func (on *OpsGenieNotifier) createAlert(evalContext *alerting.EvalContext) error }, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { on.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body)) } @@ -229,7 +229,7 @@ func (on *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) error }, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { on.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body)) return err } diff --git a/pkg/services/alerting/notifiers/pagerduty.go b/pkg/services/alerting/notifiers/pagerduty.go index e82b95b6542..4fc4766a1a2 100644 --- a/pkg/services/alerting/notifiers/pagerduty.go +++ b/pkg/services/alerting/notifiers/pagerduty.go @@ -240,7 +240,7 @@ func (pn *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error { }, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { pn.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body)) return err } diff --git a/pkg/services/alerting/notifiers/pushover.go b/pkg/services/alerting/notifiers/pushover.go index 23a502739d5..7586c4bd576 100644 --- a/pkg/services/alerting/notifiers/pushover.go +++ b/pkg/services/alerting/notifiers/pushover.go @@ -287,7 +287,7 @@ func (pn *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error { Body: uploadBody.String(), } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { pn.log.Error("Failed to send pushover notification", "error", err, "webhook", pn.Name) return err } diff --git a/pkg/services/alerting/notifiers/sensu.go b/pkg/services/alerting/notifiers/sensu.go index 7305105b608..ec7477867e9 100644 --- a/pkg/services/alerting/notifiers/sensu.go +++ b/pkg/services/alerting/notifiers/sensu.go @@ -146,7 +146,7 @@ func (sn *SensuNotifier) Notify(evalContext *alerting.EvalContext) error { HttpMethod: "POST", } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { sn.log.Error("Failed to send sensu event", "error", err, "sensu", sn.Name) return err } diff --git a/pkg/services/alerting/notifiers/sensugo.go b/pkg/services/alerting/notifiers/sensugo.go index 333ea22156f..655014a532c 100644 --- a/pkg/services/alerting/notifiers/sensugo.go +++ b/pkg/services/alerting/notifiers/sensugo.go @@ -197,7 +197,7 @@ func (sn *SensuGoNotifier) Notify(evalContext *alerting.EvalContext) error { "Authorization": fmt.Sprintf("Key %s", sn.APIKey), }, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { sn.log.Error("Failed to send Sensu Go event", "error", err, "sensugo", sn.Name) return err } diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go index 7e68966ca55..3f5b90a7305 100644 --- a/pkg/services/alerting/notifiers/slack.go +++ b/pkg/services/alerting/notifiers/slack.go @@ -418,7 +418,7 @@ func (sn *SlackNotifier) slackFileUpload(evalContext *alerting.EvalContext, log cmd := &models.SendWebhookSync{ Url: "https://slack.com/api/files.upload", Body: uploadBody.String(), HttpHeader: headers, HttpMethod: "POST", } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { log.Error("Failed to upload slack image", "error", err, "webhook", "file.upload") return err } diff --git a/pkg/services/alerting/notifiers/teams.go b/pkg/services/alerting/notifiers/teams.go index 50f511a81ac..6229046c68d 100644 --- a/pkg/services/alerting/notifiers/teams.go +++ b/pkg/services/alerting/notifiers/teams.go @@ -135,7 +135,7 @@ func (tn *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error { data, _ := json.Marshal(&body) cmd := &models.SendWebhookSync{Url: tn.URL, Body: string(data)} - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { tn.log.Error("Failed to send teams notification", "error", err, "webhook", tn.Name) return err } diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go index 004a2f0d86c..16b705d4bac 100644 --- a/pkg/services/alerting/notifiers/telegram.go +++ b/pkg/services/alerting/notifiers/telegram.go @@ -271,7 +271,7 @@ func (tn *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error { return err } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { tn.log.Error("Failed to send webhook", "error", err, "webhook", tn.Name) return err } diff --git a/pkg/services/alerting/notifiers/threema.go b/pkg/services/alerting/notifiers/threema.go index 712da9ffd68..c1b69e959c8 100644 --- a/pkg/services/alerting/notifiers/threema.go +++ b/pkg/services/alerting/notifiers/threema.go @@ -158,7 +158,7 @@ func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error HttpMethod: "POST", HttpHeader: headers, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { notifier.log.Error("Failed to send webhook", "error", err, "webhook", notifier.Name) return err } diff --git a/pkg/services/alerting/notifiers/victorops.go b/pkg/services/alerting/notifiers/victorops.go index 6d7e0379b7a..c0d96d6b1b0 100644 --- a/pkg/services/alerting/notifiers/victorops.go +++ b/pkg/services/alerting/notifiers/victorops.go @@ -156,7 +156,7 @@ func (vn *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error { data, _ := bodyJSON.MarshalJSON() cmd := &models.SendWebhookSync{Url: vn.URL, Body: string(data)} - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { vn.log.Error("Failed to send Victorops notification", "error", err, "webhook", vn.Name) return err } diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go index c39d677bd11..6d4e4702150 100644 --- a/pkg/services/alerting/notifiers/webhook.go +++ b/pkg/services/alerting/notifiers/webhook.go @@ -153,7 +153,7 @@ func (wn *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error { HttpMethod: wn.HTTPMethod, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { wn.log.Error("Failed to send webhook", "error", err, "webhook", wn.Name) return err } diff --git a/pkg/services/alerting/reader.go b/pkg/services/alerting/reader.go index b80e703c5a7..ae8303beca8 100644 --- a/pkg/services/alerting/reader.go +++ b/pkg/services/alerting/reader.go @@ -30,7 +30,7 @@ func newRuleReader() *defaultRuleReader { func (arr *defaultRuleReader) fetch(ctx context.Context) []*Rule { cmd := &models.GetAllAlertsQuery{} - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { arr.log.Error("Could not load alerts", "error", err) return []*Rule{} } diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go index a8e6bf2e7bb..401e69409d8 100644 --- a/pkg/services/alerting/result_handler.go +++ b/pkg/services/alerting/result_handler.go @@ -58,7 +58,7 @@ func (handler *defaultResultHandler) handle(evalContext *EvalContext) error { EvalData: annotationData, } - if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { + if err := bus.Dispatch(evalContext.Ctx, cmd); err != nil { if errors.Is(err, models.ErrCannotChangeStateOnPausedAlert) { handler.log.Error("Cannot change state on alert that's paused", "error", err) return err diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go index f7545cb439c..05ffc47805d 100644 --- a/pkg/services/alerting/rule.go +++ b/pkg/services/alerting/rule.go @@ -226,7 +226,7 @@ func getAlertNotificationUIDByIDAndOrgID(ctx context.Context, notificationID int Id: notificationID, } - if err := bus.DispatchCtx(ctx, query); err != nil { + if err := bus.Dispatch(ctx, query); err != nil { return "", err } diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go index 42389afd579..cf966a3723b 100644 --- a/pkg/services/cleanup/cleanup.go +++ b/pkg/services/cleanup/cleanup.go @@ -127,7 +127,7 @@ func (srv *CleanUpService) shouldCleanupTempFile(filemtime time.Time, now time.T func (srv *CleanUpService) deleteExpiredSnapshots(ctx context.Context) { cmd := models.DeleteExpiredSnapshotsCommand{} - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { srv.log.Error("Failed to delete expired snapshots", "error", err.Error()) } else { srv.log.Debug("Deleted expired snapshots", "rows affected", cmd.DeletedRows) @@ -136,7 +136,7 @@ func (srv *CleanUpService) deleteExpiredSnapshots(ctx context.Context) { func (srv *CleanUpService) deleteExpiredDashboardVersions(ctx context.Context) { cmd := models.DeleteExpiredVersionsCommand{} - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { srv.log.Error("Failed to delete expired dashboard versions", "error", err.Error()) } else { srv.log.Debug("Deleted old/expired dashboard versions", "rows affected", cmd.DeletedRows) @@ -151,7 +151,7 @@ func (srv *CleanUpService) deleteOldLoginAttempts(ctx context.Context) { cmd := models.DeleteOldLoginAttemptsCommand{ OlderThan: time.Now().Add(time.Minute * -10), } - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { srv.log.Error("Problem deleting expired login attempts", "error", err.Error()) } else { srv.log.Debug("Deleted expired login attempts", "rows affected", cmd.DeletedRows) @@ -164,7 +164,7 @@ func (srv *CleanUpService) expireOldUserInvites(ctx context.Context) { cmd := models.ExpireTempUsersCommand{ OlderThan: time.Now().Add(-maxInviteLifetime), } - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { srv.log.Error("Problem expiring user invites", "error", err.Error()) } else { srv.log.Debug("Expired user invites", "rows affected", cmd.NumExpired) diff --git a/pkg/services/contexthandler/auth_jwt.go b/pkg/services/contexthandler/auth_jwt.go index 426cd1b9573..7577b23c80a 100644 --- a/pkg/services/contexthandler/auth_jwt.go +++ b/pkg/services/contexthandler/auth_jwt.go @@ -42,7 +42,7 @@ func (h *ContextHandler) initContextWithJWT(ctx *models.ReqContext, orgId int64) return true } - if err := bus.DispatchCtx(ctx.Req.Context(), &query); err != nil { + if err := bus.Dispatch(ctx.Req.Context(), &query); err != nil { if errors.Is(err, models.ErrUserNotFound) { ctx.Logger.Debug( "Failed to find user using JWT claims", diff --git a/pkg/services/contexthandler/authproxy/authproxy.go b/pkg/services/contexthandler/authproxy/authproxy.go index 79f09a4e8b7..413b4328c9c 100644 --- a/pkg/services/contexthandler/authproxy/authproxy.go +++ b/pkg/services/contexthandler/authproxy/authproxy.go @@ -248,7 +248,7 @@ func (auth *AuthProxy) LoginViaLDAP() (int64, error) { SignupAllowed: auth.cfg.LDAPAllowSignup, ExternalUser: extUser, } - if err := bus.DispatchCtx(auth.ctx.Req.Context(), upsert); err != nil { + if err := bus.Dispatch(auth.ctx.Req.Context(), upsert); err != nil { return 0, err } @@ -305,7 +305,7 @@ func (auth *AuthProxy) LoginViaHeader() (int64, error) { ExternalUser: extUser, } - err := bus.DispatchCtx(auth.ctx.Req.Context(), upsert) + err := bus.Dispatch(auth.ctx.Req.Context(), upsert) if err != nil { return 0, err } @@ -334,7 +334,7 @@ func (auth *AuthProxy) GetSignedInUser(userID int64) (*models.SignedInUser, erro UserId: userID, } - if err := bus.DispatchCtx(context.Background(), query); err != nil { + if err := bus.Dispatch(context.Background(), query); err != nil { return nil, err } diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go index 4d56ccc43dc..12659d75688 100644 --- a/pkg/services/contexthandler/contexthandler.go +++ b/pkg/services/contexthandler/contexthandler.go @@ -146,7 +146,7 @@ func (h *ContextHandler) Middleware(mContext *web.Context) { // update last seen every 5min if reqContext.ShouldUpdateLastSeenAt() { reqContext.Logger.Debug("Updating last user_seen_at", "user_id", reqContext.UserId) - if err := bus.DispatchCtx(mContext.Req.Context(), &models.UpdateUserLastSeenAtCommand{UserId: reqContext.UserId}); err != nil { + if err := bus.Dispatch(mContext.Req.Context(), &models.UpdateUserLastSeenAtCommand{UserId: reqContext.UserId}); err != nil { reqContext.Logger.Error("Failed to update last_seen_at", "error", err) } } @@ -204,7 +204,7 @@ func (h *ContextHandler) initContextWithAPIKey(reqContext *models.ReqContext) bo // fetch key keyQuery := models.GetApiKeyByNameQuery{KeyName: decoded.Name, OrgId: decoded.OrgId} - if err := bus.DispatchCtx(reqContext.Req.Context(), &keyQuery); err != nil { + if err := bus.Dispatch(reqContext.Req.Context(), &keyQuery); err != nil { reqContext.JsonApiErr(401, InvalidAPIKey, err) return true } @@ -246,7 +246,7 @@ func (h *ContextHandler) initContextWithAPIKey(reqContext *models.ReqContext) bo //Use service account linked to API key as the signed in user query := models.GetSignedInUserQuery{UserId: apikey.ServiceAccountId, OrgId: apikey.OrgId} - if err := bus.DispatchCtx(reqContext.Req.Context(), &query); err != nil { + if err := bus.Dispatch(reqContext.Req.Context(), &query); err != nil { reqContext.Logger.Error( "Failed to link API key to service account in", "id", query.UserId, @@ -286,7 +286,7 @@ func (h *ContextHandler) initContextWithBasicAuth(reqContext *models.ReqContext, Password: password, Cfg: h.Cfg, } - if err := bus.DispatchCtx(reqContext.Req.Context(), &authQuery); err != nil { + if err := bus.Dispatch(reqContext.Req.Context(), &authQuery); err != nil { reqContext.Logger.Debug( "Failed to authorize the user", "username", username, @@ -303,7 +303,7 @@ func (h *ContextHandler) initContextWithBasicAuth(reqContext *models.ReqContext, user := authQuery.User query := models.GetSignedInUserQuery{UserId: user.Id, OrgId: orgID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { reqContext.Logger.Error( "Failed at user signed in", "id", user.Id, @@ -339,7 +339,7 @@ func (h *ContextHandler) initContextWithToken(reqContext *models.ReqContext, org } query := models.GetSignedInUserQuery{UserId: token.UserId, OrgId: orgID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { reqContext.Logger.Error("Failed to get user with id", "userId", token.UserId, "error", err) return false } diff --git a/pkg/services/dashboards/dashboard_service.go b/pkg/services/dashboards/dashboard_service.go index 49f8365723d..1c0035d8737 100644 --- a/pkg/services/dashboards/dashboard_service.go +++ b/pkg/services/dashboards/dashboard_service.go @@ -324,7 +324,7 @@ func (dr *dashboardServiceImpl) deleteDashboard(ctx context.Context, dashboardId } } cmd := &models.DeleteDashboardCommand{OrgId: orgId, Id: dashboardId} - return bus.DispatchCtx(ctx, cmd) + return bus.Dispatch(ctx, cmd) } func (dr *dashboardServiceImpl) ImportDashboard(ctx context.Context, dto *SaveDashboardDTO) ( @@ -353,7 +353,7 @@ func (dr *dashboardServiceImpl) ImportDashboard(ctx context.Context, dto *SaveDa // and provisioned dashboards are left behind but not deleted. func (dr *dashboardServiceImpl) UnprovisionDashboard(ctx context.Context, dashboardId int64) error { cmd := &models.UnprovisionDashboardCommand{Id: dashboardId} - return bus.DispatchCtx(ctx, cmd) + return bus.Dispatch(ctx, cmd) } type FakeDashboardService struct { diff --git a/pkg/services/dashboards/folder_service.go b/pkg/services/dashboards/folder_service.go index 3681a6a1eda..b6f05b1e661 100644 --- a/pkg/services/dashboards/folder_service.go +++ b/pkg/services/dashboards/folder_service.go @@ -45,7 +45,7 @@ func (dr *dashboardServiceImpl) GetFolders(ctx context.Context, limit int64, pag Page: page, } - if err := bus.DispatchCtx(ctx, &searchQuery); err != nil { + if err := bus.Dispatch(ctx, &searchQuery); err != nil { return nil, err } @@ -209,7 +209,7 @@ func (dr *dashboardServiceImpl) DeleteFolder(ctx context.Context, uid string, fo } deleteCmd := models.DeleteDashboardCommand{OrgId: dr.orgId, Id: dashFolder.Id, ForceDeleteFolderRules: forceDeleteRules} - if err := bus.DispatchCtx(ctx, &deleteCmd); err != nil { + if err := bus.Dispatch(ctx, &deleteCmd); err != nil { return nil, toFolderError(err) } @@ -217,7 +217,7 @@ func (dr *dashboardServiceImpl) DeleteFolder(ctx context.Context, uid string, fo } func getFolder(ctx context.Context, query models.GetDashboardQuery) (*models.Dashboard, error) { - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return nil, toFolderError(err) } diff --git a/pkg/services/guardian/guardian.go b/pkg/services/guardian/guardian.go index 03770a22058..27221e96644 100644 --- a/pkg/services/guardian/guardian.go +++ b/pkg/services/guardian/guardian.go @@ -204,7 +204,7 @@ func (g *dashboardGuardianImpl) GetAcl() ([]*models.DashboardAclInfoDTO, error) } query := models.GetDashboardAclInfoListQuery{DashboardID: g.dashId, OrgID: g.orgId} - if err := bus.DispatchCtx(g.ctx, &query); err != nil { + if err := bus.Dispatch(g.ctx, &query); err != nil { return nil, err } @@ -254,8 +254,8 @@ func (g *dashboardGuardianImpl) getTeams(ctx context.Context) ([]*models.TeamDTO } query := models.GetTeamsByUserQuery{OrgId: g.orgId, UserId: g.user.UserId} - // TODO: Use bus.DispatchCtx(g.Ctx, &query) when GetTeamsByUserQuery supports context. - err := bus.DispatchCtx(ctx, &query) + // TODO: Use bus.Dispatch(g.Ctx, &query) when GetTeamsByUserQuery supports context. + err := bus.Dispatch(ctx, &query) g.teams = query.Result return query.Result, err diff --git a/pkg/services/live/features/dashboard.go b/pkg/services/live/features/dashboard.go index 64f186eb9ad..9d3ea6a59ee 100644 --- a/pkg/services/live/features/dashboard.go +++ b/pkg/services/live/features/dashboard.go @@ -62,7 +62,7 @@ func (h *DashboardHandler) OnSubscribe(ctx context.Context, user *models.SignedI // make sure can view this dashboard if len(parts) == 2 && parts[0] == "uid" { query := models.GetDashboardQuery{Uid: parts[1], OrgId: user.OrgId} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { logger.Error("Error getting dashboard", "query", query, "error", err) return models.SubscribeReply{}, backend.SubscribeStreamStatusNotFound, nil } @@ -109,7 +109,7 @@ func (h *DashboardHandler) OnPublish(ctx context.Context, user *models.SignedInU return models.PublishReply{}, backend.PublishStreamStatusNotFound, fmt.Errorf("ignore???") } query := models.GetDashboardQuery{Uid: parts[1], OrgId: user.OrgId} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { logger.Error("Unknown dashboard", "query", query) return models.PublishReply{}, backend.PublishStreamStatusNotFound, nil } diff --git a/pkg/services/login/authinfoservice/database.go b/pkg/services/login/authinfoservice/database.go index f443f7200de..da5db5f975d 100644 --- a/pkg/services/login/authinfoservice/database.go +++ b/pkg/services/login/authinfoservice/database.go @@ -15,13 +15,13 @@ var getTime = time.Now func (s *Implementation) GetExternalUserInfoByLogin(ctx context.Context, query *models.GetExternalUserInfoByLoginQuery) error { userQuery := models.GetUserByLoginQuery{LoginOrEmail: query.LoginOrEmail} - err := s.Bus.DispatchCtx(ctx, &userQuery) + err := s.Bus.Dispatch(ctx, &userQuery) if err != nil { return err } authInfoQuery := &models.GetAuthInfoQuery{UserId: userQuery.Result.Id} - if err := s.Bus.DispatchCtx(ctx, authInfoQuery); err != nil { + if err := s.Bus.Dispatch(ctx, authInfoQuery); err != nil { return err } diff --git a/pkg/services/login/loginservice/loginservice.go b/pkg/services/login/loginservice/loginservice.go index 36e3b0407bd..6c088feb139 100644 --- a/pkg/services/login/loginservice/loginservice.go +++ b/pkg/services/login/loginservice/loginservice.go @@ -81,7 +81,7 @@ func (ls *Implementation) UpsertUser(ctx context.Context, cmd *models.UpsertUser AuthId: extUser.AuthId, OAuthToken: extUser.OAuthToken, } - if err := ls.Bus.DispatchCtx(ctx, cmd2); err != nil { + if err := ls.Bus.Dispatch(ctx, cmd2); err != nil { return err } } @@ -103,7 +103,7 @@ func (ls *Implementation) UpsertUser(ctx context.Context, cmd *models.UpsertUser if extUser.AuthModule == models.AuthModuleLDAP && user.IsDisabled { // Re-enable user when it found in LDAP - if err := ls.Bus.DispatchCtx(ctx, &models.DisableUserCommand{UserId: cmd.Result.Id, IsDisabled: false}); err != nil { + if err := ls.Bus.Dispatch(ctx, &models.DisableUserCommand{UserId: cmd.Result.Id, IsDisabled: false}); err != nil { return err } } @@ -176,7 +176,7 @@ func updateUser(ctx context.Context, user *models.User, extUser *models.External } logger.Debug("Syncing user info", "id", user.Id, "update", updateCmd) - return bus.DispatchCtx(ctx, updateCmd) + return bus.Dispatch(ctx, updateCmd) } func updateUserAuth(ctx context.Context, user *models.User, extUser *models.ExternalUserInfo) error { @@ -188,7 +188,7 @@ func updateUserAuth(ctx context.Context, user *models.User, extUser *models.Exte } logger.Debug("Updating user_auth info", "user_id", user.Id) - return bus.DispatchCtx(ctx, updateCmd) + return bus.Dispatch(ctx, updateCmd) } func syncOrgRoles(ctx context.Context, user *models.User, extUser *models.ExternalUserInfo) error { @@ -201,7 +201,7 @@ func syncOrgRoles(ctx context.Context, user *models.User, extUser *models.Extern } orgsQuery := &models.GetUserOrgListQuery{UserId: user.Id} - if err := bus.DispatchCtx(ctx, orgsQuery); err != nil { + if err := bus.Dispatch(ctx, orgsQuery); err != nil { return err } @@ -218,7 +218,7 @@ func syncOrgRoles(ctx context.Context, user *models.User, extUser *models.Extern } else if extRole != org.Role { // update role cmd := &models.UpdateOrgUserCommand{OrgId: org.OrgId, UserId: user.Id, Role: extRole} - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return err } } @@ -232,7 +232,7 @@ func syncOrgRoles(ctx context.Context, user *models.User, extUser *models.Extern // add role cmd := &models.AddOrgUserCommand{UserId: user.Id, Role: orgRole, OrgId: orgId} - err := bus.DispatchCtx(ctx, cmd) + err := bus.Dispatch(ctx, cmd) if err != nil && !errors.Is(err, models.ErrOrgNotFound) { return err } @@ -243,7 +243,7 @@ func syncOrgRoles(ctx context.Context, user *models.User, extUser *models.Extern logger.Debug("Removing user's organization membership as part of syncing with OAuth login", "userId", user.Id, "orgId", orgId) cmd := &models.RemoveOrgUserCommand{OrgId: orgId, UserId: user.Id} - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { if errors.Is(err, models.ErrLastOrgAdmin) { logger.Error(err.Error(), "userId", cmd.UserId, "orgId", cmd.OrgId) continue @@ -260,7 +260,7 @@ func syncOrgRoles(ctx context.Context, user *models.User, extUser *models.Extern break } - return bus.DispatchCtx(ctx, &models.SetUsingOrgCommand{ + return bus.Dispatch(ctx, &models.SetUsingOrgCommand{ UserId: user.Id, OrgId: user.OrgId, }) diff --git a/pkg/services/ngalert/notifier/channels/dingding.go b/pkg/services/ngalert/notifier/channels/dingding.go index 8a131246456..9372ed257a8 100644 --- a/pkg/services/ngalert/notifier/channels/dingding.go +++ b/pkg/services/ngalert/notifier/channels/dingding.go @@ -115,7 +115,7 @@ func (dd *DingDingNotifier) Notify(ctx context.Context, as ...*types.Alert) (boo Body: string(body), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return false, fmt.Errorf("send notification to dingding: %w", err) } diff --git a/pkg/services/ngalert/notifier/channels/discord.go b/pkg/services/ngalert/notifier/channels/discord.go index bb606489051..175030ea3bc 100644 --- a/pkg/services/ngalert/notifier/channels/discord.go +++ b/pkg/services/ngalert/notifier/channels/discord.go @@ -114,7 +114,7 @@ func (d DiscordNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, Body: string(body), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { d.log.Error("Failed to send notification to Discord", "error", err) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/email.go b/pkg/services/ngalert/notifier/channels/email.go index a891861805a..1ff7bc72b14 100644 --- a/pkg/services/ngalert/notifier/channels/email.go +++ b/pkg/services/ngalert/notifier/channels/email.go @@ -103,7 +103,7 @@ func (en *EmailNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, en.log.Debug("failed to template email message", "err", tmplErr.Error()) } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return false, err } diff --git a/pkg/services/ngalert/notifier/channels/googlechat.go b/pkg/services/ngalert/notifier/channels/googlechat.go index 1b96f81c133..20ed8381b90 100644 --- a/pkg/services/ngalert/notifier/channels/googlechat.go +++ b/pkg/services/ngalert/notifier/channels/googlechat.go @@ -128,7 +128,7 @@ func (gcn *GoogleChatNotifier) Notify(ctx context.Context, as ...*types.Alert) ( Body: string(body), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { gcn.log.Error("Failed to send Google Hangouts Chat alert", "error", err, "webhook", gcn.Name) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/kafka.go b/pkg/services/ngalert/notifier/channels/kafka.go index 9b007ffaea6..d2ec5e1145d 100644 --- a/pkg/services/ngalert/notifier/channels/kafka.go +++ b/pkg/services/ngalert/notifier/channels/kafka.go @@ -112,7 +112,7 @@ func (kn *KafkaNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, }, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { kn.log.Error("Failed to send notification to Kafka", "error", err, "body", string(body)) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/line.go b/pkg/services/ngalert/notifier/channels/line.go index 9a4444ceb61..2b4239ebd77 100644 --- a/pkg/services/ngalert/notifier/channels/line.go +++ b/pkg/services/ngalert/notifier/channels/line.go @@ -86,7 +86,7 @@ func (ln *LineNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, e Body: form.Encode(), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { ln.log.Error("Failed to send notification to LINE", "error", err, "body", body) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/opsgenie.go b/pkg/services/ngalert/notifier/channels/opsgenie.go index ef8c776fbc9..47ace372832 100644 --- a/pkg/services/ngalert/notifier/channels/opsgenie.go +++ b/pkg/services/ngalert/notifier/channels/opsgenie.go @@ -120,7 +120,7 @@ func (on *OpsgenieNotifier) Notify(ctx context.Context, as ...*types.Alert) (boo }, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return false, fmt.Errorf("send notification to Opsgenie: %w", err) } diff --git a/pkg/services/ngalert/notifier/channels/pagerduty.go b/pkg/services/ngalert/notifier/channels/pagerduty.go index 6f1489cb784..2211c6c0c40 100644 --- a/pkg/services/ngalert/notifier/channels/pagerduty.go +++ b/pkg/services/ngalert/notifier/channels/pagerduty.go @@ -105,7 +105,7 @@ func (pn *PagerdutyNotifier) Notify(ctx context.Context, as ...*types.Alert) (bo "Content-Type": "application/json", }, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return false, fmt.Errorf("send notification to Pagerduty: %w", err) } diff --git a/pkg/services/ngalert/notifier/channels/pushover.go b/pkg/services/ngalert/notifier/channels/pushover.go index 90b04612609..eb7f1b8c022 100644 --- a/pkg/services/ngalert/notifier/channels/pushover.go +++ b/pkg/services/ngalert/notifier/channels/pushover.go @@ -110,7 +110,7 @@ func (pn *PushoverNotifier) Notify(ctx context.Context, as ...*types.Alert) (boo Body: uploadBody.String(), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { pn.log.Error("Failed to send pushover notification", "error", err, "webhook", pn.Name) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/sensugo.go b/pkg/services/ngalert/notifier/channels/sensugo.go index 059d8d490c1..915f270c193 100644 --- a/pkg/services/ngalert/notifier/channels/sensugo.go +++ b/pkg/services/ngalert/notifier/channels/sensugo.go @@ -145,7 +145,7 @@ func (sn *SensuGoNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool "Authorization": fmt.Sprintf("Key %s", sn.APIKey), }, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { sn.log.Error("Failed to send Sensu Go event", "error", err, "sensugo", sn.Name) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/teams.go b/pkg/services/ngalert/notifier/channels/teams.go index 2dfa4927851..2bca24e7614 100644 --- a/pkg/services/ngalert/notifier/channels/teams.go +++ b/pkg/services/ngalert/notifier/channels/teams.go @@ -97,7 +97,7 @@ func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, } cmd := &models.SendWebhookSync{Url: u, Body: string(b)} - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return false, errors.Wrap(err, "send notification to Teams") } diff --git a/pkg/services/ngalert/notifier/channels/telegram.go b/pkg/services/ngalert/notifier/channels/telegram.go index 366338ed76b..81d4e3e05c8 100644 --- a/pkg/services/ngalert/notifier/channels/telegram.go +++ b/pkg/services/ngalert/notifier/channels/telegram.go @@ -109,7 +109,7 @@ func (tn *TelegramNotifier) Notify(ctx context.Context, as ...*types.Alert) (boo }, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { tn.log.Error("Failed to send webhook", "error", err, "webhook", tn.Name) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/threema.go b/pkg/services/ngalert/notifier/channels/threema.go index 138f7b3e1c9..844f43a5f7c 100644 --- a/pkg/services/ngalert/notifier/channels/threema.go +++ b/pkg/services/ngalert/notifier/channels/threema.go @@ -119,7 +119,7 @@ func (tn *ThreemaNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool "Content-Type": "application/x-www-form-urlencoded", }, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { tn.log.Error("Failed to send threema notification", "error", err, "webhook", tn.Name) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/victorops.go b/pkg/services/ngalert/notifier/channels/victorops.go index 8d655296ff6..e95cdbfd063 100644 --- a/pkg/services/ngalert/notifier/channels/victorops.go +++ b/pkg/services/ngalert/notifier/channels/victorops.go @@ -109,7 +109,7 @@ func (vn *VictoropsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bo Body: string(b), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { vn.log.Error("Failed to send Victorops notification", "error", err, "webhook", vn.Name) return false, err } diff --git a/pkg/services/ngalert/notifier/channels/webhook.go b/pkg/services/ngalert/notifier/channels/webhook.go index 6b1f55c60b8..6f31a4aa702 100644 --- a/pkg/services/ngalert/notifier/channels/webhook.go +++ b/pkg/services/ngalert/notifier/channels/webhook.go @@ -118,7 +118,7 @@ func (wn *WebhookNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool HttpMethod: wn.HTTPMethod, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return false, err } diff --git a/pkg/services/ngalert/notifier/channels/wecom.go b/pkg/services/ngalert/notifier/channels/wecom.go index a38d13c3ccf..51b73303375 100644 --- a/pkg/services/ngalert/notifier/channels/wecom.go +++ b/pkg/services/ngalert/notifier/channels/wecom.go @@ -74,7 +74,7 @@ func (w *WeComNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, e Body: string(body), } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { w.log.Error("failed to send WeCom webhook", "error", err, "notification", w.Name) return false, err } diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index 2028b4c6f4e..65e1bba9fa1 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -170,7 +170,7 @@ func (ns *NotificationService) validateResetPasswordCode(ctx context.Context, qu } userQuery := models.GetUserByLoginQuery{LoginOrEmail: login} - if err := bus.DispatchCtx(ctx, &userQuery); err != nil { + if err := bus.Dispatch(ctx, &userQuery); err != nil { return err } @@ -212,7 +212,7 @@ func (ns *NotificationService) signUpStartedHandler(ctx context.Context, evt *ev } emailSentCmd := models.UpdateTempUserWithEmailSentCommand{Code: evt.Code} - return bus.DispatchCtx(ctx, &emailSentCmd) + return bus.Dispatch(ctx, &emailSentCmd) } func (ns *NotificationService) signUpCompletedHandler(ctx context.Context, evt *events.SignUpCompleted) error { diff --git a/pkg/services/oauthtoken/oauth_token.go b/pkg/services/oauthtoken/oauth_token.go index 4b541433b74..b74444a1da7 100644 --- a/pkg/services/oauthtoken/oauth_token.go +++ b/pkg/services/oauthtoken/oauth_token.go @@ -38,7 +38,7 @@ func (o *Service) GetCurrentOAuthToken(ctx context.Context, user *models.SignedI } authInfoQuery := &models.GetAuthInfoQuery{UserId: user.UserId} - if err := bus.DispatchCtx(ctx, authInfoQuery); err != nil { + if err := bus.Dispatch(ctx, authInfoQuery); err != nil { if errors.Is(err, models.ErrUserNotFound) { // Not necessarily an error. User may be logged in another way. logger.Debug("no OAuth token for user found", "userId", user.UserId, "username", user.Login) @@ -88,7 +88,7 @@ func (o *Service) GetCurrentOAuthToken(ctx context.Context, user *models.SignedI AuthId: authInfoQuery.Result.AuthId, OAuthToken: token, } - if err := bus.DispatchCtx(ctx, updateAuthCommand); err != nil { + if err := bus.Dispatch(ctx, updateAuthCommand); err != nil { logger.Error("failed to update auth info during token refresh", "userId", user.UserId, "username", user.Login, "error", err) return nil } diff --git a/pkg/services/provisioning/dashboards/dashboard.go b/pkg/services/provisioning/dashboards/dashboard.go index 44f194a9d40..f5d0a4dc08e 100644 --- a/pkg/services/provisioning/dashboards/dashboard.go +++ b/pkg/services/provisioning/dashboards/dashboard.go @@ -84,7 +84,7 @@ func (provider *Provisioner) CleanUpOrphanedDashboards(ctx context.Context) { currentReaders[index] = reader.Cfg.Name } - if err := bus.DispatchCtx(ctx, &models.DeleteOrphanedProvisionedDashboardsCommand{ReaderNames: currentReaders}); err != nil { + if err := bus.Dispatch(ctx, &models.DeleteOrphanedProvisionedDashboardsCommand{ReaderNames: currentReaders}); err != nil { provider.log.Warn("Failed to delete orphaned provisioned dashboards", "err", err) } } diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go index a697ecf767c..9f1bedf2f81 100644 --- a/pkg/services/provisioning/dashboards/file_reader.go +++ b/pkg/services/provisioning/dashboards/file_reader.go @@ -297,7 +297,7 @@ func getOrCreateFolderID(ctx context.Context, cfg *config, service dashboards.Da } cmd := &models.GetDashboardQuery{Slug: models.SlugifyTitle(folderName), OrgId: cfg.OrgID} - err := bus.DispatchCtx(ctx, cmd) + err := bus.Dispatch(ctx, cmd) if err != nil && !errors.Is(err, models.ErrDashboardNotFound) { return 0, err diff --git a/pkg/services/provisioning/datasources/datasources.go b/pkg/services/provisioning/datasources/datasources.go index 11e06a5421f..329192343a4 100644 --- a/pkg/services/provisioning/datasources/datasources.go +++ b/pkg/services/provisioning/datasources/datasources.go @@ -45,7 +45,7 @@ func (dc *DatasourceProvisioner) apply(ctx context.Context, cfg *configs) error for _, ds := range cfg.Datasources { cmd := &models.GetDataSourceQuery{OrgId: ds.OrgID, Name: ds.Name} - err := bus.DispatchCtx(ctx, cmd) + err := bus.Dispatch(ctx, cmd) if err != nil && !errors.Is(err, models.ErrDataSourceNotFound) { return err } @@ -53,13 +53,13 @@ func (dc *DatasourceProvisioner) apply(ctx context.Context, cfg *configs) error if errors.Is(err, models.ErrDataSourceNotFound) { insertCmd := createInsertCommand(ds) dc.log.Info("inserting datasource from configuration ", "name", insertCmd.Name, "uid", insertCmd.Uid) - if err := bus.DispatchCtx(ctx, insertCmd); err != nil { + if err := bus.Dispatch(ctx, insertCmd); err != nil { return err } } else { updateCmd := createUpdateCommand(ds, cmd.Result.Id) dc.log.Debug("updating datasource from configuration", "name", updateCmd.Name, "uid", updateCmd.Uid) - if err := bus.DispatchCtx(ctx, updateCmd); err != nil { + if err := bus.Dispatch(ctx, updateCmd); err != nil { return err } } @@ -86,7 +86,7 @@ func (dc *DatasourceProvisioner) applyChanges(ctx context.Context, configPath st func (dc *DatasourceProvisioner) deleteDatasources(ctx context.Context, dsToDelete []*deleteDatasourceConfig) error { for _, ds := range dsToDelete { cmd := &models.DeleteDataSourceCommand{OrgID: ds.OrgID, Name: ds.Name} - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return err } diff --git a/pkg/services/provisioning/notifiers/alert_notifications.go b/pkg/services/provisioning/notifiers/alert_notifications.go index 8a40fae4c3f..1341ca9cd01 100644 --- a/pkg/services/provisioning/notifiers/alert_notifications.go +++ b/pkg/services/provisioning/notifiers/alert_notifications.go @@ -48,7 +48,7 @@ func (dc *NotificationProvisioner) deleteNotifications(ctx context.Context, noti if notification.OrgID == 0 && notification.OrgName != "" { getOrg := &models.GetOrgByNameQuery{Name: notification.OrgName} - if err := bus.DispatchCtx(ctx, getOrg); err != nil { + if err := bus.Dispatch(ctx, getOrg); err != nil { return err } notification.OrgID = getOrg.Result.Id @@ -58,13 +58,13 @@ func (dc *NotificationProvisioner) deleteNotifications(ctx context.Context, noti getNotification := &models.GetAlertNotificationsWithUidQuery{Uid: notification.UID, OrgId: notification.OrgID} - if err := bus.DispatchCtx(ctx, getNotification); err != nil { + if err := bus.Dispatch(ctx, getNotification); err != nil { return err } if getNotification.Result != nil { cmd := &models.DeleteAlertNotificationWithUidCommand{Uid: getNotification.Result.Uid, OrgId: getNotification.OrgId} - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return err } } @@ -77,7 +77,7 @@ func (dc *NotificationProvisioner) mergeNotifications(ctx context.Context, notif for _, notification := range notificationToMerge { if notification.OrgID == 0 && notification.OrgName != "" { getOrg := &models.GetOrgByNameQuery{Name: notification.OrgName} - if err := bus.DispatchCtx(ctx, getOrg); err != nil { + if err := bus.Dispatch(ctx, getOrg); err != nil { return err } notification.OrgID = getOrg.Result.Id @@ -86,7 +86,7 @@ func (dc *NotificationProvisioner) mergeNotifications(ctx context.Context, notif } cmd := &models.GetAlertNotificationsWithUidQuery{OrgId: notification.OrgID, Uid: notification.UID} - err := bus.DispatchCtx(ctx, cmd) + err := bus.Dispatch(ctx, cmd) if err != nil { return err } @@ -106,7 +106,7 @@ func (dc *NotificationProvisioner) mergeNotifications(ctx context.Context, notif SendReminder: notification.SendReminder, } - if err := bus.DispatchCtx(ctx, insertCmd); err != nil { + if err := bus.Dispatch(ctx, insertCmd); err != nil { return err } } else { @@ -124,7 +124,7 @@ func (dc *NotificationProvisioner) mergeNotifications(ctx context.Context, notif SendReminder: notification.SendReminder, } - if err := bus.DispatchCtx(ctx, updateCmd); err != nil { + if err := bus.Dispatch(ctx, updateCmd); err != nil { return err } } diff --git a/pkg/services/provisioning/plugins/plugin_provisioner.go b/pkg/services/provisioning/plugins/plugin_provisioner.go index d56db4e8a63..0093f0baddd 100644 --- a/pkg/services/provisioning/plugins/plugin_provisioner.go +++ b/pkg/services/provisioning/plugins/plugin_provisioner.go @@ -32,7 +32,7 @@ func (ap *PluginProvisioner) apply(ctx context.Context, cfg *pluginsAsConfig) er for _, app := range cfg.Apps { if app.OrgID == 0 && app.OrgName != "" { getOrgQuery := &models.GetOrgByNameQuery{Name: app.OrgName} - if err := bus.DispatchCtx(ctx, getOrgQuery); err != nil { + if err := bus.Dispatch(ctx, getOrgQuery); err != nil { return err } app.OrgID = getOrgQuery.Result.Id @@ -41,7 +41,7 @@ func (ap *PluginProvisioner) apply(ctx context.Context, cfg *pluginsAsConfig) er } query := &models.GetPluginSettingByIdQuery{OrgId: app.OrgID, PluginId: app.PluginID} - err := bus.DispatchCtx(ctx, query) + err := bus.Dispatch(ctx, query) if err != nil { if !errors.Is(err, models.ErrPluginSettingNotFound) { return err @@ -60,7 +60,7 @@ func (ap *PluginProvisioner) apply(ctx context.Context, cfg *pluginsAsConfig) er SecureJsonData: app.SecureJSONData, PluginVersion: app.PluginVersion, } - if err := bus.DispatchCtx(ctx, cmd); err != nil { + if err := bus.Dispatch(ctx, cmd); err != nil { return err } } diff --git a/pkg/services/provisioning/utils/utils.go b/pkg/services/provisioning/utils/utils.go index 1ade4da8b18..13c270c5442 100644 --- a/pkg/services/provisioning/utils/utils.go +++ b/pkg/services/provisioning/utils/utils.go @@ -11,7 +11,7 @@ import ( func CheckOrgExists(ctx context.Context, orgID int64) error { query := models.GetOrgByIdQuery{Id: orgID} - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { if errors.Is(err, models.ErrOrgNotFound) { return err } diff --git a/pkg/services/quota/quota.go b/pkg/services/quota/quota.go index e517abde80d..db8d429307e 100644 --- a/pkg/services/quota/quota.go +++ b/pkg/services/quota/quota.go @@ -63,7 +63,7 @@ func (qs *QuotaService) QuotaReached(c *models.ReqContext, target string) (bool, continue } query := models.GetGlobalQuotaByTargetQuery{Target: scope.Target, UnifiedAlertingEnabled: qs.Cfg.UnifiedAlerting.IsEnabled()} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return true, err } if query.Result.Used >= scope.DefaultLimit { @@ -79,7 +79,7 @@ func (qs *QuotaService) QuotaReached(c *models.ReqContext, target string) (bool, Default: scope.DefaultLimit, UnifiedAlertingEnabled: qs.Cfg.UnifiedAlerting.IsEnabled(), } - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return true, err } if query.Result.Limit < 0 { @@ -97,7 +97,7 @@ func (qs *QuotaService) QuotaReached(c *models.ReqContext, target string) (bool, continue } query := models.GetUserQuotaByTargetQuery{UserId: c.UserId, Target: scope.Target, Default: scope.DefaultLimit, UnifiedAlertingEnabled: qs.Cfg.UnifiedAlerting.IsEnabled()} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return true, err } if query.Result.Limit < 0 { diff --git a/pkg/services/search/service.go b/pkg/services/search/service.go index 7fdeda942a6..6e729353a31 100644 --- a/pkg/services/search/service.go +++ b/pkg/services/search/service.go @@ -84,7 +84,7 @@ func (s *SearchService) searchHandler(ctx context.Context, query *Query) error { dashboardQuery.Sort = sortOpt } - if err := bus.DispatchCtx(ctx, &dashboardQuery); err != nil { + if err := bus.Dispatch(ctx, &dashboardQuery); err != nil { return err } @@ -120,7 +120,7 @@ func setStarredDashboards(ctx context.Context, userID int64, hits []*Hit) error UserId: userID, } - if err := bus.DispatchCtx(ctx, &query); err != nil { + if err := bus.Dispatch(ctx, &query); err != nil { return err } diff --git a/pkg/services/searchusers/searchusers.go b/pkg/services/searchusers/searchusers.go index c7070d26cee..1cca2ed704e 100644 --- a/pkg/services/searchusers/searchusers.go +++ b/pkg/services/searchusers/searchusers.go @@ -60,7 +60,7 @@ func (s *OSSService) SearchUser(c *models.ReqContext) (*models.SearchUsersQuery, } query := &models.SearchUsersQuery{Query: searchQuery, Filters: filters, Page: page, Limit: perPage} - if err := s.bus.DispatchCtx(c.Req.Context(), query); err != nil { + if err := s.bus.Dispatch(c.Req.Context(), query); err != nil { return nil, err } diff --git a/pkg/services/sqlstore/alert_notification.go b/pkg/services/sqlstore/alert_notification.go index 46a94bfcab2..08a7b6985f2 100644 --- a/pkg/services/sqlstore/alert_notification.go +++ b/pkg/services/sqlstore/alert_notification.go @@ -52,7 +52,7 @@ func (ss *SQLStore) DeleteAlertNotificationWithUid(ctx context.Context, cmd *mod Id: existingNotification.Result.Id, OrgId: existingNotification.Result.OrgId, } - if err := bus.DispatchCtx(ctx, deleteCommand); err != nil { + if err := bus.Dispatch(ctx, deleteCommand); err != nil { return err } @@ -454,7 +454,7 @@ func (ss *SQLStore) UpdateAlertNotificationWithUid(ctx context.Context, cmd *mod OrgId: cmd.OrgId, } - if err := bus.DispatchCtx(ctx, updateNotification); err != nil { + if err := bus.Dispatch(ctx, updateNotification); err != nil { return err } diff --git a/pkg/services/teamguardian/team.go b/pkg/services/teamguardian/team.go index d11bf7b9982..1b06f8f7de5 100644 --- a/pkg/services/teamguardian/team.go +++ b/pkg/services/teamguardian/team.go @@ -22,7 +22,7 @@ func CanAdmin(ctx context.Context, bus bus.Bus, orgId int64, teamId int64, user UserId: user.UserId, } - if err := bus.DispatchCtx(ctx, &cmd); err != nil { + if err := bus.Dispatch(ctx, &cmd); err != nil { return err } diff --git a/pkg/services/thumbs/service.go b/pkg/services/thumbs/service.go index ed43a35400e..2da855537f4 100644 --- a/pkg/services/thumbs/service.go +++ b/pkg/services/thumbs/service.go @@ -246,7 +246,7 @@ func (hs *thumbService) StopCrawler(c *models.ReqContext) response.Response { func (hs *thumbService) getStatus(c *models.ReqContext, uid string, checkSave bool) int { query := models.GetDashboardQuery{Uid: uid, OrgId: c.OrgId} - if err := bus.DispatchCtx(c.Req.Context(), &query); err != nil { + if err := bus.Dispatch(c.Req.Context(), &query); err != nil { return 404 // not found }