From 406f286e5155cbbbd7b6a2710c9441d03136aae5 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 8 Jun 2022 13:53:30 -0400 Subject: [PATCH] RBAC: Fix migrations running into the wrong order (#50452) (#50454) Co-authored-by: Kalle Persson Co-authored-by: Kalle Persson (cherry picked from commit 2813e49842c344fb11989a9be24fcb04e0903112) Co-authored-by: Gabriel MABILLE --- .../migrations/accesscontrol/managed_permission_migrator.go | 4 ++-- .../accesscontrol/test/managed_permission_migrator_test.go | 2 +- pkg/services/sqlstore/migrations/migrations.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/services/sqlstore/migrations/accesscontrol/managed_permission_migrator.go b/pkg/services/sqlstore/migrations/accesscontrol/managed_permission_migrator.go index 02b5378e341..425247d0314 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/managed_permission_migrator.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/managed_permission_migrator.go @@ -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 { diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go index a903d42faea..9d8946e2ed6 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go @@ -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) diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go index e3eb05aad52..b6474644b48 100644 --- a/pkg/services/sqlstore/migrations/migrations.go +++ b/pkg/services/sqlstore/migrations/migrations.go @@ -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) }