Merge pull request #11947 from jbradberry/django-3.2-upgrade

Remove the out-of-band JSONField migration

awx/main/models/__init__.py

@@ -3,7 +3,6 @@
 
 # Django
 from django.conf import settings  # noqa
-from django.db import connection
 from django.db.models.signals import pre_delete  # noqa
 
 # AWX
@@ -98,93 +97,6 @@ User.add_to_class('can_access_with_errors', check_user_access_with_errors)
 User.add_to_class('accessible_objects', user_accessible_objects)
 
 
-def convert_jsonfields_to_jsonb():
-    if connection.vendor != 'postgresql':
-        return
-
-    # fmt: off
-    fields = [  # Table name, expensive or not, tuple of column names
-        ('conf_setting', False, (
-            'value',
-        )),
-        ('main_instancegroup', False, (
-            'policy_instance_list',
-        )),
-        ('main_jobtemplate', False, (
-            'survey_spec',
-        )),
-        ('main_notificationtemplate', False, (
-            'notification_configuration',
-            'messages',
-        )),
-        ('main_project', False, (
-            'playbook_files',
-            'inventory_files',
-        )),
-        ('main_schedule', False, (
-            'extra_data',
-            'char_prompts',
-            'survey_passwords',
-        )),
-        ('main_workflowjobtemplate', False, (
-            'survey_spec',
-            'char_prompts',
-        )),
-        ('main_workflowjobtemplatenode', False, (
-            'char_prompts',
-            'extra_data',
-            'survey_passwords',
-        )),
-        ('main_activitystream', True, (
-            'setting',  # NN = NOT NULL
-            'deleted_actor',
-        )),
-        ('main_job', True, (
-            'survey_passwords',  # NN
-            'artifacts',  # NN
-        )),
-        ('main_joblaunchconfig', True, (
-            'extra_data',  # NN
-            'survey_passwords',  # NN
-            'char_prompts',  # NN
-        )),
-        ('main_notification', True, (
-            'body',  # NN
-        )),
-        ('main_unifiedjob', True, (
-            'job_env',  # NN
-        )),
-        ('main_workflowjob', True, (
-            'survey_passwords',  # NN
-            'char_prompts',  # NN
-        )),
-        ('main_workflowjobnode', True, (
-            'char_prompts',  # NN
-            'ancestor_artifacts',  # NN
-            'extra_data',  # NN
-            'survey_passwords',  # NN
-        )),
-    ]
-    # fmt: on
-
-    with connection.cursor() as cursor:
-        for table, expensive, columns in fields:
-            cursor.execute(
-                """
-                select count(1) from information_schema.columns
-                where
-                  table_name = %s and
-                  column_name in %s and
-                  data_type != 'jsonb';
-                """,
-                (table, columns),
-            )
-            if cursor.fetchone()[0]:
-                from awx.main.tasks.system import migrate_json_fields
-
-                migrate_json_fields.apply_async([table, expensive, columns])
-
-
 def cleanup_created_modified_by(sender, **kwargs):
     # work around a bug in django-polymorphic that doesn't properly
     # handle cascades for reverse foreign keys on the polymorphic base model

awx/main/models/activity_stream.py

@@ -3,6 +3,7 @@
 
 # AWX
 from awx.api.versioning import reverse
+from awx.main.fields import JSONBlob
 from awx.main.models.base import accepts_json
 
 # Django
@@ -35,7 +36,7 @@ class ActivityStream(models.Model):
     operation = models.CharField(max_length=13, choices=OPERATION_CHOICES)
     timestamp = models.DateTimeField(auto_now_add=True)
     changes = accepts_json(models.TextField(blank=True))
-    deleted_actor = models.JSONField(null=True)
+    deleted_actor = JSONBlob(null=True)
     action_node = models.CharField(
         blank=True,
         default='',
@@ -83,7 +84,7 @@ class ActivityStream(models.Model):
     o_auth2_application = models.ManyToManyField("OAuth2Application", blank=True)
     o_auth2_access_token = models.ManyToManyField("OAuth2AccessToken", blank=True)
 
-    setting = models.JSONField(default=dict, null=True, blank=True)
+    setting = JSONBlob(default=dict, blank=True)
 
     def __str__(self):
         operation = self.operation if 'operation' in self.__dict__ else '_delayed_'

awx/main/models/ha.py

@@ -19,6 +19,7 @@ from solo.models import SingletonModel
 
 from awx import __version__ as awx_application_version
 from awx.api.versioning import reverse
+from awx.main.fields import JSONBlob
 from awx.main.managers import InstanceManager, InstanceGroupManager, UUID_DEFAULT
 from awx.main.constants import JOB_FOLDER_PREFIX
 from awx.main.models.base import BaseModel, HasEditsMixin, prevent_search
@@ -328,7 +329,7 @@ class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin):
     )
     policy_instance_percentage = models.IntegerField(default=0, help_text=_("Percentage of Instances to automatically assign to this group"))
     policy_instance_minimum = models.IntegerField(default=0, help_text=_("Static minimum number of Instances to automatically assign to this group"))
-    policy_instance_list = models.JSONField(
+    policy_instance_list = JSONBlob(
         default=list, blank=True, help_text=_("List of exact-match Instances that will always be automatically assigned to this group")
     )
 

awx/main/models/jobs.py

@@ -44,7 +44,7 @@ from awx.main.models.notifications import (
     JobNotificationMixin,
 )
 from awx.main.utils import parse_yaml_or_json, getattr_dne, NullablePromptPseudoField
-from awx.main.fields import ImplicitRoleField, AskForField
+from awx.main.fields import ImplicitRoleField, AskForField, JSONBlob
 from awx.main.models.mixins import (
     ResourceMixin,
     SurveyJobTemplateMixin,
@@ -547,9 +547,8 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
         editable=False,
         through='JobHostSummary',
     )
-    artifacts = models.JSONField(
+    artifacts = JSONBlob(
         default=dict,
-        null=True,
         blank=True,
         editable=False,
     )
@@ -887,7 +886,7 @@ class LaunchTimeConfigBase(BaseModel):
     )
     # All standard fields are stored in this dictionary field
     # This is a solution to the nullable CharField problem, specific to prompting
-    char_prompts = models.JSONField(default=dict, null=True, blank=True)
+    char_prompts = JSONBlob(default=dict, blank=True)
 
     def prompts_dict(self, display=False):
         data = {}
@@ -940,12 +939,11 @@ class LaunchTimeConfig(LaunchTimeConfigBase):
         abstract = True
 
     # Special case prompting fields, even more special than the other ones
-    extra_data = models.JSONField(default=dict, null=True, blank=True)
+    extra_data = JSONBlob(default=dict, blank=True)
     survey_passwords = prevent_search(
-        models.JSONField(
+        JSONBlob(
             default=dict,
             editable=False,
-            null=True,
             blank=True,
         )
     )

awx/main/models/mixins.py

@@ -24,7 +24,7 @@ from awx.main.utils import parse_yaml_or_json, get_custom_venv_choices, get_lice
 from awx.main.utils.execution_environments import get_default_execution_environment
 from awx.main.utils.encryption import decrypt_value, get_encryption_key, is_encrypted
 from awx.main.utils.polymorphic import build_polymorphic_ctypes_map
-from awx.main.fields import AskForField
+from awx.main.fields import AskForField, JSONBlob
 from awx.main.constants import ACTIVE_STATES
 
 
@@ -103,7 +103,7 @@ class SurveyJobTemplateMixin(models.Model):
     survey_enabled = models.BooleanField(
         default=False,
     )
-    survey_spec = prevent_search(models.JSONField(default=dict, blank=True))
+    survey_spec = prevent_search(JSONBlob(default=dict, blank=True))
     ask_variables_on_launch = AskForField(blank=True, default=False, allows_field='extra_vars')
 
     def survey_password_variables(self):
@@ -365,10 +365,9 @@ class SurveyJobMixin(models.Model):
         abstract = True
 
     survey_passwords = prevent_search(
-        models.JSONField(
+        JSONBlob(
             default=dict,
             editable=False,
-            null=True,
             blank=True,
         )
     )

awx/main/models/notifications.py

@@ -17,6 +17,7 @@ from jinja2.exceptions import TemplateSyntaxError, UndefinedError, SecurityError
 
 # AWX
 from awx.api.versioning import reverse
+from awx.main.fields import JSONBlob
 from awx.main.models.base import CommonModelNameNotUnique, CreatedModifiedModel, prevent_search
 from awx.main.utils import encrypt_field, decrypt_field, set_environ
 from awx.main.notifications.email_backend import CustomEmailBackend
@@ -69,12 +70,12 @@ class NotificationTemplate(CommonModelNameNotUnique):
         choices=NOTIFICATION_TYPE_CHOICES,
     )
 
-    notification_configuration = prevent_search(models.JSONField(default=dict))
+    notification_configuration = prevent_search(JSONBlob(default=dict))
 
     def default_messages():
         return {'started': None, 'success': None, 'error': None, 'workflow_approval': None}
 
-    messages = models.JSONField(null=True, blank=True, default=default_messages, help_text=_('Optional custom messages for notification template.'))
+    messages = JSONBlob(null=True, blank=True, default=default_messages, help_text=_('Optional custom messages for notification template.'))
 
     def has_message(self, condition):
         potential_template = self.messages.get(condition, {})
@@ -236,7 +237,7 @@ class Notification(CreatedModifiedModel):
         default='',
         editable=False,
     )
-    body = models.JSONField(default=dict, null=True, blank=True)
+    body = JSONBlob(default=dict, blank=True)
 
     def get_absolute_url(self, request=None):
         return reverse('api:notification_detail', kwargs={'pk': self.pk}, request=request)

awx/main/models/projects.py

@@ -33,7 +33,7 @@ from awx.main.models.mixins import ResourceMixin, TaskManagerProjectUpdateMixin,
 from awx.main.utils import update_scm_url, polymorphic
 from awx.main.utils.ansible import skip_directory, could_be_inventory, could_be_playbook
 from awx.main.utils.execution_environments import get_control_plane_execution_environment
-from awx.main.fields import ImplicitRoleField
+from awx.main.fields import ImplicitRoleField, JSONBlob
 from awx.main.models.rbac import (
     ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
     ROLE_SINGLETON_SYSTEM_AUDITOR,
@@ -293,7 +293,7 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
         help_text=_('The last revision fetched by a project update'),
     )
 
-    playbook_files = models.JSONField(
+    playbook_files = JSONBlob(
         default=list,
         blank=True,
         editable=False,
@@ -301,7 +301,7 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
         help_text=_('List of playbooks found in the project'),
     )
 
-    inventory_files = models.JSONField(
+    inventory_files = JSONBlob(
         default=list,
         blank=True,
         editable=False,

awx/main/models/unified_jobs.py

@@ -54,7 +54,7 @@ from awx.main.utils import polymorphic
 from awx.main.constants import ACTIVE_STATES, CAN_CANCEL, JOB_VARIABLE_PREFIXES
 from awx.main.redact import UriCleaner, REPLACE_STR
 from awx.main.consumers import emit_channel_notification
-from awx.main.fields import AskForField, OrderedManyToManyField
+from awx.main.fields import AskForField, OrderedManyToManyField, JSONBlob
 
 __all__ = ['UnifiedJobTemplate', 'UnifiedJob', 'StdoutMaxBytesExceeded']
 
@@ -653,9 +653,8 @@ class UnifiedJob(
         editable=False,
     )
     job_env = prevent_search(
-        models.JSONField(
+        JSONBlob(
             default=dict,
-            null=True,
             blank=True,
             editable=False,
         )

awx/main/models/workflow.py

@@ -28,7 +28,7 @@ from awx.main.models import prevent_search, accepts_json, UnifiedJobTemplate, Un
 from awx.main.models.notifications import NotificationTemplate, JobNotificationMixin
 from awx.main.models.base import CreatedModifiedModel, VarsDictProperty
 from awx.main.models.rbac import ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, ROLE_SINGLETON_SYSTEM_AUDITOR
-from awx.main.fields import ImplicitRoleField, AskForField
+from awx.main.fields import ImplicitRoleField, AskForField, JSONBlob
 from awx.main.models.mixins import (
     ResourceMixin,
     SurveyJobTemplateMixin,
@@ -231,9 +231,8 @@ class WorkflowJobNode(WorkflowNodeBase):
         default=None,
         on_delete=models.CASCADE,
     )
-    ancestor_artifacts = models.JSONField(
+    ancestor_artifacts = JSONBlob(
         default=dict,
-        null=True,
         blank=True,
         editable=False,
     )