IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename FGAC to RBAC in the codebase (#48051)

Browse Source
This commit is contained in:
Vardan Torosyan
2022-04-21 14:31:02 +02:00
committed by GitHub
parent ce6aed21a7
commit a0553de8dd
16 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/sqlstore/migrations/accesscontrol/team_membership.go
View File

@@ -61,8 +61,8 @@ func (p *teamPermissionMigrator) setRolePermissions(roleID int64, permissions []
return nil
}
// mapPermissionToFGAC translates the legacy membership (Member or Admin) into FGAC permissions
func (p *teamPermissionMigrator) mapPermissionToFGAC(permission models.PermissionType, teamID int64) []accesscontrol.Permission {
// mapPermissionToRBAC translates the legacy membership (Member or Admin) into RBAC permissions
func (p *teamPermissionMigrator) mapPermissionToRBAC(permission models.PermissionType, teamID int64) []accesscontrol.Permission {
teamIDScope := accesscontrol.Scope("teams", "id", strconv.FormatInt(teamID, 10))
switch permission {
case 0:
@@ -222,7 +222,7 @@ func (p *teamPermissionMigrator) generateAssociatedPermissions(teamMemberships [
if !initialized {
userPermissions = map[int64][]accesscontrol.Permission{}
}
userPermissions[m.UserId] = append(userPermissions[m.UserId], p.mapPermissionToFGAC(m.Permission, m.TeamId)...)
userPermissions[m.UserId] = append(userPermissions[m.UserId], p.mapPermissionToRBAC(m.Permission, m.TeamId)...)
userPermissionsByOrg[m.OrgId] = userPermissions
}

4
pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
View File

@@ -91,7 +91,7 @@ func TestMigrations(t *testing.T) {
setupTeams(t, x)
// Create managed user roles with teams permissions (ex: teams:read and teams.permissions:read)
setupUnecessaryFGACPermissions(t, x)
setupUnecessaryRBACPermissions(t, x)
team1Scope := accesscontrol.Scope("teams", "id", "1")
team2Scope := accesscontrol.Scope("teams", "id", "2")
@@ -347,7 +347,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) {
require.Equal(t, int64(5), membersCount, "needed 5 members for this test to run")
}
func setupUnecessaryFGACPermissions(t *testing.T, x *xorm.Engine) {
func setupUnecessaryRBACPermissions(t *testing.T, x *xorm.Engine) {
t.Helper()
now := time.Now()