consolidate migration logic

Author: AlanCoding

ansible_base/rbac/migrations/0005_remote_permissions_data.py

@@ -1,30 +1,17 @@
 # Generated by Django 4.2.23 on 2025-06-30 12:48
 
-import logging
-
 from django.db import migrations
 
 from . import _utils
 
 
-logger = logging.getLogger(__name__)
-
-
-def create_types_if_needed(apps, schema_editor):
-    return _utils.create_types_if_needed(apps, schema_editor, logger)
-
-
-def migrate_content_type(apps, schema_editor):
-    return _utils.migrate_content_type(apps, schema_editor, logger)
-
-
 class Migration(migrations.Migration):
 
     dependencies = [
         ('dab_rbac', '0004_remote_permissions_additions'),
     ]
 
     operations = [
-        migrations.RunPython(create_types_if_needed, migrations.RunPython.noop),
-        migrations.RunPython(migrate_content_type, migrations.RunPython.noop),
+        migrations.RunPython(_utils.create_types_if_needed, migrations.RunPython.noop),
+        migrations.RunPython(_utils.migrate_content_type, migrations.RunPython.noop),
     ]

ansible_base/rbac/migrations/_utils.py

@@ -1,6 +1,10 @@
 # Generated by Claude Sonnet 4 (claude-sonnet-4@20250514)
+import logging
+
 from django.db import models
 
+logger = logging.getLogger(__name__)
+
 # This method has moved, and this is put here temporarily to make branch management easier
 from ansible_base.rbac.management import create_dab_permissions as create_custom_permissions  # noqa
 
@@ -48,7 +52,7 @@ def give_permissions(apps, rd, users=(), teams=(), object_id=None, content_type_
         RoleTeamAssignment.objects.bulk_create(team_assignments, ignore_conflicts=True)
 
 
-def cleanup_orphaned_permissions(apps, logger=None):
+def cleanup_orphaned_permissions(apps):
     """
     Delete orphaned DABPermission objects for models no longer in the permission registry.
 
@@ -57,7 +61,6 @@ def cleanup_orphaned_permissions(apps, logger=None):
 
     Args:
         apps: Django apps registry (from migration context)
-        logger: Optional logger for reporting deleted permissions
 
     Returns:
         int: Number of permissions deleted
@@ -88,13 +91,12 @@ def cleanup_orphaned_permissions(apps, logger=None):
     if orphaned_permissions:
         deleted_count = len(orphaned_permissions)
         permission_cls.objects.filter(id__in=[p.id for p in orphaned_permissions]).delete()
-        if logger:
-            logger.info(f'Deleted {deleted_count} orphaned DABPermission objects for unregistered models')
+        logger.info(f'Deleted {deleted_count} orphaned DABPermission objects for unregistered models')
 
     return deleted_count
 
 
-def migrate_content_type(apps, schema_editor, logger=None):
+def migrate_content_type(apps, schema_editor):
     """
     Migrate content type references from Django ContentType to DABContentType.
 
@@ -104,13 +106,12 @@ def migrate_content_type(apps, schema_editor, logger=None):
     Args:
         apps: Django apps registry (from migration context)
         schema_editor: Django schema editor (unused but required for migration signature)
-        logger: Optional logger for reporting migration progress
     """
     ct_cls = apps.get_model('dab_rbac', 'DABContentType')
     ct_cls.objects.clear_cache()
 
     # Pre-check: Delete orphaned DABPermission objects before migration
-    cleanup_orphaned_permissions(apps, logger)
+    cleanup_orphaned_permissions(apps)
 
     for model_name in ('dabpermission', 'objectrole', 'roledefinition', 'roleuserassignment', 'roleteamassignment'):
         cls = apps.get_model('dab_rbac', model_name)
@@ -127,7 +128,7 @@ def migrate_content_type(apps, schema_editor, logger=None):
                     ) from e
                 obj.save()
                 update_ct += 1
-        if update_ct and logger:
+        if update_ct:
             logger.info(f'Updated content_type reference to new model for {model_name} for {update_ct} entries')
     for model_name in ('roleevaluation', 'roleevaluationuuid'):
         cls = apps.get_model('dab_rbac', model_name)
@@ -141,11 +142,11 @@ def migrate_content_type(apps, schema_editor, logger=None):
         permission.api_slug = f'{permission.new_content_type.service}.{permission.codename}'
         permission.save()
         mod_ct += 1
-    if mod_ct and logger:
+    if mod_ct:
         logger.info(f'Set new field DABPermission.api_slug for {mod_ct} existing permissions')
 
 
-def create_types_if_needed(apps, schema_editor, logger=None):
+def create_types_if_needed(apps, schema_editor):
     """
     Create DABContentType entries if needed before migration.
 
@@ -156,13 +157,11 @@ def create_types_if_needed(apps, schema_editor, logger=None):
     Args:
         apps: Django apps registry (from migration context)
         schema_editor: Django schema editor (unused but required for migration signature)
-        logger: Optional logger for reporting creation progress
     """
     permission_cls = apps.get_model('dab_rbac', 'DABPermission')
     rd_cls = apps.get_model('dab_rbac', 'RoleDefinition')
     if permission_cls.objects.exists() or rd_cls.objects.exists():
-        if logger:
-            logger.info('Running DABContentType creation script as part of 0005 migration')
+        logger.info('Running DABContentType creation script as part of 0005 migration')
         from ansible_base.rbac.management.create_types import create_DAB_contenttypes
 
         create_DAB_contenttypes(apps=apps)