pulpcore 3.85.22__tar.gz → 3.85.23__tar.gz

{pulpcore-3.85.22 → pulpcore-3.85.23}/CHANGES.md

@@ -8,6 +8,28 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.85.23 (2026-06-09) {: #3.85.23 }
+
+### REST API {: #3.85.23-rest-api }
+
+#### Bugfixes {: #3.85.23-rest-api-bugfix }
+
+- Fixed `adjust_roles` to use `update_or_create` instead of `get_or_create` when populating locked roles, so that a pre-existing role with `locked=False` is updated rather than causing a duplicate key error.
+
+### Plugin API {: #3.85.23-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.85.23-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.85.23-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.85.22 (2026-06-03) {: #3.85.22 }
 
 ### REST API {: #3.85.22-rest-api }

{pulpcore-3.85.22 → pulpcore-3.85.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.85.22
+Version: 3.85.23
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulpcore-3.85.22 → pulpcore-3.85.23}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.85.22"
+    version = "3.85.23"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.85.22 → pulpcore-3.85.23}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.85.22"
+    version = "3.85.23"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.85.22 → pulpcore-3.85.23}/pulpcore/app/apps.py

@@ -237,7 +237,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.85.22"
+    version = "3.85.23"
 
     # The python package name providing this app
     python_package_name = "pulpcore"
@@ -408,11 +408,9 @@ def adjust_roles(apps, role_prefix, desired_roles, verbosity=1):
                 _("Locked role definition for {name} is incompatible.").format(name=name)
             )
         permissions = [_get_permission(perm) for perm in permissions]
-        role, created = Role.objects.get_or_create(
-            name=name, locked=True, defaults={"name": name, "locked": True}
+        role, created = Role.objects.update_or_create(
+            name=name, defaults={"name": name, "locked": True, "description": description}
         )
-        role.description = description
-        role.save()
         role.permissions.set(permissions)
 
 

pulpcore-3.85.23/pulpcore/tests/unit/roles/test_adjust_roles.py

@@ -0,0 +1,102 @@
+import pytest
+from django.apps import apps
+
+from pulpcore.app.apps import adjust_roles
+from pulpcore.app.models.role import Role
+
+ROLE_PREFIX = "core."
+VIEW_REPO_PERM = "core.view_repository"
+CHANGE_REPO_PERM = "core.change_repository"
+
+
+@pytest.fixture(autouse=True)
+def _cleanup_test_roles(db):
+    yield
+    Role.objects.filter(name__startswith=ROLE_PREFIX + "test_").delete()
+
+
+def test_creates_new_locked_role(db):
+    desired = {
+        "core.test_viewer": {
+            "description": "Can view repositories",
+            "permissions": [VIEW_REPO_PERM],
+        }
+    }
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+
+    role = Role.objects.get(name="core.test_viewer")
+    assert role.locked is True
+    assert role.description == "Can view repositories"
+    assert role.permissions.filter(codename="view_repository").exists()
+
+
+def test_updates_unlocked_role_to_locked(db):
+    """Core scenario from AAP-73644: a role pre-created with locked=False
+    must be updated to locked=True instead of raising UniqueViolation."""
+    Role.objects.create(name="core.test_viewer", locked=False)
+
+    desired = {
+        "core.test_viewer": {
+            "description": "Can view repositories",
+            "permissions": [VIEW_REPO_PERM],
+        }
+    }
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+
+    role = Role.objects.get(name="core.test_viewer")
+    assert role.locked is True
+    assert role.description == "Can view repositories"
+
+
+def test_idempotent(db):
+    desired = {
+        "core.test_viewer": {
+            "description": "Can view repositories",
+            "permissions": [VIEW_REPO_PERM],
+        }
+    }
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+
+    assert Role.objects.filter(name="core.test_viewer").count() == 1
+    role = Role.objects.get(name="core.test_viewer")
+    assert role.locked is True
+    assert role.description == "Can view repositories"
+
+
+def test_updates_description(db):
+    Role.objects.create(name="core.test_viewer", locked=True, description="Old description")
+
+    desired = {
+        "core.test_viewer": {
+            "description": "New description",
+            "permissions": [VIEW_REPO_PERM],
+        }
+    }
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+
+    role = Role.objects.get(name="core.test_viewer")
+    assert role.description == "New description"
+
+
+def test_removes_obsolete_locked_roles(db):
+    Role.objects.create(name="core.test_obsolete", locked=True)
+
+    desired = {
+        "core.test_viewer": [VIEW_REPO_PERM],
+    }
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+
+    assert not Role.objects.filter(name="core.test_obsolete").exists()
+    assert Role.objects.filter(name="core.test_viewer").exists()
+
+
+def test_preserves_unlocked_roles_on_cleanup(db):
+    Role.objects.create(name="core.test_custom", locked=False)
+
+    desired = {
+        "core.test_viewer": [VIEW_REPO_PERM],
+    }
+    adjust_roles(apps, ROLE_PREFIX, desired, verbosity=0)
+
+    assert Role.objects.filter(name="core.test_custom").exists()

{pulpcore-3.85.22 → pulpcore-3.85.23}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.85.22
+Version: 3.85.23
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulpcore-3.85.22 → pulpcore-3.85.23}/pulpcore.egg-info/SOURCES.txt

@@ -444,6 +444,7 @@ pulpcore/tests/unit/models/test_remote.py
 pulpcore/tests/unit/models/test_repository.py
 pulpcore/tests/unit/models/test_task.py
 pulpcore/tests/unit/roles/__init__.py
+pulpcore/tests/unit/roles/test_adjust_roles.py
 pulpcore/tests/unit/roles/test_roles.py
 pulpcore/tests/unit/serializers/__init__.py
 pulpcore/tests/unit/serializers/test_base.py

{pulpcore-3.85.22 → pulpcore-3.85.23}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.85.22"
+version = "3.85.23"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -206,7 +206,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.85.22"
+current_version = "3.85.23"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"