pulp-gem 0.2.0__tar.gz → 0.4.0__tar.gz

{pulp-gem-0.2.0 → pulp-gem-0.4.0}/CHANGES.rst

@@ -13,6 +13,41 @@ Changelog
 
 .. towncrier release notes start
 
+0.4.0 (2023-11-03)
+==================
+
+Features
+--------
+
+- Bumped pulpcore compatibility to 3.54.
+  `#40 <https://github.com/pulp/pulp_gem/issues/40>`__
+- Added support for RBAC and domains.
+  `#154 <https://github.com/pulp/pulp_gem/issues/154>`__
+
+
+Deprecations and Removals
+-------------------------
+
+- Removed pre 0.2 residua. When you are upgrading from <0.3, and your system was operated on <0.2 before, make sure you have run the corresponding datarepair commands before upgrading the codebase to this version.
+  `#143 <https://github.com/pulp/pulp_gem/issues/143>`__
+
+
+----
+
+
+0.3.0 (2023-09-18)
+==================
+
+Deprecations and Removals
+-------------------------
+
+- Added a migration to tell admins to run certain datarepair commands before upgrading to 0.4.
+  `#141 <https://github.com/pulp/pulp_gem/issues/141>`__
+
+
+----
+
+
 0.2.0 (2023-08-15)
 ==================
 

{pulp-gem-0.2.0 → pulp-gem-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pulp-gem
-Version: 0.2.0
+Version: 0.4.0
 Summary: Gemfile plugin for the Pulp Project
 Home-page: https://pulpproject.org/
 Author: Pulp Project Developers

{pulp-gem-0.2.0 → pulp-gem-0.4.0}/pulp_gem/app/__init__.py

@@ -6,5 +6,6 @@ class PulpGemPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_gem.app"
     label = "gem"
-    version = "0.2.0"
+    version = "0.4.0"
     python_package_name = "pulp-gem"
+    domain_compatible = True

pulp-gem-0.4.0/pulp_gem/app/migrations/0009_check_datarepair.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.1 on 2023-08-15 12:44
+
+from django.db import migrations
+from pulpcore.plugin.migrations import RequireVersion
+
+
+def check_datarepair(apps, schema_editor):
+    ShallowGemContent = apps.get_model("gem", "ShallowGemContent")
+    if ShallowGemContent.objects.exists():
+        raise RuntimeError("Before continuing with this upgrade, you need to downgrade pulp_gem to ~=0.3, then run the 'datarepair-shallow-gems' command, or remove all remaining broken repository versions.")
+
+    GemContent = apps.get_model("gem", "GemContent")
+    if GemContent.objects.filter(platform=None).exists():
+        raise RuntimeError("Before continuing with this upgrade, you need to downgrade pulp_gem to ~=0.3, then run the 'datarepair-gemspec-platform' command, or remove all remaining broken repository versions.")
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("gem", "0008_gemcontent_platform"),
+    ]
+
+    operations = [
+        RequireVersion("gem", "0.2.0"),
+        migrations.RunPython(code=check_datarepair, reverse_code=migrations.RunPython.noop, elidable=True),
+    ]

pulp-gem-0.4.0/pulp_gem/app/migrations/0010_delete_shallowgemcontent.py

@@ -0,0 +1,15 @@
+# Generated by Django 4.2.4 on 2023-09-12 10:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("gem", "0009_check_datarepair"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="ShallowGemContent",
+        ),
+    ]

pulp-gem-0.4.0/pulp_gem/app/migrations/0011_alter_gemcontent_platform.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.4 on 2023-09-12 11:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("gem", "0010_delete_shallowgemcontent"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="gemcontent",
+            name="platform",
+            field=models.TextField(),
+        ),
+    ]

pulp-gem-0.4.0/pulp_gem/app/migrations/0012_alter_gemdistribution_options_and_more.py

@@ -0,0 +1,69 @@
+# Generated by Django 4.2.4 on 2023-10-04 10:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+import pulpcore.app.util
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0110_apiappstatus"),
+        ("gem", "0011_alter_gemcontent_platform"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="gemdistribution",
+            options={
+                "default_related_name": "%(app_label)s_%(model_name)s",
+                "permissions": [
+                    ("manage_roles_gemdistribution", "Can manage roles on gem distributions")
+                ],
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="gempublication",
+            options={
+                "default_related_name": "%(app_label)s_%(model_name)s",
+                "permissions": [
+                    ("manage_roles_gempublication", "Can manage roles on gem publications")
+                ],
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="gemremote",
+            options={
+                "default_related_name": "%(app_label)s_%(model_name)s",
+                "permissions": [("manage_roles_gemremote", "Can manage roles on gem remotes")],
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="gemrepository",
+            options={
+                "default_related_name": "%(app_label)s_%(model_name)s",
+                "permissions": [
+                    ("sync_gemrepository", "Can start a sync task"),
+                    ("modify_gemrepository", "Can modify content of the repository"),
+                    ("manage_roles_gemrepository", "Can manage roles on gem repositories"),
+                    ("repair_gemrepository", "Can repair repository versions"),
+                ],
+            },
+        ),
+        migrations.AlterUniqueTogether(
+            name="gemcontent",
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name="gemcontent",
+            name="_pulp_domain",
+            field=models.ForeignKey(
+                default=pulpcore.app.util.get_domain_pk,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="core.domain",
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="gemcontent",
+            unique_together={("_pulp_domain", "checksum")},
+        ),
+    ]

{pulp-gem-0.2.0 → pulp-gem-0.4.0}/pulp_gem/app/models.py

@@ -6,12 +6,14 @@ from django.contrib.postgres.fields import HStoreField
 from django.db import models
 
 from pulpcore.plugin.models import (
+    AutoAddObjPermsMixin,
     Content,
     Publication,
     Distribution,
     Remote,
     Repository,
 )
+from pulpcore.plugin.util import get_domain_pk
 
 from pulp_gem.specs import analyse_gem
 
@@ -19,39 +21,6 @@ from pulp_gem.specs import analyse_gem
 log = getLogger(__name__)
 
 
-class ShallowGemContent(Content):
-    """
-    The "shallow-gem" content type.
-
-    Content of this type represents a ruby gem file with its spec data.
-    This is the old deprecated format that is only carried around for legacy installations.
-
-    Fields:
-        name (str): The name of the gem.
-        version (str): The version of the gem.
-
-    """
-
-    TYPE = "shallow-gem"
-
-    name = models.TextField(blank=False, null=False)
-    version = models.TextField(blank=False, null=False)
-
-    @property
-    def relative_path(self):
-        """The relative path this gem is stored under for the content app."""
-        return f"gems/{self.name}-{self.version}.gem"
-
-    @property
-    def gemspec_path(self):
-        """The path for this gem's gemspec for the content app."""
-        return f"quick/Marshal.4.8/{self.name}-{self.version}.gemspec.rz"
-
-    class Meta:
-        default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("name", "version")
-
-
 class GemContent(Content):
     """
     The "gem" content type.
@@ -63,12 +32,10 @@ class GemContent(Content):
     TYPE = "gem"
     repo_key_fields = ("name", "version", "platform")
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
     name = models.TextField(blank=False, null=False)
     version = models.TextField(blank=False, null=False)
-    # `null` on `platform is allowed for zero downtime upgrade from version 0.1.*.
-    # Change this to `null=False` in a version no earlier than 0.3.0.
-    # See also `ext_version` and the datarepair-gemspec-platform command.
-    platform = models.TextField(blank=False, null=True)
+    platform = models.TextField(blank=False, null=False)
     checksum = models.CharField(max_length=64, null=False, db_index=True)
     prerelease = models.BooleanField(default=False)
     dependencies = HStoreField(default=dict)
@@ -89,7 +56,7 @@ class GemContent(Content):
     def ext_version(self):
         """The version for this gem with the appended platform if not "ruby"."""
         # Remove the `None` with the change to the platform column.
-        if self.platform is None or self.platform == "ruby":
+        if self.platform == "ruby":
             platform_suffix = ""
         else:
             platform_suffix = f"-{self.platform}"
@@ -117,21 +84,28 @@ class GemContent(Content):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("checksum",)
+        unique_together = (
+            "_pulp_domain",
+            "checksum",
+        )
 
 
-class GemDistribution(Distribution):
+class GemDistribution(Distribution, AutoAddObjPermsMixin):
     """
     A Distribution for GemContent.
     """
 
     TYPE = "gem"
+    SERVE_FROM_PUBLICATION = True
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("manage_roles_gemdistribution", "Can manage roles on gem distributions"),
+        ]
 
 
-class GemPublication(Publication):
+class GemPublication(Publication, AutoAddObjPermsMixin):
     """
     A Publication for GemContent.
     """
@@ -140,9 +114,12 @@ class GemPublication(Publication):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("manage_roles_gempublication", "Can manage roles on gem publications"),
+        ]
 
 
-class GemRemote(Remote):
+class GemRemote(Remote, AutoAddObjPermsMixin):
     """
     A Remote for GemContent.
     """
@@ -169,16 +146,25 @@ class GemRemote(Remote):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("manage_roles_gemremote", "Can manage roles on gem remotes"),
+        ]
 
 
-class GemRepository(Repository):
+class GemRepository(Repository, AutoAddObjPermsMixin):
     """
     A Repository for GemContent.
     """
 
     TYPE = "gem"
-    CONTENT_TYPES = [GemContent, ShallowGemContent]
+    CONTENT_TYPES = [GemContent]
     REMOTE_TYPES = [GemRemote]
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("sync_gemrepository", "Can start a sync task"),
+            ("modify_gemrepository", "Can modify content of the repository"),
+            ("manage_roles_gemrepository", "Can manage roles on gem repositories"),
+            ("repair_gemrepository", "Can repair repository versions"),
+        ]

{pulp-gem-0.2.0 → pulp-gem-0.4.0}/pulp_gem/app/serializers.py

@@ -4,7 +4,6 @@ import tempfile
 import hashlib
 import os
 
-from django.db import IntegrityError
 from rest_framework.serializers import (
     BooleanField,
     CharField,
@@ -24,6 +23,7 @@ from pulpcore.plugin.serializers import (
     RepositorySerializer,
     SingleContentArtifactField,
 )
+from pulpcore.plugin.util import get_domain_pk
 
 from pulp_gem.app.models import (
     GemContent,
@@ -127,34 +127,9 @@ class GemContentSerializer(MultipleArtifactContentSerializer):
         return data
 
     def retrieve(self, validated_data):
-        return GemContent.objects.filter(checksum=validated_data["checksum"]).first()
-
-    def create(self, validated_data):
-        """Save the GemContent unit.
-
-        This must be used inside a task that locks on the Artifact and if given, the repository.
-        """
-        repository = validated_data.pop("repository", None)
-        content = self.retrieve(validated_data)
-        if content is None:
-            try:
-                content = super().create(validated_data)
-            except IntegrityError:
-                content = self.retrieve(validated_data)
-                if content is None:
-                    raise
-                content.touch()
-        else:
-            content.touch()
-
-        if repository:
-            repository.cast()
-            content_to_add = self.Meta.model.objects.filter(pk=content.pk)
-
-            # create new repo version with uploaded package
-            with repository.new_version() as new_version:
-                new_version.add_content(content_to_add)
-        return content
+        return GemContent.objects.filter(
+            _pulp_domain=get_domain_pk(), checksum=validated_data["checksum"]
+        ).first()
 
     class Meta:
         fields = MultipleArtifactContentSerializer.Meta.fields + (