opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 17:22:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move SignedInUser to user service and RoleType and Roles to org (#53445)

Browse Source 
* Move SignedInUser to user service and RoleType and Roles to org

* Use go naming convention for roles

* Fix some imports and leftovers

* Fix ldap debug test

* Fix lint

* Fix lint 2

* Fix lint 3

* Fix type and not needed conversion

* Clean up messages in api tests

* Clean up api tests 2
This commit is contained in:
idafurjes
2022-08-10 11:56:48 +02:00
committed by GitHub
parent 46004037e2
commit 6afad51761
278 changed files with 1758 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/services/ngalert/api/api_testing_test.go
View File

@ -17,6 +17,7 @@ import (
"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
"github.com/grafana/grafana/pkg/services/ngalert/eval"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/web"
)
@ -26,7 +27,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
Context: &web.Context{
Req: &http.Request{},
},
SignedInUser: &models2.SignedInUser{
SignedInUser: &user.SignedInUser{
OrgId: 1,
},
}
@ -94,7 +95,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
Req: &http.Request{},
},
IsSignedIn: false,
SignedInUser: &models2.SignedInUser{
SignedInUser: &user.SignedInUser{
OrgId: 1,
},
}
@ -149,7 +150,7 @@ func TestRouteEvalQueries(t *testing.T) {
Context: &web.Context{
Req: &http.Request{},
},
SignedInUser: &models2.SignedInUser{
SignedInUser: &user.SignedInUser{
OrgId: 1,
},
}
@ -218,7 +219,7 @@ func TestRouteEvalQueries(t *testing.T) {
Req: &http.Request{},
},
IsSignedIn: false,
SignedInUser: &models2.SignedInUser{
SignedInUser: &user.SignedInUser{
OrgId: 1,
},
}