nautobot 2.4.0b1__py3-none-any.whl → 2.4.1__py3-none-any.whl

nautobot/extras/api/views.py

@@ -17,6 +17,7 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from nautobot.core.api.authentication import TokenPermissions
+from nautobot.core.api.parsers import NautobotCSVParser
 from nautobot.core.api.utils import get_serializer_for_model
 from nautobot.core.api.views import (
     BulkDestroyModelMixin,
@@ -180,14 +181,7 @@ class ConfigContextQuerySetMixin:
 
 
 class ConfigContextViewSet(NotesViewSetMixin, ModelViewSet):
-    queryset = ConfigContext.objects.prefetch_related(
-        "locations",
-        "roles",
-        "device_types",
-        "platforms",
-        "tenant_groups",
-        "tenants",
-    )
+    queryset = ConfigContext.objects.all()
     serializer_class = serializers.ConfigContextSerializer
     filterset_class = filters.ConfigContextFilterSet
 
@@ -304,7 +298,7 @@ class DynamicGroupViewSet(NotesViewSetMixin, ModelViewSet):
     Manage Dynamic Groups through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = DynamicGroup.objects.select_related("content_type")
+    queryset = DynamicGroup.objects.all()
     serializer_class = serializers.DynamicGroupSerializer
     filterset_class = filters.DynamicGroupFilterSet
 
@@ -329,7 +323,7 @@ class DynamicGroupMembershipViewSet(ModelViewSet):
     Manage Dynamic Group Memberships through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = DynamicGroupMembership.objects.select_related("group", "parent_group")
+    queryset = DynamicGroupMembership.objects.all()
     serializer_class = serializers.DynamicGroupMembershipSerializer
     filterset_class = filters.DynamicGroupMembershipFilterSet
 
@@ -340,13 +334,13 @@ class DynamicGroupMembershipViewSet(ModelViewSet):
 
 
 class SavedViewViewSet(ModelViewSet):
-    queryset = SavedView.objects.select_related("owner")
+    queryset = SavedView.objects.all()
     serializer_class = serializers.SavedViewSerializer
     filterset_class = filters.SavedViewFilterSet
 
 
 class UserSavedViewAssociationViewSet(ModelViewSet):
-    queryset = UserSavedViewAssociation.objects.select_related("user", "saved_view")
+    queryset = UserSavedViewAssociation.objects.all()
     serializer_class = serializers.UserSavedViewAssociationSerializer
     filterset_class = filters.UserSavedViewAssociationFilterSet
 
@@ -356,7 +350,7 @@ class StaticGroupAssociationViewSet(NautobotModelViewSet):
     Manage Static Group Associations through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = StaticGroupAssociation.objects.select_related("associated_object_type", "dynamic_group")
+    queryset = StaticGroupAssociation.objects.all()
     serializer_class = serializers.StaticGroupAssociationSerializer
     filterset_class = filters.StaticGroupAssociationFilterSet
 
@@ -367,7 +361,7 @@ class StaticGroupAssociationViewSet(NautobotModelViewSet):
             and "dynamic_group" in self.request.GET
             and self.action in ["list", "retrieve"]
         ):
-            self.queryset = StaticGroupAssociation.all_objects.select_related("associated_object_type", "dynamic_group")
+            self.queryset = StaticGroupAssociation.all_objects.all()
         return super().get_queryset()
 
 
@@ -388,7 +382,7 @@ class ExportTemplateViewSet(NotesViewSetMixin, ModelViewSet):
 
 
 class ExternalIntegrationViewSet(NautobotModelViewSet):
-    queryset = ExternalIntegration.objects.select_related("secrets_group")
+    queryset = ExternalIntegration.objects.all()
     serializer_class = serializers.ExternalIntegrationSerializer
     filterset_class = filters.ExternalIntegrationFilterSet
 
@@ -399,7 +393,7 @@ class ExternalIntegrationViewSet(NautobotModelViewSet):
 
 
 class FileProxyViewSet(ReadOnlyModelViewSet):
-    queryset = FileProxy.objects.select_related("job_result")
+    queryset = FileProxy.objects.all()
     serializer_class = serializers.FileProxySerializer
     filterset_class = filters.FileProxyFilterSet
 
@@ -488,6 +482,7 @@ class ImageAttachmentViewSet(ModelViewSet):
     queryset = ImageAttachment.objects.all()
     serializer_class = serializers.ImageAttachmentSerializer
     filterset_class = filters.ImageAttachmentFilterSet
+    parser_classes = [JSONParser, NautobotCSVParser, MultiPartParser]
 
 
 #
@@ -766,13 +761,13 @@ class JobViewSet(
 ):
     lookup_value_regex = r"[-0-9a-fA-F]+"
 
-    def perform_destroy(self, obj):
-        if obj.module_name.startswith("nautobot."):
+    def perform_destroy(self, instance):
+        if instance.module_name.startswith("nautobot."):
             raise ProtectedError(
-                f"Unable to delete Job {obj}. System Job cannot be deleted",
+                f"Unable to delete Job {instance}. System Job cannot be deleted",
                 [],
             )
-        super().perform_destroy(obj)
+        super().perform_destroy(instance)
 
 
 @extend_schema_view(
@@ -838,7 +833,7 @@ class JobQueueAssignmentViewSet(NautobotModelViewSet):
     Manage job queue assignments through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = JobQueueAssignment.objects.select_related("job", "job_queue")
+    queryset = JobQueueAssignment.objects.all()
     serializer_class = serializers.JobQueueAssignmentSerializer
     filterset_class = filters.JobQueueAssignmentFilterSet
 
@@ -853,7 +848,7 @@ class JobLogEntryViewSet(ReadOnlyModelViewSet):
     Retrieve a list of job log entries.
     """
 
-    queryset = JobLogEntry.objects.select_related("job_result")
+    queryset = JobLogEntry.objects.all()
     serializer_class = serializers.JobLogEntrySerializer
     filterset_class = filters.JobLogEntryFilterSet
 
@@ -871,7 +866,7 @@ class JobResultViewSet(
     Retrieve a list of job results
     """
 
-    queryset = JobResult.objects.select_related("job_model", "user")
+    queryset = JobResult.objects.all()
     serializer_class = serializers.JobResultSerializer
     filterset_class = filters.JobResultFilterSet
 
@@ -908,7 +903,7 @@ class ScheduledJobViewSet(ReadOnlyModelViewSet):
     Retrieve a list of scheduled jobs
     """
 
-    queryset = ScheduledJob.objects.select_related("user")
+    queryset = ScheduledJob.objects.all()
     serializer_class = serializers.ScheduledJobSerializer
     filterset_class = filters.ScheduledJobFilterSet
 
@@ -1061,7 +1056,7 @@ class MetadataTypeViewSet(NautobotModelViewSet):
 
 
 class MetadataChoiceViewSet(ModelViewSet):
-    queryset = MetadataChoice.objects.select_related("metadata_type")
+    queryset = MetadataChoice.objects.all()
     serializer_class = serializers.MetadataChoiceSerializer
     filterset_class = filters.MetadataChoiceFilterSet
 
@@ -1078,7 +1073,7 @@ class ObjectMetadataViewSet(NautobotModelViewSet):
 
 
 class NoteViewSet(ModelViewSet):
-    queryset = Note.objects.select_related("user")
+    queryset = Note.objects.all()
     serializer_class = serializers.NoteSerializer
     filterset_class = filters.NoteFilterSet
 
@@ -1097,7 +1092,7 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet):
     Retrieve a list of recent changes.
     """
 
-    queryset = ObjectChange.objects.select_related("user")
+    queryset = ObjectChange.objects.all()
     serializer_class = serializers.ObjectChangeSerializer
     filterset_class = filters.ObjectChangeFilterSet
 

nautobot/extras/constants.py

@@ -30,6 +30,7 @@ JOB_OVERRIDABLE_FIELDS = (
     "soft_time_limit",
     "time_limit",
     "has_sensitive_variables",
+    "is_singleton",
 )
 
 
@@ -52,4 +53,5 @@ JOB_RESULT_CUSTOM_CELERY_KWARGS = (
     "nautobot_job_job_model_id",
     "nautobot_job_scheduled_job_id",
     "nautobot_job_user_id",
+    "nautobot_job_ignore_singleton_lock",
 )

nautobot/extras/filters/__init__.py

@@ -119,13 +119,13 @@ __all__ = (
     "CustomFieldDateFilter",
     "CustomFieldFilterMixin",
     "CustomFieldJSONFilter",
+    "CustomFieldModelFilterSet",
+    "CustomFieldModelFilterSetMixin",
     "CustomFieldMultiSelectFilter",
     "CustomFieldMultiValueCharFilter",
     "CustomFieldMultiValueDateFilter",
     "CustomFieldMultiValueNumberFilter",
     "CustomFieldNumberFilter",
-    "CustomFieldModelFilterSet",
-    "CustomFieldModelFilterSetMixin",
     "CustomLinkFilterSet",
     "DynamicGroupFilterSet",
     "DynamicGroupMembershipFilterSet",
@@ -136,25 +136,25 @@ __all__ = (
     "ImageAttachmentFilterSet",
     "JobFilterSet",
     "JobLogEntryFilterSet",
-    "JobQueueFilterSet",
     "JobQueueAssignmentFilterSet",
+    "JobQueueFilterSet",
     "JobResultFilterSet",
     "LocalContextFilterSet",
     "LocalContextModelFilterSetMixin",
-    "MetadataTypeFilterSet",
     "MetadataChoiceFilterSet",
+    "MetadataTypeFilterSet",
     "NautobotFilterSet",
     "NoteFilterSet",
     "ObjectChangeFilterSet",
+    "RelationshipAssociationFilterSet",
     "RelationshipFilter",
     "RelationshipFilterSet",
-    "RelationshipAssociationFilterSet",
     "RoleFilterSet",
     "RoleModelFilterSetMixin",
     "ScheduledJobFilterSet",
     "SecretFilterSet",
-    "SecretsGroupFilterSet",
     "SecretsGroupAssociationFilterSet",
+    "SecretsGroupFilterSet",
     "StatusFilter",
     "StatusFilterSet",
     "StatusModelFilterSetMixin",
@@ -874,6 +874,7 @@ class JobFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
             "is_job_button_receiver",
             "soft_time_limit",
             "time_limit",
+            "is_singleton",
             "grouping_override",
             "name_override",
             "approval_required_override",
@@ -883,6 +884,7 @@ class JobFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
             "soft_time_limit_override",
             "time_limit_override",
             "has_sensitive_variables_override",
+            "is_singleton_override",
             "tags",
         ]
 

nautobot/extras/forms/base.py

@@ -14,9 +14,9 @@ from .mixins import (
 )
 
 __all__ = (
-    "NautobotModelForm",
-    "NautobotFilterForm",
     "NautobotBulkEditForm",
+    "NautobotFilterForm",
+    "NautobotModelForm",
 )
 
 

nautobot/extras/forms/forms.py

@@ -1,5 +1,7 @@
 import inspect
+import logging
 
+from celery import chain
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -7,7 +9,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db.models.fields import TextField
-from django.forms import inlineformset_factory, ModelMultipleChoiceField
+from django.forms import inlineformset_factory, ModelMultipleChoiceField, MultipleHiddenInput
 from django.urls.base import reverse
 from django.utils.timezone import get_current_timezone_name
 
@@ -35,6 +37,7 @@ from nautobot.core.forms import (
     TagFilterField,
 )
 from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
+from nautobot.core.forms.forms import ConfirmationForm
 from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.dcim.models import Device, DeviceRedundancyGroup, DeviceType, Location, Platform
 from nautobot.extras.choices import (
@@ -88,9 +91,12 @@ from nautobot.extras.models import (
     Webhook,
 )
 from nautobot.extras.registry import registry
+from nautobot.extras.signals import change_context_state
+from nautobot.extras.tasks import delete_custom_field_data
 from nautobot.extras.utils import (
     ChangeLoggedModelsQuery,
     FeatureQuery,
+    get_worker_count,
     RoleModelsQuery,
     TaggableClassesQuery,
 )
@@ -111,87 +117,90 @@ from .mixins import (
     TagsBulkEditFormMixin,
 )
 
+logger = logging.getLogger(__name__)
+
 __all__ = (
     "BaseDynamicGroupMembershipFormSet",
-    "ComputedFieldForm",
     "ComputedFieldFilterForm",
-    "ConfigContextForm",
+    "ComputedFieldForm",
     "ConfigContextBulkEditForm",
     "ConfigContextFilterForm",
-    "ConfigContextSchemaForm",
+    "ConfigContextForm",
     "ConfigContextSchemaBulkEditForm",
     "ConfigContextSchemaFilterForm",
-    "CustomFieldForm",
-    "CustomFieldFilterForm",
-    "CustomFieldModelCSVForm",
+    "ConfigContextSchemaForm",
     "CustomFieldBulkCreateForm",  # 2.0 TODO remove this deprecated class
+    "CustomFieldBulkDeleteForm",
     "CustomFieldChoiceFormSet",
-    "CustomLinkForm",
+    "CustomFieldFilterForm",
+    "CustomFieldForm",
+    "CustomFieldModelCSVForm",
     "CustomLinkFilterForm",
+    "CustomLinkForm",
     "DynamicGroupBulkAssignForm",
-    "DynamicGroupForm",
     "DynamicGroupFilterForm",
+    "DynamicGroupForm",
     "DynamicGroupMembershipFormSet",
-    "ExportTemplateForm",
     "ExportTemplateFilterForm",
+    "ExportTemplateForm",
+    "ExternalIntegrationBulkEditForm",
     "ExternalIntegrationFilterForm",
     "ExternalIntegrationForm",
-    "ExternalIntegrationBulkEditForm",
-    "GitRepositoryForm",
     "GitRepositoryBulkEditForm",
     "GitRepositoryFilterForm",
-    "GraphQLQueryForm",
+    "GitRepositoryForm",
     "GraphQLQueryFilterForm",
+    "GraphQLQueryForm",
     "ImageAttachmentForm",
-    "JobForm",
     "JobBulkEditForm",
-    "JobButtonForm",
     "JobButtonBulkEditForm",
     "JobButtonFilterForm",
+    "JobButtonForm",
     "JobEditForm",
     "JobFilterForm",
-    "JobHookForm",
+    "JobForm",
     "JobHookFilterForm",
+    "JobHookForm",
     "JobQueueBulkEditForm",
     "JobQueueFilterForm",
     "JobQueueForm",
-    "JobScheduleForm",
     "JobResultFilterForm",
+    "JobScheduleForm",
     "LocalContextFilterForm",
-    "LocalContextModelForm",
     "LocalContextModelBulkEditForm",
+    "LocalContextModelForm",
+    "MetadataChoiceFormSet",
     "MetadataTypeBulkEditForm",
-    "MetadataTypeForm",
     "MetadataTypeFilterForm",
-    "MetadataChoiceFormSet",
-    "NoteForm",
+    "MetadataTypeForm",
     "NoteFilterForm",
+    "NoteForm",
     "ObjectChangeFilterForm",
     "ObjectMetadataFilterForm",
     "PasswordInputWithPlaceholder",
-    "RelationshipForm",
-    "RelationshipFilterForm",
     "RelationshipAssociationFilterForm",
+    "RelationshipFilterForm",
+    "RelationshipForm",
     "RoleBulkEditForm",
     "RoleFilterForm",
     "RoleForm",
     "SavedViewForm",
     "SavedViewModalForm",
     "ScheduledJobFilterForm",
-    "SecretForm",
     "SecretFilterForm",
-    "SecretsGroupForm",
-    "SecretsGroupFilterForm",
+    "SecretForm",
     "SecretsGroupAssociationFormSet",
+    "SecretsGroupFilterForm",
+    "SecretsGroupForm",
     "StaticGroupAssociationFilterForm",
-    "StatusForm",
-    "StatusFilterForm",
     "StatusBulkEditForm",
-    "TagForm",
-    "TagFilterForm",
+    "StatusFilterForm",
+    "StatusForm",
     "TagBulkEditForm",
-    "WebhookForm",
+    "TagFilterForm",
+    "TagForm",
     "WebhookFilterForm",
+    "WebhookForm",
 )
 
 
@@ -491,6 +500,44 @@ class CustomFieldBulkCreateForm(CustomFieldModelBulkEditFormMixin):
     """No longer needed as a separate class - use CustomFieldModelBulkEditFormMixin instead."""
 
 
+class CustomFieldBulkDeleteForm(ConfirmationForm):
+    def __init__(self, *args, delete_all=False, **kwargs):
+        super().__init__(*args, **kwargs)
+        queryset = CustomField.objects.all()
+        self.fields["pk"] = ModelMultipleChoiceField(
+            queryset=queryset, widget=MultipleHiddenInput, required=not delete_all
+        )
+
+    def construct_custom_field_delete_tasks(self, queryset):
+        """
+        Helper method to construct a list of celery tasks to execute when bulk deleting custom fields.
+        """
+        change_context = change_context_state.get()
+        if change_context is None:
+            context = None
+        else:
+            context = change_context.as_dict(queryset)
+            context["context_detail"] = "bulk delete custom field data"
+        tasks = [
+            delete_custom_field_data.si(obj.key, set(obj.content_types.values_list("pk", flat=True)), context)
+            for obj in queryset
+        ]
+        return tasks
+
+    def perform_pre_delete(self, queryset):
+        """
+        Remove all Custom Field Keys/Values from _custom_field_data of the related ContentType in the background.
+        """
+        if not get_worker_count():
+            logger.error("Celery worker process not running. Object custom fields may fail to reflect this deletion.")
+            return
+        tasks = self.construct_custom_field_delete_tasks(queryset)
+        # Executing the tasks in the background sequentially using chain() aligns with how a single
+        # CustomField object is deleted.  We decided to not check the result because it needs at least one worker
+        # to be active and comes with extra performance penalty.
+        chain(*tasks).apply_async()
+
+
 #
 # Custom Links
 #
@@ -990,6 +1037,8 @@ class JobEditForm(NautobotModelForm):
             "job_queues",
             "default_job_queue_override",
             "default_job_queue",
+            "is_singleton",
+            "is_singleton_override",
             "tags",
         ]
 
@@ -1089,6 +1138,11 @@ class JobBulkEditForm(NautobotBulkEditForm):
         required=False,
         help_text="Default Job Queue the job runs on if no Job Queue is specified",
     )
+    is_singleton = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect,
+        help_text="Whether this job should fail to run if another instance of this job is already running",
+    )
     # Flags to indicate whether the above properties are inherited from the source code or overridden by the database
     # Text field overrides
     clear_grouping_override = forms.BooleanField(
@@ -1132,10 +1186,62 @@ class JobBulkEditForm(NautobotBulkEditForm):
         required=False,
         help_text="If checked, the values of has sensitive variables will be reverted to the default values defined in each Job's source code",
     )
+    is_singleton_override = forms.BooleanField(
+        required=False,
+        help_text="If checked, the values of is singleton will be reverted to the default values defined in each Job's source code",
+    )
 
     class Meta:
         model = Job
 
+    def post_save(self, obj):
+        super().post_save(obj)
+
+        cleaned_data = self.cleaned_data
+
+        # Handle text related fields
+        for overridable_field in JOB_OVERRIDABLE_FIELDS:
+            override_field = overridable_field + "_override"
+            clear_override_field = "clear_" + overridable_field + "_override"
+            reset_override = cleaned_data.get(clear_override_field, False)
+            override_value = cleaned_data.get(overridable_field)
+            if reset_override:
+                setattr(obj, override_field, False)
+            elif not reset_override and override_value not in [None, ""]:
+                setattr(obj, override_field, True)
+                setattr(obj, overridable_field, override_value)
+
+        # Handle job queues
+        clear_override_field = "clear_job_queues_override"
+        reset_override = cleaned_data.get(clear_override_field, False)
+        if reset_override:
+            meta_task_queues = obj.job_class.task_queues
+            job_queues = []
+            for queue_name in meta_task_queues:
+                try:
+                    job_queues.append(JobQueue.objects.get(name=queue_name))
+                except JobQueue.DoesNotExist:
+                    # Do we want to create the Job Queue for the users here if we do not have it in the database?
+                    pass
+            obj.job_queues_override = False
+            obj.job_queues.set(job_queues)
+        elif cleaned_data["job_queues"]:
+            obj.job_queues_override = True
+
+        # Handle default job queue
+        clear_override_field = "clear_default_job_queue_override"
+        reset_override = cleaned_data.get(clear_override_field, False)
+        if reset_override:
+            meta_task_queues = obj.job_class.task_queues
+            obj.default_job_queue_override = False
+            obj.default_job_queue, _ = JobQueue.objects.get_or_create(
+                name=meta_task_queues[0] if meta_task_queues else settings.CELERY_TASK_DEFAULT_QUEUE
+            )
+        elif cleaned_data["default_job_queue"]:
+            obj.default_job_queue_override = True
+
+        obj.validated_save()
+
 
 class JobFilterForm(BootstrapMixin, forms.Form):
     model = Job
@@ -1779,6 +1885,8 @@ class RoleBulkEditForm(NautobotBulkEditForm):
 
     pk = forms.ModelMultipleChoiceField(queryset=Role.objects.all(), widget=forms.MultipleHiddenInput)
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    weight = forms.IntegerField(required=False)
     content_types = MultipleContentTypeField(
         queryset=RoleModelsQuery().as_queryset(), required=False, label="Content Type(s)"
     )

nautobot/extras/forms/mixins.py

@@ -34,7 +34,7 @@ from nautobot.extras.utils import remove_prefix_from_cf_key
 logger = logging.getLogger(__name__)
 
 
-__all__ = (
+__all__ = (  # noqa:RUF022
     "ContactTeamModelFilterFormMixin",
     "CustomFieldModelBulkEditFormMixin",
     "CustomFieldModelFilterFormMixin",
@@ -327,7 +327,7 @@ class RelationshipModelBulkEditFormMixin(BulkEditForm):
                     field_name,
                     instance,
                 )
-                if field_name in self.nullable_fields and field_name in nullified_fields:
+                if field_name in self.nullable_fields and nullified_fields and field_name in nullified_fields:
                     logger.debug("Deleting existing relationship associations for %s on %s", relationship, instance)
                     relationshipassociation_queryset.delete()
                 elif field_name in self.cleaned_data:
@@ -673,7 +673,7 @@ class RelationshipModelFormMixin(forms.ModelForm):
             for peer_id in target_peer_ids:
                 relationship = self.fields[field_name].model
                 if not relationship.symmetric:
-                    association = RelationshipAssociation(
+                    association = RelationshipAssociation(  # pylint: disable=repeated-keyword
                         relationship=relationship,
                         **{
                             f"{side}_type": self.obj_type,
@@ -837,13 +837,21 @@ class StatusModelFilterFormMixin(forms.Form):
         self.order_fields(self.field_order)  # Reorder fields again
 
 
-class TagsBulkEditFormMixin(forms.Form):
+class TagsBulkEditFormMixin(BulkEditForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         # Add add/remove tags fields
-        self.fields["add_tags"] = DynamicModelMultipleChoiceField(queryset=Tag.objects.all(), required=False)
-        self.fields["remove_tags"] = DynamicModelMultipleChoiceField(queryset=Tag.objects.all(), required=False)
+        self.fields["add_tags"] = DynamicModelMultipleChoiceField(
+            queryset=Tag.objects.all(),
+            query_params={"content_types": self.model._meta.label_lower},
+            required=False,
+        )
+        self.fields["remove_tags"] = DynamicModelMultipleChoiceField(
+            queryset=Tag.objects.all(),
+            query_params={"content_types": self.model._meta.label_lower},
+            required=False,
+        )
 
 
 # 2.2 TODO: Names below are only for backward compatibility with Nautobot 1.3 and earlier. Remove in 2.2

nautobot/extras/group_sync.py

@@ -8,15 +8,15 @@ from django.contrib.auth.models import Group
 logger = logging.getLogger(__name__)
 
 
-CLAIMS_GROUP_NAME = getattr(settings, "NAUTOBOT_SSO_CLAIMS_GROUP", "groups")
+CLAIMS_GROUP_NAME = getattr(settings, "SSO_CLAIMS_GROUP", "groups")
 """ Which claim to look at in the OAuth2/OIDC response
 
     For Okta you can look at `Okta -> Authorization Servers -> Claims`. And a reasonable
     default is "groups". For Azure a reasonable default is "roles".
 """
 
-SUPERUSER_GROUPS = getattr(settings, "NAUTOBOT_SSO_SUPERUSER_GROUPS", [])
-STAFF_GROUPS = getattr(settings, "NAUTOBOT_SSO_STAFF_GROUPS", [])
+SUPERUSER_GROUPS = getattr(settings, "SSO_SUPERUSER_GROUPS", [])
+STAFF_GROUPS = getattr(settings, "SSO_STAFF_GROUPS", [])
 
 
 def group_sync(uid, user=None, response=None, *args, **kwargs):

nautobot/extras/health_checks.py

@@ -160,5 +160,4 @@ class RedisBackend(RedisHealthCheck):
         elif client_class == "django_redis.client.DefaultClient":
             self.check_redis(redis_url=location, **options.get("CONNECTION_POOL_KWARGS", {}))
         else:
-            if self.redis_url is None:
-                self.add_error(ServiceUnavailable(f"{client_class} is an unsupported CLIENT_CLASS!"))
+            self.add_error(ServiceUnavailable(f"{client_class} is an unsupported CLIENT_CLASS!"))