Skip to content

Commit 7936c4c

Browse files
idafurjesidafurjes
authored
Rename AddHandlerCtx to AddHandler (grafana#43557)
1 parent ec9d6b9 commit 7936c4c

File tree

95 files changed

+419
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+419
-419
lines changed

‎pkg/api/admin_users_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
5555
t.Run("When a server admin attempts to logout himself from all devices", func(t *testing.T) {
5656
adminLogoutUserScenario(t, "Should not be allowed when calling POST on",
5757
"/api/admin/users/1/logout", "/api/admin/users/:id/logout", func(sc *scenarioContext) {
58-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
58+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
5959
cmd.Result = &models.User{Id: testUserID}
6060
return nil
6161
})
@@ -70,7 +70,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
7070
"/api/admin/users/:id/logout", func(sc *scenarioContext) {
7171
userID := int64(0)
7272

73-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
73+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
7474
userID = cmd.Id
7575
return models.ErrUserNotFound
7676
})
@@ -86,7 +86,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
8686
adminRevokeUserAuthTokenScenario(t, "Should return not found when calling POST on",
8787
"/api/admin/users/200/revoke-auth-token", "/api/admin/users/:id/revoke-auth-token", cmd, func(sc *scenarioContext) {
8888
var userID int64
89-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
89+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
9090
userID = cmd.Id
9191
return models.ErrUserNotFound
9292
})
@@ -101,7 +101,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
101101
adminGetUserAuthTokensScenario(t, "Should return not found when calling GET on",
102102
"/api/admin/users/200/auth-tokens", "/api/admin/users/:id/auth-tokens", func(sc *scenarioContext) {
103103
var userID int64
104-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
104+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetUserByIdQuery) error {
105105
userID = cmd.Id
106106
return models.ErrUserNotFound
107107
})
@@ -117,11 +117,11 @@ func TestAdminAPIEndpoint(t *testing.T) {
117117
"/api/admin/users/42/enable", "/api/admin/users/:id/enable", func(sc *scenarioContext) {
118118
var userID int64
119119
isDisabled := false
120-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
120+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
121121
return models.ErrUserNotFound
122122
})
123123

124-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.DisableUserCommand) error {
124+
bus.AddHandler("test", func(ctx context.Context, cmd *models.DisableUserCommand) error {
125125
userID = cmd.UserId
126126
isDisabled = cmd.IsDisabled
127127
return models.ErrUserNotFound
@@ -143,11 +143,11 @@ func TestAdminAPIEndpoint(t *testing.T) {
143143
"/api/admin/users/42/disable", "/api/admin/users/:id/disable", func(sc *scenarioContext) {
144144
var userID int64
145145
isDisabled := false
146-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
146+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
147147
return models.ErrUserNotFound
148148
})
149149

150-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.DisableUserCommand) error {
150+
bus.AddHandler("test", func(ctx context.Context, cmd *models.DisableUserCommand) error {
151151
userID = cmd.UserId
152152
isDisabled = cmd.IsDisabled
153153
return models.ErrUserNotFound
@@ -170,7 +170,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
170170
adminDisableUserScenario(t, "Should return Could not disable external user error", "disable",
171171
"/api/admin/users/42/disable", "/api/admin/users/:id/disable", func(sc *scenarioContext) {
172172
var userID int64
173-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
173+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
174174
userID = cmd.UserId
175175
return nil
176176
})
@@ -188,7 +188,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
188188
adminDisableUserScenario(t, "Should return Could not enable external user error", "enable",
189189
"/api/admin/users/42/enable", "/api/admin/users/:id/enable", func(sc *scenarioContext) {
190190
var userID int64
191-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
191+
bus.AddHandler("test", func(ctx context.Context, cmd *models.GetAuthInfoQuery) error {
192192
userID = cmd.UserId
193193
return nil
194194
})
@@ -208,7 +208,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
208208
adminDeleteUserScenario(t, "Should return user not found error", "/api/admin/users/42",
209209
"/api/admin/users/:id", func(sc *scenarioContext) {
210210
var userID int64
211-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.DeleteUserCommand) error {
211+
bus.AddHandler("test", func(ctx context.Context, cmd *models.DeleteUserCommand) error {
212212
userID = cmd.UserId
213213
return models.ErrUserNotFound
214214
})

‎pkg/api/alerting_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAlertingAPIEndpoint(t *testing.T) {
2626
editorRole := models.ROLE_EDITOR
2727

2828
setUp := func(confs ...setUpConf) {
29-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetAlertByIdQuery) error {
29+
bus.AddHandler("test", func(ctx context.Context, query *models.GetAlertByIdQuery) error {
3030
query.Result = singleAlert
3131
return nil
3232
})
@@ -37,12 +37,12 @@ func TestAlertingAPIEndpoint(t *testing.T) {
3737
aclMockResp = c.aclMockResp
3838
}
3939
}
40-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardAclInfoListQuery) error {
40+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardAclInfoListQuery) error {
4141
query.Result = aclMockResp
4242
return nil
4343
})
4444

45-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetTeamsByUserQuery) error {
45+
bus.AddHandler("test", func(ctx context.Context, query *models.GetTeamsByUserQuery) error {
4646
query.Result = []*models.TeamDTO{}
4747
return nil
4848
})
@@ -86,13 +86,13 @@ func TestAlertingAPIEndpoint(t *testing.T) {
8686
setUp()
8787

8888
var searchQuery *search.Query
89-
bus.AddHandlerCtx("test", func(ctx context.Context, query *search.Query) error {
89+
bus.AddHandler("test", func(ctx context.Context, query *search.Query) error {
9090
searchQuery = query
9191
return nil
9292
})
9393

9494
var getAlertsQuery *models.GetAlertsQuery
95-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetAlertsQuery) error {
95+
bus.AddHandler("test", func(ctx context.Context, query *models.GetAlertsQuery) error {
9696
getAlertsQuery = query
9797
return nil
9898
})
@@ -110,7 +110,7 @@ func TestAlertingAPIEndpoint(t *testing.T) {
110110
setUp()
111111

112112
var searchQuery *search.Query
113-
bus.AddHandlerCtx("test", func(ctx context.Context, query *search.Query) error {
113+
bus.AddHandler("test", func(ctx context.Context, query *search.Query) error {
114114
searchQuery = query
115115
query.Result = search.HitList{
116116
&search.Hit{ID: 1},
@@ -120,7 +120,7 @@ func TestAlertingAPIEndpoint(t *testing.T) {
120120
})
121121

122122
var getAlertsQuery *models.GetAlertsQuery
123-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetAlertsQuery) error {
123+
bus.AddHandler("test", func(ctx context.Context, query *models.GetAlertsQuery) error {
124124
getAlertsQuery = query
125125
return nil
126126
})
@@ -153,7 +153,7 @@ func TestAlertingAPIEndpoint(t *testing.T) {
153153
}
154154

155155
func callPauseAlert(sc *scenarioContext) {
156-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.PauseAlertCommand) error {
156+
bus.AddHandler("test", func(ctx context.Context, cmd *models.PauseAlertCommand) error {
157157
return nil
158158
})
159159

‎pkg/api/annotations_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ func TestAnnotationsAPIEndpoint(t *testing.T) {
134134
}
135135

136136
setUp := func() {
137-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardAclInfoListQuery) error {
137+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardAclInfoListQuery) error {
138138
query.Result = aclMockResp
139139
return nil
140140
})
141141

142-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetTeamsByUserQuery) error {
142+
bus.AddHandler("test", func(ctx context.Context, query *models.GetTeamsByUserQuery) error {
143143
query.Result = []*models.TeamDTO{}
144144
return nil
145145
})

‎pkg/api/dashboard_permission_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
2626

2727
t.Run("Given dashboard not exists", func(t *testing.T) {
2828
setUp := func() {
29-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
29+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
3030
return models.ErrDashboardNotFound
3131
})
3232
}
@@ -68,7 +68,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
6868
getDashboardQueryResult := models.NewDashboard("Dash")
6969

7070
setUp := func() {
71-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
71+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
7272
query.Result = getDashboardQueryResult
7373
return nil
7474
})
@@ -120,7 +120,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
120120

121121
setUp := func() {
122122
getDashboardQueryResult := models.NewDashboard("Dash")
123-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
123+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
124124
query.Result = getDashboardQueryResult
125125
return nil
126126
})
@@ -173,7 +173,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
173173

174174
setUp := func() {
175175
getDashboardQueryResult := models.NewDashboard("Dash")
176-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
176+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
177177
query.Result = getDashboardQueryResult
178178
return nil
179179
})
@@ -214,7 +214,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
214214

215215
setUp := func() {
216216
getDashboardQueryResult := models.NewDashboard("Dash")
217-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
217+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
218218
query.Result = getDashboardQueryResult
219219
return nil
220220
})
@@ -285,7 +285,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
285285

286286
setUp := func() {
287287
getDashboardQueryResult := models.NewDashboard("Dash")
288-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
288+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
289289
query.Result = getDashboardQueryResult
290290
return nil
291291
})
@@ -336,7 +336,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
336336

337337
setUp := func() {
338338
getDashboardQueryResult := models.NewDashboard("Dash")
339-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
339+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardQuery) error {
340340
query.Result = getDashboardQueryResult
341341
return nil
342342
})

‎pkg/api/dashboard_snapshot_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ func TestDashboardSnapshotAPIEndpoint_singleSnapshot(t *testing.T) {
4545
External: true,
4646
}
4747

48-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardSnapshotQuery) error {
48+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardSnapshotQuery) error {
4949
query.Result = mockSnapshotResult
5050
return nil
5151
})
5252

53-
bus.AddHandlerCtx("test", func(ctx context.Context, cmd *models.DeleteDashboardSnapshotCommand) error {
53+
bus.AddHandler("test", func(ctx context.Context, cmd *models.DeleteDashboardSnapshotCommand) error {
5454
return nil
5555
})
5656

57-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetDashboardAclInfoListQuery) error {
57+
bus.AddHandler("test", func(ctx context.Context, query *models.GetDashboardAclInfoListQuery) error {
5858
query.Result = aclMockResp
5959
return nil
6060
})
6161

6262
teamResp := []*models.TeamDTO{}
63-
bus.AddHandlerCtx("test", func(ctx context.Context, query *models.GetTeamsByUserQuery) error {
63+
bus.AddHandler("test", func(ctx context.Context, query *models.GetTeamsByUserQuery) error {
6464
query.Result = teamResp
6565
return nil
6666
})

0 commit comments

Comments
 (0)