Merge pull request #564 from wwitzel3/squashbillies

Squashbillies - Fixing direct upgrades from 3.0/3.1 bug fix revisions.

awx/main/migrations/0003_squashed_v300_v303_updates.py

@@ -8,14 +8,6 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 from django.conf import settings
 import awx.main.fields
-import jsonfield.fields
-
-
-def update_dashed_host_variables(apps, schema_editor):
-    Host = apps.get_model('main', 'Host')
-    for host in Host.objects.filter(variables='---'):
-        host.variables = ''
-        host.save()
 
 
 class Migration(migrations.Migration):
@@ -27,13 +19,7 @@ class Migration(migrations.Migration):
                 (b'main', '0025_v300_update_rbac_parents'),
                 (b'main', '0026_v300_credential_unique'),
                 (b'main', '0027_v300_team_migrations'),
-                (b'main', '0028_v300_org_team_cascade'),
-                (b'main', '0029_v302_add_ask_skip_tags'),
-                (b'main', '0030_v302_job_survey_passwords'),
-                (b'main', '0031_v302_migrate_survey_passwords'),
-                (b'main', '0032_v302_credential_permissions_update'),
-                (b'main', '0033_v303_v245_host_variable_fix'),]
-
+                (b'main', '0028_v300_org_team_cascade')]
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
@@ -130,27 +116,4 @@ class Migration(migrations.Migration):
             field=models.ForeignKey(related_name='teams', to='main.Organization'),
             preserve_default=False,
         ),
-        # add ask skip tags
-        migrations.AddField(
-            model_name='jobtemplate',
-            name='ask_skip_tags_on_launch',
-            field=models.BooleanField(default=False),
-        ),
-        # job survery passwords
-        migrations.AddField(
-            model_name='job',
-            name='survey_passwords',
-            field=jsonfield.fields.JSONField(default={}, editable=False, blank=True),
-        ),
-        # RBAC credential permission updates
-        migrations.AlterField(
-            model_name='credential',
-            name='admin_role',
-            field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_administrator', b'organization.admin_role'], to='main.Role', null=b'True'),
-        ),
-        migrations.AlterField(
-            model_name='credential',
-            name='use_role',
-            field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'admin_role'], to='main.Role', null=b'True'),
-        ),
     ]

awx/main/migrations/0004_squashed_v310_release.py

@@ -8,6 +8,9 @@ import django.db.models.deletion
 import awx.main.models.workflow
 import awx.main.fields
 
+import _squashed
+from _squashed_30 import SQUASHED_30
+
 
 class Migration(migrations.Migration):
 
@@ -15,11 +18,11 @@ class Migration(migrations.Migration):
         ('main', '0003_squashed_v300_v303_updates'),
     ]
 
-    replaces = [
+    replaces = _squashed.replaces(SQUASHED_30) + [
         (b'main', '0034_v310_release'),
     ]
 
-    operations = [
+    operations = _squashed.operations(SQUASHED_30) + [
         # Create ChannelGroup table
         migrations.CreateModel(
             name='ChannelGroup',

awx/main/migrations/0005_squashed_v310_v313_updates.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+from django.db import migrations
 
-from django.db import migrations, models
+import _squashed
+from _squashed_31 import SQUASHED_31
 
 
 class Migration(migrations.Migration):
@@ -10,28 +12,5 @@ class Migration(migrations.Migration):
         ('main', '0004_squashed_v310_release'),
     ]
 
-    replaces = [
-        (b'main', '0035_v310_remove_tower_settings'),
-    ]
-
-    operations = [
-        # Remove Tower settings, these settings are now in separate awx.conf app.
-        migrations.RemoveField(
-            model_name='towersettings',
-            name='user',
-        ),
-        migrations.DeleteModel(
-            name='TowerSettings',
-        ),
-
-        migrations.AlterField(
-            model_name='project',
-            name='scm_type',
-            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
-        ),
-        migrations.AlterField(
-            model_name='projectupdate',
-            name='scm_type',
-            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
-        ),
-    ]
+    replaces = _squashed.replaces(SQUASHED_31)
+    operations = _squashed.operations(SQUASHED_31)

awx/main/migrations/0005a_squashed_v310_v313_updates.py

@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0005_squashed_v310_v313_updates'),
-    ]
-
-    replaces = [
-        (b'main', '0036_v311_insights'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='project',
-            name='scm_type',
-            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
-        ),
-        migrations.AlterField(
-            model_name='projectupdate',
-            name='scm_type',
-            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
-        ),
-    ]

awx/main/migrations/0005b_squashed_v310_v313_updates.py

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0005a_squashed_v310_v313_updates'),
-    ]
-
-    replaces = [
-        (b'main', '0037_v313_instance_version'),
-    ]
-
-    operations = [
-        # Remove Tower settings, these settings are now in separate awx.conf app.
-        migrations.AddField(
-            model_name='instance',
-            name='version',
-            field=models.CharField(max_length=24, blank=True),
-        ),
-    ]

awx/main/migrations/0006_v320_release.py

@@ -6,7 +6,12 @@ from __future__ import unicode_literals
 from psycopg2.extensions import AsIs
 
 # Django
-from django.db import migrations, models
+from django.db import (
+    connection,
+    migrations,
+    models,
+    OperationalError
+)
 from django.conf import settings
 import taggit.managers
 
@@ -15,12 +20,24 @@ import awx.main.fields
 from awx.main.models import Host
 
 
+def replaces():
+    squashed = ['0005a_squashed_v310_v313_updates', '0005b_squashed_v310_v313_updates']
+    try:
+        recorder = migrations.recorder.MigrationRecorder(connection)
+        result = recorder.migration_qs.filter(app='main').filter(name__in=squashed).all()
+        return [('main', m.name) for m in result]
+    except OperationalError:
+        return []
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0005b_squashed_v310_v313_updates'),
+        ('main', '0005_squashed_v310_v313_updates'),
     ]
 
+    replaces = replaces()
+
     operations = [
         # Release UJT unique_together constraint
         migrations.AlterUniqueTogether(

awx/main/migrations/_squashed.py

@@ -0,0 +1,54 @@
+from itertools import chain
+from django.db import (
+    connection,
+    migrations,
+    OperationalError,
+)
+
+
+def squash_data(squashed):
+    '''Returns a tuple of the squashed_keys and the key position to begin
+    processing replace and operation lists'''
+
+    cm = current_migration()
+    squashed_keys = sorted(squashed.keys())
+    if cm is None:
+        return squashed_keys, 0
+
+    try:
+        key_index = squashed_keys.index(cm.name) + 1
+    except ValueError:
+        key_index = 0
+    return squashed_keys, key_index
+
+
+def current_migration(exclude_squashed=True):
+    '''Get the latest migration non-squashed migration'''
+    try:
+        recorder = migrations.recorder.MigrationRecorder(connection)
+        migration_qs = recorder.migration_qs.filter(app='main')
+        if exclude_squashed:
+            migration_qs = migration_qs.exclude(name__contains='squashed')
+        return migration_qs.latest('id')
+    except (recorder.Migration.DoesNotExist, OperationalError):
+        return None
+
+
+def replaces(squashed):
+    '''Build a list of replacement migrations based on the most recent non-squashed migration
+    and the provided list of SQUASHED migrations. If the most recent non-squashed migration
+    is not present anywhere in the SQUASHED dictionary, assume they have all been applied.
+    '''
+    squashed_keys, key_index = squash_data(squashed)
+    return [(b'main', key) for key in squashed_keys[key_index:]]
+
+
+def operations(squashed):
+    '''Build a list of migration operations based on the most recent non-squashed migration
+    and the provided list of squashed migrations. If the most recent non-squashed migration
+    is not present anywhere in the `squashed` dictionary, assume they have all been applied.
+    '''
+    squashed_keys, key_index = squash_data(squashed)
+    op_keys = squashed_keys[key_index:]
+    ops = [squashed[op_key] for op_key in op_keys]
+    return [op for op in chain.from_iterable(ops)]

awx/main/migrations/_squashed_30.py

@@ -0,0 +1,60 @@
+from django.db import (
+    migrations,
+    models,
+)
+import jsonfield.fields
+import awx.main.fields
+
+from awx.main.migrations import _save_password_keys
+from awx.main.migrations import _migration_utils as migration_utils
+
+
+def update_dashed_host_variables(apps, schema_editor):
+    Host = apps.get_model('main', 'Host')
+    for host in Host.objects.filter(variables='---'):
+        host.variables = ''
+        host.save()
+
+
+SQUASHED_30 = {
+    '0029_v302_add_ask_skip_tags': [
+        # add ask skip tags
+        migrations.AddField(
+            model_name='jobtemplate',
+            name='ask_skip_tags_on_launch',
+            field=models.BooleanField(default=False),
+        ),
+    ],
+    '0030_v302_job_survey_passwords': [
+        # job survery passwords
+        migrations.AddField(
+            model_name='job',
+            name='survey_passwords',
+            field=jsonfield.fields.JSONField(default={}, editable=False, blank=True),
+        ),
+    ],
+    '0031_v302_migrate_survey_passwords': [
+        migrations.RunPython(migration_utils.set_current_apps_for_migrations),
+        migrations.RunPython(_save_password_keys.migrate_survey_passwords),
+    ],
+    '0032_v302_credential_permissions_update': [
+        # RBAC credential permission updates
+        migrations.AlterField(
+            model_name='credential',
+            name='admin_role',
+            field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_administrator', b'organization.admin_role'], to='main.Role', null=b'True'),
+        ),
+        migrations.AlterField(
+            model_name='credential',
+            name='use_role',
+            field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'admin_role'], to='main.Role', null=b'True'),
+        ),
+    ],
+    '0033_v303_v245_host_variable_fix': [
+        migrations.RunPython(migration_utils.set_current_apps_for_migrations),
+        migrations.RunPython(update_dashed_host_variables),
+    ],
+}
+
+
+__all__ = ['SQUASHED_30']

awx/main/migrations/_squashed_31.py

@@ -0,0 +1,50 @@
+from django.db import (
+    migrations,
+    models,
+)
+
+SQUASHED_31 = {
+    '0035_v310_remove_tower_settings': [
+        # Remove Tower settings, these settings are now in separate awx.conf app.
+        migrations.RemoveField(
+            model_name='towersettings',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='TowerSettings',
+        ),
+
+        migrations.AlterField(
+            model_name='project',
+            name='scm_type',
+            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
+        ),
+        migrations.AlterField(
+            model_name='projectupdate',
+            name='scm_type',
+            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
+        ),
+    ],
+    '0036_v311_insights': [
+        migrations.AlterField(
+            model_name='project',
+            name='scm_type',
+            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
+        ),
+        migrations.AlterField(
+            model_name='projectupdate',
+            name='scm_type',
+            field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'),
+        ),
+    ],
+    '0037_v313_instance_version': [
+        # Remove Tower settings, these settings are now in separate awx.conf app.
+        migrations.AddField(
+            model_name='instance',
+            name='version',
+            field=models.CharField(max_length=24, blank=True),
+        ),
+    ],
+}
+
+__all__ = ['SQUASHED_31']