root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity

RBAC: Fix migrations running into the wrong order (#50452) 

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
This commit is contained in:
Gabriel MABILLE 2022-06-08 19:33:32 +02:00 committed by GitHub
parent a89d4a5be7
commit 2813e49842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/sqlstore/migrations/accesscontrol/managed_permission_migrator.go
View File

@ -23,8 +23,8 @@ import (
const ManagedPermissionsMigrationID = "managed permissions migration"
func AddManagedPermissionsMigration(mg *migrator.Migrator) {
mg.AddMigration(ManagedPermissionsMigrationID, &managedPermissionMigrator{})
func AddManagedPermissionsMigration(mg *migrator.Migrator, migrationID string) {
mg.AddMigration(migrationID, &managedPermissionMigrator{})
}
type managedPermissionMigrator struct {

2
pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go
View File

@ -127,7 +127,7 @@ DELETE FROM permission; DELETE FROM role`, acmig.ManagedPermissionsMigrationID)
// Run accesscontrol migration (permissions insertion should not have conflicted)
acmigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("acmigration.test")})
acmig.AddManagedPermissionsMigration(acmigrator)
acmig.AddManagedPermissionsMigration(acmigrator, acmig.ManagedPermissionsMigrationID)
errRunningMig := acmigrator.Start(false, 0)
require.NoError(t, errRunningMig)

2
pkg/services/sqlstore/migrations/migrations.go
View File

@ -88,7 +88,7 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
ualert.CreateDefaultFoldersForAlertingMigration(mg)
addDbFileStorageMigration(mg)
accesscontrol.AddManagedPermissionsMigration(mg)
accesscontrol.AddManagedPermissionsMigration(mg, accesscontrol.ManagedPermissionsMigrationID)
accesscontrol.AddManagedFolderAlertActionsMigration(mg)
accesscontrol.AddActionNameMigrator(mg)
}