From 26a5b52e9d19c8f921a3163822cfaeab41a9188e Mon Sep 17 00:00:00 2001
From: Gerrod Ubben <gerrodubben@gmail.com>
Date: Wed, 29 May 2024 16:09:31 -0400
Subject: [PATCH] Remove deprecated reserved_resources_record filter

fixes: #5415
---
 CHANGES/5415.removal                    |  1 +
 pulpcore/app/viewsets/custom_filters.py | 38 +------------------------
 pulpcore/app/viewsets/task.py           |  7 -----
 3 files changed, 2 insertions(+), 44 deletions(-)
 create mode 100644 CHANGES/5415.removal

diff --git a/CHANGES/5415.removal b/CHANGES/5415.removal
new file mode 100644
index 0000000000..6a4c626b2e
--- /dev/null
+++ b/CHANGES/5415.removal
@@ -0,0 +1 @@
+Removed task's ``reserved_resources_record`` filter. Please use ``reserved_resources`` instead.
diff --git a/pulpcore/app/viewsets/custom_filters.py b/pulpcore/app/viewsets/custom_filters.py
index 87a2fe16dd..d6482460d8 100644
--- a/pulpcore/app/viewsets/custom_filters.py
+++ b/pulpcore/app/viewsets/custom_filters.py
@@ -7,9 +7,8 @@
 from collections import defaultdict
 from itertools import chain
 from gettext import gettext as _
-from urllib.parse import urlparse
 
-from django.urls import Resolver404, resolve
+from django.urls import resolve
 from django.db.models import ObjectDoesNotExist
 from django_filters import BaseInFilter, CharFilter, Filter
 from rest_framework import serializers
@@ -17,7 +16,6 @@
 
 from pulpcore.app.models import ContentArtifact, RepositoryVersion, Publication
 from pulpcore.app.viewsets import NamedModelViewSet
-from pulpcore.app.loggers import deprecation_logger
 
 
 class ReservedResourcesFilter(Filter):
@@ -68,40 +66,6 @@ class ReservedResourcesInFilter(BaseInFilter, ReservedResourcesFilter):
     """
 
 
-class ReservedResourcesRecordFilter(Filter):
-    """
-    Enables a user to filter tasks by a reserved resource href.
-
-    Warning: This filter is badly documented and not fully functional, but we need to keep it for
-    compatibility reasons. Use ``ReservedResourcesFilter`` instead.
-    """
-
-    def filter(self, qs, value):
-        """
-        Args:
-            qs (django.db.models.query.QuerySet): The Queryset to filter
-            value (string): href containing a reference to a reserved resource
-
-        Returns:
-            django.db.models.query.QuerySet: Queryset filtered by the reserved resource
-        """
-
-        if value is None:
-            # a value was not supplied by a user
-            return qs
-
-        deprecation_logger.warning(
-            "This filter is deprecated. Please use reserved_resources(__in) instead."
-        )
-
-        try:
-            resolve(urlparse(value).path)
-        except Resolver404:
-            raise serializers.ValidationError(detail=_("URI not valid: {u}").format(u=value))
-
-        return qs.filter(reserved_resources_record__contains=[value])
-
-
 class CreatedResourcesFilter(Filter):
     """
     Filter used to get tasks by created resources.
diff --git a/pulpcore/app/viewsets/task.py b/pulpcore/app/viewsets/task.py
index 441f2fe306..8ef81f4bb5 100644
--- a/pulpcore/app/viewsets/task.py
+++ b/pulpcore/app/viewsets/task.py
@@ -36,7 +36,6 @@
 from pulpcore.app.viewsets.custom_filters import (
     ReservedResourcesFilter,
     ReservedResourcesInFilter,
-    ReservedResourcesRecordFilter,
     CreatedResourcesFilter,
 )
 from pulpcore.constants import TASK_INCOMPLETE_STATES, TASK_STATES
@@ -44,11 +43,6 @@
 
 
 class TaskFilter(BaseFilterSet):
-    # This filter is deprecated and badly documented, but we need to keep it for compatibility
-    # reasons
-    reserved_resources_record = ReservedResourcesRecordFilter(
-        help_text=_("Deprecated, will be removed in pulpcore 3.55. Use reserved_resources instead.")
-    )
     created_resources = CreatedResourcesFilter()
     # Non model field filters
     reserved_resources = ReservedResourcesFilter(exclusive=True, shared=True)
@@ -70,7 +64,6 @@ class Meta:
             "parent_task": ["exact"],
             "child_tasks": ["exact"],
             "task_group": ["exact"],
-            "reserved_resources_record": ["exact"],
             "created_resources": ["exact"],
         }