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

SQLStore: Make addOrgUser private (#59142)

Browse Source 
make addOrgUser private
This commit is contained in:
Serge Zaitsev
2022-11-22 17:02:39 +00:00
committed by GitHub
parent de99ce139c
commit b875ca08c6
7 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/org_test.go
+2 -2
View File
@@ -73,7 +73,7 @@ func TestIntegrationAccountDataAccess(t *testing.T) {
Role: org.RoleViewer,
}
err := sqlStore.AddOrgUser(context.Background(), &cmd)
err := sqlStore.addOrgUser(context.Background(), &cmd)
t.Run("Should have been saved without error", func(t *testing.T) {
require.NoError(t, err)
})
@@ -142,7 +142,7 @@ func TestIntegrationAccountDataAccess(t *testing.T) {
Role: org.RoleViewer,
}
err = sqlStore.AddOrgUser(context.Background(), &orgUserCmd)
err = sqlStore.addOrgUser(context.Background(), &orgUserCmd)
require.NoError(t, err)
dash1 := insertTestDashboard(t, sqlStore, "1 test dash", ac1.OrgID, 0, false, "prod", "webapp")
pkg/services/sqlstore/org_users.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/grafana/grafana/pkg/services/user"
)
func (ss *SQLStore) AddOrgUser(ctx context.Context, cmd *models.AddOrgUserCommand) error {
func (ss *SQLStore) addOrgUser(ctx context.Context, cmd *models.AddOrgUserCommand) error {
return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
// check if user exists
var usr user.User
pkg/services/sqlstore/org_users_test.go
+2 -2
View File
@@ -32,7 +32,7 @@ func TestSQLStore_AddOrgUser(t *testing.T) {
require.Equal(t, int64(-1), sa.OrgID)
// assign the sa to the org but without the override. should fail
err = store.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
err = store.addOrgUser(context.Background(), &models.AddOrgUserCommand{
Role: "Viewer",
OrgId: orgID,
UserId: sa.ID,
@@ -40,7 +40,7 @@ func TestSQLStore_AddOrgUser(t *testing.T) {
require.Error(t, err)
// assign the sa to the org with the override. should succeed
err = store.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
err = store.addOrgUser(context.Background(), &models.AddOrgUserCommand{
Role: "Viewer",
OrgId: orgID,
UserId: sa.ID,
pkg/services/sqlstore/stats_test.go
+3 -3
View File
@@ -86,7 +86,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
UserId: users[1].ID,
Role: org.RoleEditor,
}
err := sqlStore.AddOrgUser(context.Background(), cmd)
err := sqlStore.addOrgUser(context.Background(), cmd)
require.NoError(t, err)
// add 3rd user as viewer
@@ -95,7 +95,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
UserId: users[2].ID,
Role: org.RoleViewer,
}
err = sqlStore.AddOrgUser(context.Background(), cmd)
err = sqlStore.addOrgUser(context.Background(), cmd)
require.NoError(t, err)
// add 1st user as admin
@@ -104,7 +104,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
UserId: users[0].ID,
Role: org.RoleAdmin,
}
err = sqlStore.AddOrgUser(context.Background(), cmd)
err = sqlStore.addOrgUser(context.Background(), cmd)
require.NoError(t, err)
// force renewal of user stats
pkg/services/user/userimpl/store_test.go
+11 -6
View File
@@ -13,6 +13,8 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/org/orgimpl"
"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/user"
@@ -25,6 +27,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
}
ss := db.InitTestDB(t)
quotaService := quotaimpl.ProvideService(ss, ss.Cfg)
orgService, err := orgimpl.ProvideService(ss, ss.Cfg, quotaService)
require.NoError(t, err)
userStore := ProvideStore(ss, setting.NewCfg())
usr := &user.SignedInUser{
OrgID: 1,
@@ -265,9 +270,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
IsDisabled: false,
}
})
err := ss.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
err := orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{
LoginOrEmail: users[1].Login, Role: org.RoleViewer,
OrgId: users[0].OrgID, UserId: users[1].ID,
OrgID: users[0].OrgID, UserID: users[1].ID,
})
require.Nil(t, err)
@@ -402,9 +407,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
}
})
err = ss.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{
LoginOrEmail: users[1].Login, Role: org.RoleViewer,
OrgId: users[0].OrgID, UserId: users[1].ID,
OrgID: users[0].OrgID, UserID: users[1].ID,
})
require.Nil(t, err)
@@ -441,9 +446,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
IsDisabled: false,
}
})
err = ss.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{
LoginOrEmail: users[1].Login, Role: org.RoleViewer,
OrgId: users[0].OrgID, UserId: users[1].ID,
OrgID: users[0].OrgID, UserID: users[1].ID,
})
require.Nil(t, err)