Refactor viewset repo modify code

This change relies on pulp/pulpcore#7185 to
remove much of the duplicate code for the modify action.

Author: daviddavis

pulp_rpm/app/tasks/signing.py

@@ -52,9 +52,11 @@ def _verify_package_fingerprint(package_file, signing_fingerprint):
             f"{completed_process.stderr}."
         )
 
+    # check for `key ID` followed by a string of hex digits
     key_ids = re.findall(r"key ID ([0-9A-Fa-f]+)", completed_process.stdout, re.IGNORECASE)
+    # check for `key fingerprint:` followed by a string of hex digits
     fingerprints = re.findall(
-        r"key fingerprint:\s*([0-9A-Fa-f ]+)", completed_process.stdout, re.IGNORECASE
+        r"key fingerprint:\s*([0-9A-Fa-f]+)", completed_process.stdout, re.IGNORECASE
     )
     for candidate in key_ids + fingerprints:
         if signing_fingerprint.lower().endswith(candidate.lower()):

pulp_rpm/app/viewsets/repository.py

@@ -45,7 +45,33 @@
 from pulp_rpm.app.tasks.signing import signed_add_and_remove
 
 
-class RpmRepositoryViewSet(RepositoryViewSet, ModifyRepositoryActionMixin, RolesMixin):
+class RpmModifyRepositoryActionMixin(ModifyRepositoryActionMixin):
+    modify_task = signed_add_and_remove
+
+    @extend_schema(
+        description="Trigger an asynchronous task to create a new repository version.",
+        summary="Modify Repository Content",
+        responses={202: AsyncOperationResponseSerializer},
+    )
+    @action(detail=True, methods=["post"], serializer_class=RepositoryAddRemoveContentSerializer)
+    def modify(self, request, pk):
+        add_content_units = request.data.get("add_content_units", [])
+        package_ids = [extract_pk(href) for href in add_content_units if "/packages/" in href]
+        repository = self.get_object()
+
+        if add_content_units and repository.package_signing_service:
+            ondemand_ca = ContentArtifact.objects.filter(
+                content_id__in=package_ids, artifact__isnull=True
+            )
+            if ondemand_ca.count() > 0:
+                raise DRFValidationError(
+                    _("Cannot add on-demand content to repo with set package signing service.")
+                )
+
+        return super().modify(request, pk)
+
+
+class RpmRepositoryViewSet(RepositoryViewSet, RpmModifyRepositoryActionMixin, RolesMixin):
     """
     A ViewSet for RpmRepository.
     """
@@ -249,49 +275,6 @@ def sync(self, request, pk):
         )
         return OperationPostponedResponse(result, request)
 
-    @extend_schema(
-        description="Trigger an asynchronous task to create a new repository version.",
-        summary="Modify Repository Content",
-        responses={202: AsyncOperationResponseSerializer},
-    )
-    @action(detail=True, methods=["post"], serializer_class=RepositoryAddRemoveContentSerializer)
-    def modify(self, request, pk):
-        """
-        Queues a task that creates a new RepositoryVersion by adding and removing content units
-
-        Also handles signing if the repo has a package signing service and fingerprint set.
-        """
-        repository = self.get_object()
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        add_content_units = serializer.validated_data.get("add_content_units", [])
-        if add_content_units and repository.package_signing_service:
-            ondemand_ca = ContentArtifact.objects.filter(
-                content_id__in=add_content_units, artifact__isnull=True
-            )
-            if ondemand_ca.count() > 0:
-                raise DRFValidationError(
-                    _("Cannot add on-demand content to repo with set package signing service.")
-                )
-
-        if "base_version" in request.data:
-            base_version_pk = self.get_resource(request.data["base_version"], RepositoryVersion).pk
-        else:
-            base_version_pk = None
-
-        task = dispatch(
-            signed_add_and_remove,
-            exclusive_resources=[repository],
-            kwargs={
-                "repository_pk": pk,
-                "base_version_pk": base_version_pk,
-                "add_content_units": add_content_units,
-                "remove_content_units": serializer.validated_data.get("remove_content_units", []),
-            },
-        )
-        return OperationPostponedResponse(task, request)
-
 
 class RpmRepositoryVersionViewSet(RepositoryVersionViewSet):
     """