pulpcore 3.22.30__tar.gz → 3.22.32__tar.gz

{pulpcore-3.22.30 → pulpcore-3.22.32}/CHANGES.md

@@ -8,6 +8,37 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.22.32 (2024-11-06) {: #3.22.32 }
+
+### REST API {: #3.22.32-rest-api }
+
+#### Bugfixes {: #3.22.32-rest-api-bugfix }
+
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+### Plugin API {: #3.22.32-plugin-api }
+
+No significant changes.
+
+---
+
+## 3.22.31 (2024-10-01) {: #3.22.31 }
+
+### REST API {: #3.22.31-rest-api }
+
+#### Bugfixes {: #3.22.31-rest-api-bugfix }
+
+- Fixed a bug that caused Pulp to return duplicate content when a user was logged in as a
+  non-superuser while the content was part of multiple repositories.
+  [#3641](https://github.com/pulp/pulpcore/issues/3641)
+
+### Plugin API {: #3.22.31-plugin-api }
+
+No significant changes.
+
+---
+
 # ## 3.22.30 (2024-08-10) {: #3.22.30 }
 
 ### REST API {: #3.22.30-rest-api }

{pulpcore-3.22.30 → pulpcore-3.22.32}/MANIFEST.in

@@ -13,3 +13,4 @@ include COPYRIGHT
 include pulpcore/app/templates/rest_framework/api.html
 include manage.py
 include test_requirements.txt
+exclude releasing.md

{pulpcore-3.22.30 → pulpcore-3.22.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulpcore
-Version: 3.22.30
+Version: 3.22.32
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team

{pulpcore-3.22.30 → pulpcore-3.22.32}/functest_requirements.txt

@@ -8,3 +8,5 @@ python-gnupg
 
 # from pulp_file
 beautifulsoup4
+pytest-xdist
+pytest-timeout

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/app/apps.py

@@ -207,7 +207,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.22.30"
+    version = "3.22.32"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/app/serializers/exporter.py

@@ -15,6 +15,7 @@ from pulpcore.app.serializers import (
     RelatedField,
     RelatedResourceField,
     RepositoryVersionRelatedField,
+    fields,
 )
 from pulpcore.constants import FS_EXPORT_CHOICES, FS_EXPORT_METHODS
 
@@ -93,7 +94,7 @@ class ExportSerializer(ModelSerializer):
         view_name="None",  # This is a polymorphic field. The serializer does not need a view name.
     )
 
-    params = serializers.JSONField(
+    params = fields.JSONDictField(
         help_text=_("Any additional parameters that were used to create the export."),
         read_only=True,
     )
@@ -108,12 +109,12 @@ class PulpExportSerializer(ExportSerializer):
     Serializer for PulpExports.
     """
 
-    output_file_info = serializers.JSONField(
+    output_file_info = fields.JSONDictField(
         help_text=_("Dictionary of filename: sha256hash entries for export-output-file(s)"),
         read_only=True,
     )
 
-    toc_info = serializers.JSONField(
+    toc_info = fields.JSONDictField(
         help_text=_("Filename and sha256-checksum of table-of-contents for this export"),
         read_only=True,
     )

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/app/serializers/fields.py

@@ -4,6 +4,8 @@ from gettext import gettext as _
 from urllib.parse import urljoin
 
 from django.conf import settings
+from drf_spectacular.utils import extend_schema_field
+from drf_spectacular.types import OpenApiTypes
 from rest_framework import serializers
 from rest_framework.fields import empty
 from rest_framework.reverse import reverse
@@ -20,6 +22,15 @@ def relative_path_validator(relative_path):
         )
 
 
+@extend_schema_field(OpenApiTypes.OBJECT)
+class JSONDictField(serializers.JSONField):
+    """A drf JSONField override to force openapi schema to use 'object' type.
+
+    Not strictly correct, but we relied on that for a long time.
+    See: https://github.com/tfranzel/drf-spectacular/issues/1095
+    """
+
+
 class SingleContentArtifactField(RelatedField):
     """
     A serializer field for the '_artifacts' ManyToManyField on the Content model (single-artifact).

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/app/serializers/importer.py

@@ -11,6 +11,7 @@ from pulpcore.app.serializers import (
     ModelSerializer,
     RelatedField,
     ValidateFieldsMixin,
+    fields,
 )
 
 
@@ -39,7 +40,7 @@ class ImportSerializer(ModelSerializer):
         view_name="tasks-detail",
     )
 
-    params = serializers.JSONField(
+    params = fields.JSONDictField(
         help_text=_("Any parameters that were used to create the import."),
     )
 

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/app/serializers/task.py

@@ -11,6 +11,7 @@ from pulpcore.app.serializers import (
     RelatedField,
     RelatedResourceField,
     TaskGroupStatusCountField,
+    fields,
 )
 from pulpcore.constants import TASK_STATES
 
@@ -41,7 +42,7 @@ class TaskSerializer(ModelSerializer):
         help_text=_("Timestamp of the when this task stopped execution."), read_only=True
     )
     error = serializers.DictField(
-        child=serializers.JSONField(),
+        child=fields.JSONDictField(),
         help_text=_(
             "A JSON Object of a fatal error encountered during the execution of this task."
         ),

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/app/viewsets/content.py

@@ -121,7 +121,12 @@ class BaseContentViewSet(NamedModelViewSet):
                 repo_viewset = get_viewset_for_model(repo)()
                 setattr(repo_viewset, "request", self.request)
                 scoped_repos.extend(repo_viewset.get_queryset().values_list("pk", flat=True))
-            return qs.filter(repositories__in=scoped_repos)
+
+            # calling the distinct clause at end of the query ensures that no duplicates from
+            # joined tables will be returned to the end-user; this behaviour is documented at
+            # https://docs.djangoproject.com/en/3.2/topics/db/queries, in the section Spanning
+            # multi-valued relationships
+            return qs.filter(repositories__in=scoped_repos).distinct()
         return qs
 
 

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/tests/functional/api/test_workers.py

@@ -76,7 +76,7 @@ def task_schedule(cli_client):
         "from django.utils.timezone import now;"
         "from datetime import timedelta;"
         "from pulpcore.app.models import TaskSchedule;"
-        "dispatch_interval = timedelta(seconds=4);"
+        "dispatch_interval = timedelta(seconds=5);"
         "next_dispatch = now() + dispatch_interval;"
         "TaskSchedule("
         f"    name='{name}', task_name='{task_name}', "
@@ -100,8 +100,9 @@ def task_schedule(cli_client):
 def test_task_schedule(task_schedule, task_schedules_api_client):
     """Test that a worker will schedule a task roughly at a given time."""
     # Worker TTL is configured to 30s, therefore they will have a heartbeat each 10s (6 bpm). The
-    # task is scheduled 4s in the future to give us time to invesitgate the state before and after.
-    # 15s later we can be sure it was scheduled (as long as at least one worker is running).
+    # task is scheduled 5s in the future to give us time to invesitgate the state before and after.
+    # 16s later we can be sure it was scheduled (as long as at least one worker is running).
+    # Waiting for 18s to give some more slack.
 
     result = task_schedules_api_client.list(name=task_schedule["name"])
     assert result.count == 1
@@ -110,7 +111,7 @@ def test_task_schedule(task_schedule, task_schedules_api_client):
     assert ts.task_name == task_schedule["task_name"]
     assert ts.last_task is None
     # At least a worker heartbeat is needed
-    for i in range(15):
+    for i in range(18):
         sleep(1)
         ts = task_schedules_api_client.read(task_schedule_href=result.results[0].pulp_href)
         if ts.last_task is not None:

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore/tests/unit/download/test_factory.py

@@ -1,20 +1,21 @@
 from django.test import TestCase
+from asgiref.sync import sync_to_async
 
 from pulpcore.download.factory import DownloaderFactory
 from pulpcore.plugin.models import Remote
 
 
 class DownloaderFactoryHeadersTestCase(TestCase):
-    def test_user_agent_header(self):
-        remote = Remote.objects.create(url="http://example.org/", name="foo")
+    async def test_user_agent_header(self):
+        remote = await sync_to_async(Remote.objects.create)(url="http://example.org/", name="foo")
         factory = DownloaderFactory(remote)
         downloader = factory.build(remote.url)
         default_user_agent = DownloaderFactory.user_agent()
         self.assertEqual(downloader.session.headers["User-Agent"], default_user_agent)
-        remote.delete()
+        await sync_to_async(remote.delete)()
 
-    def test_custom_user_agent_header(self):
-        remote = Remote.objects.create(
+    async def test_custom_user_agent_header(self):
+        remote = await sync_to_async(Remote.objects.create)(
             url="http://example.org/", headers=[{"User-Agent": "foo"}], name="foo"
         )
         factory = DownloaderFactory(remote)
@@ -22,12 +23,13 @@ class DownloaderFactoryHeadersTestCase(TestCase):
         default_user_agent = DownloaderFactory.user_agent()
         expected_user_agent = f"{default_user_agent}, foo"
         self.assertEqual(downloader.session.headers["User-Agent"], expected_user_agent)
-        remote.delete()
+        await sync_to_async(remote.delete)()
 
-    def test_custom_headers(self):
-        remote = Remote.objects.create(
+    async def test_custom_headers(self):
+        remote = await sync_to_async(Remote.objects.create)(
             url="http://example.org/", headers=[{"Connection": "keep-alive"}], name="foo"
         )
         factory = DownloaderFactory(remote)
         downloader = factory.build(remote.url)
         self.assertEqual(downloader.session.headers["Connection"], "keep-alive")
+        await sync_to_async(remote.delete)()

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulpcore
-Version: 3.22.30
+Version: 3.22.32
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team

{pulpcore-3.22.30 → pulpcore-3.22.32}/pulpcore.egg-info/requires.txt

@@ -1,6 +1,6 @@
 aiodns<=3.1.1,>=3.0
 aiofiles<23.3.0,>=22.1
-aiohttp<3.9.2,>=3.8.1
+aiohttp<3.10.11,>=3.8.1
 asyncio-throttle<=1.0.2,>=1.0
 backoff<2.2.2,>=2.1.2
 click<=8.1.7,>=8.1.0
@@ -30,7 +30,7 @@ setuptools<69.1.0,>=39.2
 tablib<3.6.0
 url-normalize<=1.4.3,>=1.4.3
 whitenoise<=6.7.0,>=5.0
-yarl<1.9.5,>=1.8
+yarl<1.15.3,>=1.8
 
 [:python_version < "3.11"]
 async-timeout<4.0.4,>=4.0.3

{pulpcore-3.22.30 → pulpcore-3.22.32}/requirements.txt

@@ -1,6 +1,6 @@
 aiodns>=3.0,<=3.1.1
 aiofiles>=22.1,<23.3.0
-aiohttp>=3.8.1,<3.9.2
+aiohttp>=3.8.1,<3.10.11
 asyncio-throttle>=1.0,<=1.0.2
 async-timeout>=4.0.3,<4.0.4;python_version<"3.11"
 backoff>=2.1.2,<2.2.2
@@ -31,4 +31,4 @@ setuptools>=39.2,<69.1.0
 tablib<3.6.0
 url-normalize>=1.4.3,<=1.4.3
 whitenoise>=5.0,<=6.7.0
-yarl>=1.8,<1.9.5
+yarl>=1.8,<1.15.3

{pulpcore-3.22.30 → pulpcore-3.22.32}/setup.py

@@ -8,7 +8,7 @@ with open("requirements.txt") as requirements:
 
 setup(
     name="pulpcore",
-    version="3.22.30",
+    version="3.22.32",
     description="Pulp Django Application and Related Modules",
     long_description=long_description,
     long_description_content_type="text/markdown",