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

Role mapping: Add group_mapping_uid column to user_role table (#93810)

Browse Source 
* add group_mapping_uid column to user_role table

* add group mapping UID to user role struct
This commit is contained in:
Ieva 2024-10-07 15:47:16 +01:00 committed by GitHub
parent 63bdbb67fc
commit d7aca7d0fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/services/accesscontrol/models.go
View File

@ -173,10 +173,11 @@ type TeamRole struct {
}
type UserRole struct {
ID int64 `json:"id" xorm:"pk autoincr 'id'"`
OrgID int64 `json:"orgId" xorm:"org_id"`
RoleID int64 `json:"roleId" xorm:"role_id"`
UserID int64 `json:"userId" xorm:"user_id"`
ID int64 `json:"id" xorm:"pk autoincr 'id'"`
OrgID int64 `json:"orgId" xorm:"org_id"`
RoleID int64 `json:"roleId" xorm:"role_id"`
UserID int64 `json:"userId" xorm:"user_id"`
GroupMappingUID string `json:"groupMappingUID" xorm:"group_mapping_uid"`
Created time.Time
}

14
pkg/services/sqlstore/migrations/accesscontrol/migrations.go
View File

@ -196,4 +196,18 @@ func AddMigration(mg *migrator.Migrator) {
Type: migrator.UniqueIndex,
Cols: []string{"role_id", "action", "scope"},
}))
mg.AddMigration("add group mapping UID column to user_role table", migrator.NewAddColumnMigration(userRoleV1, &migrator.Column{
Name: "group_mapping_uid", Type: migrator.DB_NVarchar, Length: 40, Default: "''", Nullable: true,
}))
mg.AddMigration("add user_role org ID, user ID, role ID, group mapping UID index", migrator.NewAddIndexMigration(userRoleV1, &migrator.Index{
Type: migrator.UniqueIndex,
Cols: []string{"org_id", "user_id", "role_id", "group_mapping_uid"},
}))
mg.AddMigration("remove user_role org ID, user ID, role ID index", migrator.NewDropIndexMigration(userRoleV1, &migrator.Index{
Type: migrator.UniqueIndex,
Cols: []string{"org_id", "user_id", "role_id"},
}))
}