Merge pull request #1299 from wwitzel3/rbac

deprecate Credential.team/user

awx/main/migrations/0007_v300_rbac_changes.py

@@ -225,4 +225,33 @@ class Migration(migrations.Migration):
             name='organization',
             field=models.ForeignKey(related_name='projects', to='main.Organization', blank=True, null=True),
         ),
+        migrations.RenameField(
+            'Credential',
+            'team',
+            'deprecated_team',
+        ),
+        migrations.RenameField(
+            'Credential',
+            'user',
+            'deprecated_user',
+        ),
+        migrations.AlterField(
+            model_name='organization',
+            name='deprecated_admins',
+            field=models.ManyToManyField(related_name='deprecated_admin_of_organizations', to=settings.AUTH_USER_MODEL, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='organization',
+            name='deprecated_users',
+            field=models.ManyToManyField(related_name='deprecated_organizations', to=settings.AUTH_USER_MODEL, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='team',
+            name='deprecated_users',
+            field=models.ManyToManyField(related_name='deprecated_teams', to=settings.AUTH_USER_MODEL, blank=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='credential',
+            unique_together=set([]),
+        ),
     ]

awx/main/migrations/_rbac.py

@@ -70,7 +70,7 @@ def attrfunc(attr_path):
 def _update_credential_parents(org, cred):
     org.admin_role.children.add(cred.owner_role)
     org.member_role.children.add(cred.usage_role)
-    cred.user, cred.team = None, None
+    cred.deprecated_user, cred.deprecated_team = None, None
     cred.save()
 
 def _discover_credentials(instances, cred, orgfunc):
@@ -102,7 +102,7 @@ def _discover_credentials(instances, cred, orgfunc):
                 cred.save()
 
                 # Unlink the old information from the new credential
-                cred.user, cred.team = None, None
+                cred.deprecated_user, cred.deprecated_team = None, None
                 cred.owner_role, cred.usage_role = None, None
                 cred.save()
 
@@ -138,15 +138,15 @@ def migrate_credential(apps, schema_editor):
                 _discover_credentials(projs, cred, attrfunc('organization'))
             continue
 
-        if cred.team is not None:
-            cred.team.admin_role.children.add(cred.owner_role)
-            cred.team.member_role.children.add(cred.usage_role)
-            cred.user, cred.team = None, None
+        if cred.deprecated_team is not None:
+            cred.deprecated_team.admin_role.children.add(cred.owner_role)
+            cred.deprecated_team.member_role.children.add(cred.usage_role)
+            cred.deprecated_user, cred.deprecated_team = None, None
             cred.save()
 
-        elif cred.user is not None:
-            cred.user.admin_role.children.add(cred.owner_role)
-            cred.user, cred.team = None, None
+        elif cred.deprecated_user is not None:
+            cred.deprecated_user.admin_role.children.add(cred.owner_role)
+            cred.deprecated_user, cred.deprecated_team = None, None
             cred.save()
 
         # no match found, log