Skip to content

Commit a4a89e4

Browse files
committed
Restrict DAB RBAC post-migrate to finished migrations
1 parent 7d62a63 commit a4a89e4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

ansible_base/rbac/triggers.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
from django.db.models import Model, Q
77
from django.db.models.signals import m2m_changed, post_delete, post_init, post_save, pre_delete, pre_save
8-
from django.db.utils import ProgrammingError
98
from django.dispatch import Signal
109

10+
from ansible_base.lib.utils.db import migrations_are_complete
1111
from ansible_base.rbac.caching import compute_object_role_permissions, compute_team_member_roles
1212
from ansible_base.rbac.models import ObjectRole, RoleDefinition, RoleEvaluation, get_evaluation_model
1313
from ansible_base.rbac.permission_registry import permission_registry
@@ -275,9 +275,7 @@ def rbac_post_user_delete(instance, *args, **kwargs):
275275

276276

277277
def post_migration_rbac_setup(sender, *args, **kwargs):
278-
try:
279-
RoleDefinition.objects.first()
280-
except ProgrammingError:
278+
if not migrations_are_complete():
281279
logger.info('Not running DAB RBAC post_migrate logic because of suspected reverse migration')
282280
return
283281

0 commit comments

Comments
 (0)