pulp-ansible 0.25.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

pulp_ansible/app/__init__.py

@@ -8,5 +8,5 @@ class PulpAnsiblePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_ansible.app"
     label = "ansible"
-    version = "0.25.0"
+    version = "0.26.0"
     python_package_name = "pulp-ansible"

pulp_ansible/app/migrations/0060_remove_collectionversion_unique_is_highest_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.16 on 2024-11-21 08:53
+
+from django.db import migrations
+from pulpcore.plugin.migrations import RequireVersion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ansible", "0059_collectionversion_unique_sha256"),
+    ]
+
+    operations = [
+        RequireVersion("ansible", "0.23.0"),
+        migrations.RemoveConstraint(
+            model_name="collectionversion",
+            name="unique_is_highest",
+        ),
+        migrations.RemoveField(
+            model_name="collectionversion",
+            name="is_highest",
+        ),
+    ]

pulp_ansible/app/migrations/0061_collectionversion_new_tags.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.19 on 2025-05-21 12:04
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ansible", "0060_remove_collectionversion_unique_is_highest_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="collectionversion",
+            name="new_tags",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=64, unique=True),
+                db_column="tags",
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

pulp_ansible/app/models.py

@@ -6,7 +6,6 @@ from semantic_version import Version
 
 from django.conf import settings
 from django.db import models
-from django.db.models import UniqueConstraint, Q
 from django.db.utils import IntegrityError
 from django.contrib.postgres import fields as psql_fields
 from django.contrib.postgres import search as psql_search
@@ -150,10 +149,6 @@ class CollectionVersion(Content):
         repository (models.CharField): The URL of the originating SCM repository.
         version (models.CharField): The version of the collection.
         requires_ansible (models.CharField): The version of Ansible required to use the collection.
-        is_highest (models.BooleanField): Indicates that the version is the highest one
-            in the collection. Import and sync workflows update this field, which then
-            triggers the database to [re]build the search_vector.
-            This field is Deprecated and scheduled for removal as soon as 0.24.0.
 
     Relations:
 
@@ -188,23 +183,26 @@ class CollectionVersion(Content):
     version_patch = models.IntegerField()
     version_prerelease = models.CharField(max_length=128)
 
-    # This field is deprecated. We keep it for some releases for 0-Downtime upgrades.
-    is_highest = models.BooleanField(editable=False, default=False)
-
     # Foreign Key Fields
     collection = models.ForeignKey(
         Collection, on_delete=models.PROTECT, related_name="versions", editable=False
     )
     tags = models.ManyToManyField(Tag, editable=False)
+    # -----
+    # Upgrade steps (spaced out by releases):
+    # 1. Add new field and start populating in current code also.
+    # 2. Migrate remaining entries and delete m2m table.
+    #    Rename python field name without changing db_column.
+    new_tags = psql_fields.ArrayField(
+        models.CharField(max_length=64, unique=True), null=True, db_column="tags"
+    )
 
     # Search Fields
     #   This field is populated by a trigger setup in the database by
     #   a migration file. The trigger only runs when the table is
     #   updated. CollectionVersions are INSERT'ed into the table, so
     #   the search_vector does not get populated at initial creation
-    #   time. In the import or sync workflows, is_highest gets toggled
-    #   back and forth, which causes an UPDATE operation and then the
-    #   search_vector is built.
+    #   time.
     search_vector = psql_search.SearchVectorField(default="")
 
     @hook(BEFORE_SAVE)
@@ -232,13 +230,6 @@ class CollectionVersion(Content):
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
         unique_together = ("sha256",)
-        constraints = [
-            UniqueConstraint(
-                fields=("collection", "is_highest"),
-                name="unique_is_highest",
-                condition=Q(is_highest=True),
-            ),
-        ]
 
 
 class CollectionVersionMark(Content):

pulp_ansible/app/serializers.py

@@ -379,6 +379,7 @@ class TagSerializer(serializers.ModelSerializer):
     A serializer for the Tag model.
     """
 
+    name = serializers.CharField(help_text=_("The name of the Tag."), read_only=True)
     count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -518,6 +519,8 @@ class CollectionVersionUploadSerializer(SingleArtifactContentUploadSerializer):
         )
         # repository field clashes
         collection_info["origin_repository"] = collection_info.pop("repository", None)
+        # Remove this once new_tags is properly named tags
+        collection_info["new_tags"] = collection_info["tags"]
         data.update(collection_info)
 
         return data
@@ -640,7 +643,7 @@ class CollectionVersionSerializer(ContentChecksumSerializer, CollectionVersionUp
         read_only=True,
     )
 
-    tags = TagNestedSerializer(many=True, read_only=True)
+    tags = serializers.SerializerMethodField()
 
     version = serializers.CharField(
         help_text=_("The version of the collection."), max_length=128, read_only=True
@@ -658,6 +661,13 @@ class CollectionVersionSerializer(ContentChecksumSerializer, CollectionVersionUp
 
     creating = True
 
+    @extend_schema_field(serializers.ListField(child=TagNestedSerializer()))
+    def get_tags(self, obj):
+        if obj.new_tags is None:
+            return [{"name": tag.name} for tag in obj.tags.all()]
+        else:
+            return [{"name": tag} for tag in obj.new_tags]
+
     def validate(self, data):
         """Run super() validate if creating, else return data."""
         # This validation is for creating CollectionVersions

pulp_ansible/app/settings.py

@@ -2,7 +2,7 @@ import socket
 
 LOGGING = {
     "loggers": {
-        "pulp_ansible.app.tasks.collection.import_collection": {
+        "pulp_ansible.app.tasks.upload.process_collection_artifact": {
             "level": "INFO",
             "handlers": ["collection_import"],
             "propagate": False,

pulp_ansible/app/tasks/collections.py

@@ -338,6 +338,9 @@ def create_collection_from_importer(importer_result):
     Do not perform any database operations, just return an unsaved CollectionVersion.
     """
     collection_info = importer_result["metadata"]
+
+    # Remove, once the new_tags is properly named tags
+    collection_info["new_tags"] = collection_info["tags"]
     tags = collection_info.pop("tags")
 
     # Remove fields not used by this model
@@ -848,9 +851,11 @@ class CollectionSyncFirstStage(Stage):
     @staticmethod
     def _get_response_next_value(api_version, response):
         if api_version == 2:
-            return response["next"]
+            return response.get("next")
+        elif links := response.get("links"):
+            return links.get("next")
         else:
-            return response["links"]["next"]
+            return None
 
     def _collection_list_downloader(self, api_version, collection_endpoint, page_num, page_size):
         if api_version == 2:
@@ -1213,6 +1218,7 @@ class AnsibleContentSaver(ContentSaver):
 
             # Get tags for saving in _post_save
             tags = info.pop("tags")
+            info["new_tags"] = tags
             d_content.extra_data["tags"] = tags
 
             # Update with the additional data from the Collection

pulp_ansible/app/viewsets.py

@@ -1199,8 +1199,16 @@ class TagViewSet(NamedModelViewSet, mixins.ListModelMixin):
     serializer_class = TagSerializer
 
     def get_queryset(self):
-        qs = super().get_queryset()
-        return qs.annotate(count=Count("ansible_collectionversion"))
+        if CollectionVersion.objects.filter(new_tags__isnull=True).exists():
+            qs = super().get_queryset().annotate(count=Count("ansible_collectionversion"))
+        else:
+            qs = (
+                CollectionVersion.objects.all()
+                .annotate(tag=Func(F("new_tags"), function="unnest"))
+                .values("tag")
+                .values(count=Count("pk"), name=F("tag"))
+            )
+        return qs
 
 
 class CopyViewSet(viewsets.ViewSet):

{pulp_ansible-0.25.0.dist-info → pulp_ansible-0.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.25.0
+Version: 0.26.0
 Summary: Pulp plugin to manage Ansible content, e.g. roles
 Author-email: Pulp Ansible Plugin Project Developers <pulp-dev@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_ansible-0.25.0.dist-info → pulp_ansible-0.26.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
 pulp_ansible/__init__.py,sha256=WXL3JyOZzh4tALN4OBNgqj412O2LXVr8iYSn14Av0_o,67
 pulp_ansible/pytest_plugin.py,sha256=1x_Nb39VqNmI8KMEA4RS0fkvOPpkpp-7Dwzo9mjvyJQ,8763
-pulp_ansible/app/__init__.py,sha256=fuDllf2rOO4I6hsMTioGejlBulRMGH_7OC_aTYtKElQ,279
+pulp_ansible/app/__init__.py,sha256=AYbbkZO6YRQBv5cIzcYOABuzncw31SIQaTnedqBiUmo,279
 pulp_ansible/app/constants.py,sha256=cRrWMbJU-v1nCY2CjmGTOFGzz5aggn4ZKIs4-zeYADQ,78
 pulp_ansible/app/downloaders.py,sha256=0xrAXzhTMJ6ywvs6XyYNAKvRzYb_UZR6A5_WgaHvuiE,8331
 pulp_ansible/app/fields.py,sha256=yV3FL-47K-nxbiBxgzWi1hk3tfLsRdgic59LiwT2Fvs,624
 pulp_ansible/app/global_access_conditions.py,sha256=ayV_LbQIa4ReuDYQycdDY7WysfGk-e0gbuDGhAQFWyY,1235
 pulp_ansible/app/logutils.py,sha256=My4XivZMYLKeJqPHFwk3pIZSGlspALhI93vZxwWzlSY,846
 pulp_ansible/app/modelresource.py,sha256=Kqhmhd53JPfOthoOzLPxN1TnGERJBFckvwQoJfaIKnw,7839
-pulp_ansible/app/models.py,sha256=N-xlOAKttNzC6_3XifFSDIlUssURy8tr3EVxvQVpqe0,22648
-pulp_ansible/app/serializers.py,sha256=ffC1kgmdoQUwmthc8fJHr9dJu8BYk8-wyeN2E58m8dY,35450
-pulp_ansible/app/settings.py,sha256=daYdJuf9-rwAJHb2gjJzFplvlHh5yW-vg9ZoZHebyvg,1180
+pulp_ansible/app/models.py,sha256=eXaG2lquynKF4bHiu4-hkospiMHqjnykkz8_9mMe6sE,22112
+pulp_ansible/app/serializers.py,sha256=ibfkvuUmfPooODs562KJ65iB7iEYexbmJepKsE7yQPQ,35925
+pulp_ansible/app/settings.py,sha256=M9OdR-EiHjmskVCGHBjHkBMts66kx4F22sS2dgb7YAw,1186
 pulp_ansible/app/urls.py,sha256=PM-kGhBX7eQTJgsomUCxbIUHpIhyVZCyDUywQ21KAxU,8443
 pulp_ansible/app/utils.py,sha256=ClI_WvVy73kOZQB2mS8Gftf80Vye7pOxrbodTmPQgmk,1686
-pulp_ansible/app/viewsets.py,sha256=nZ1GqhGVDqThF2BFTwDgjXeXbts-7kiHoBYSs_MHHCo,44349
+pulp_ansible/app/viewsets.py,sha256=WFMLIP9Y90C4FpaQz1Snmo1XvkyCIezGm3Qr1j6MprE,44684
 pulp_ansible/app/galaxy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/app/galaxy/mixins.py,sha256=GY0nwZRqTBTCJUOgUDTNwlTbRa6NHN5dFEP9fI5dxCg,1391
 pulp_ansible/app/galaxy/serializers.py,sha256=47ORFSvPxBBjii5Y2_0EaoNJFMlKVOwFZd5MHXWSZds,1211
@@ -87,11 +87,13 @@ pulp_ansible/app/migrations/0056_collectionversion_sha256.py,sha256=6gLDAEcULJag
 pulp_ansible/app/migrations/0057_collectionversion_sha256_migrate.py,sha256=VnFl99Wywslr53VKwfd6RNBB5HEBaUCsqX0awEVOkMU,2395
 pulp_ansible/app/migrations/0058_fix_0056_regression.py,sha256=VTmiG_VlpC6wXb4R28TDC4rbd1KLTuPItgzcrq0R28w,1021
 pulp_ansible/app/migrations/0059_collectionversion_unique_sha256.py,sha256=_4MAElCkv5OUjv7v9eL43h9PhtLl85vOfMiTZKEGD-Q,1291
+pulp_ansible/app/migrations/0060_remove_collectionversion_unique_is_highest_and_more.py,sha256=GDaBq6YPznAxjObBmP3YRHsdUtUjTAHpnShpkICe9J8,586
+pulp_ansible/app/migrations/0061_collectionversion_new_tags.py,sha256=Hkf5oaJU7N-LQGi7IFXIx_SSx-FatS1kKYOfFEMCzlc,655
 pulp_ansible/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/app/schema/__init__.py,sha256=eGi2QVJ0kJgXwiDNjQsvqWDSr3EA8TFqFZATTY8xwT8,207
 pulp_ansible/app/schema/copy_config.json,sha256=AJz8riON7_rh-L7jM5iev2Imc5UKjlNvGfwF7KrFH7Y,568
 pulp_ansible/app/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulp_ansible/app/tasks/collections.py,sha256=4GOZfVlrNEQIt_qLK0ZQnQMDZgaiFnXO-QMbAegAAP8,50775
+pulp_ansible/app/tasks/collections.py,sha256=ShU35zNkjgVs7cdjZfSZuiixtWNrP2m7-a8-rGZxy7w,50990
 pulp_ansible/app/tasks/collectionversion_index.py,sha256=_cnQeWRpFXrreTJM9aaEc2HuknTksZa0lLZ7XUfmQ_c,9401
 pulp_ansible/app/tasks/copy.py,sha256=dO_DnLT5hck6GpZomEHurrDHJM0Wkh2B0_wgHHOtbuY,5563
 pulp_ansible/app/tasks/deletion.py,sha256=f-VNTMzDMQiJpCLN34fY5gwhAGlh3RACj4VWc_tOaP0,3579
@@ -160,9 +162,9 @@ pulp_ansible/tests/unit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 pulp_ansible/tests/unit/migrations/conftest.py,sha256=61n56aJuwEuAcUS27xnmnEDx6Ie7M5zxh851doWm7Ok,438
 pulp_ansible/tests/unit/migrations/test_0057_collection_version_sha256_migrate.py,sha256=NmU-frZNO1qHvhdxfw-bwPTEkqN4Wdc3dEs9dWME47o,2174
 pulp_ansible/tests/unit/migrations/test_x_repo_search_migration.py,sha256=IrC_V_Gss4nqhkdL-60upcEzGcz8IsiI2d-MfUtFY-g,657
-pulp_ansible-0.25.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_ansible-0.25.0.dist-info/METADATA,sha256=q4GeeJdcLHO_dQAR46LPqc3WFN755f3WYHRefvX4Tiw,3207
-pulp_ansible-0.25.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-pulp_ansible-0.25.0.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
-pulp_ansible-0.25.0.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
-pulp_ansible-0.25.0.dist-info/RECORD,,
+pulp_ansible-0.26.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_ansible-0.26.0.dist-info/METADATA,sha256=c_bafNYgQgiH1d8X5peDi1SoTzIBfjuXVFLcxqKx-lE,3207
+pulp_ansible-0.26.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pulp_ansible-0.26.0.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
+pulp_ansible-0.26.0.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
+pulp_ansible-0.26.0.dist-info/RECORD,,

{pulp_ansible-0.25.0.dist-info → pulp_ansible-0.26.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any