pulp-ansible 0.25.0__tar.gz → 0.26.0__tar.gz

{pulp_ansible-0.25.0 → pulp_ansible-0.26.0}/CHANGES.md

@@ -8,6 +8,35 @@
 
 [//]: # (towncrier release notes start)
 
+## 0.26.0 (2025-05-27) {: #0.26.0 }
+
+#### Features {: #0.26.0-feature }
+
+- Added a migration to prepare moving tags into an array field on collection versions.
+
+  The second part of the migration will be shipped in the next release to keep the process zero downtime safe.
+
+#### Bugfixes {: #0.26.0-bugfix }
+
+- Fixed broken collection import logs.
+- Made collection sync slightly more resiliant in face of missing "next" links.
+
+#### Deprecations and Removals {: #0.26.0-removal }
+
+- Remove the `is_highest` field from CollectionVersion table.
+  [#1550](https://github.com/pulp/pulp_ansible/issues/1550)
+
+---
+
+## 0.25.1 (2025-05-06) {: #0.25.1 }
+
+#### Bugfixes {: #0.25.1-bugfix }
+
+- Fixed broken collection import logs.
+- Made collection sync slightly more resiliant in face of missing "next" links.
+
+---
+
 ## 0.25.0 (2025-04-23) {: #0.25.0 }
 
 #### Features {: #0.25.0-feature }
@@ -31,6 +60,19 @@
 
 ---
 
+## 0.24.6 (2025-04-23) {: #0.24.6 }
+
+#### Features {: #0.24.6-feature }
+
+- Added namespace progress report.
+
+#### Bugfixes {: #0.24.6-bugfix }
+
+- Fixed optimization of fetching namespace logos during sync.
+  [#2138](https://github.com/pulp/pulp_ansible/issues/2138)
+
+---
+
 ## 0.24.5 (2025-04-15) {: #0.24.5 }
 
 #### Bugfixes {: #0.24.5-bugfix }
@@ -93,7 +135,7 @@
   constraint. This allows users to serve their own interpretation of the content in their private
   repositories.
   The migration will only succeed if all the content has been adjusted. To account for content that
-  was not migrated by the migration shipped with 0.22.0, you can run the content repair command
+  was not migrated by the migration shipped with 0.23.0, you can run the content repair command
   ``datarepair-ansible-collection-sha256`` prior to upgrading.
   This version removed the content repair command.
   [#1052](https://github.com/pulp/pulp_ansible/issues/1052)
@@ -145,6 +187,27 @@
 
 ---
 
+## 0.22.6 (2025-05-06) {: #0.22.6 }
+
+#### Bugfixes {: #0.22.6-bugfix }
+
+- Made collection sync slightly more resiliant in face of missing "next" links.
+
+---
+
+## 0.22.5 (2025-04-23) {: #0.22.5 }
+
+#### Features {: #0.22.5-feature }
+
+- Added namespace progress report.
+
+#### Bugfixes {: #0.22.5-bugfix }
+
+- Fixed optimization of fetching namespace logos during sync.
+  [#2138](https://github.com/pulp/pulp_ansible/issues/2138)
+
+---
+
 ## 0.22.4 (2025-03-12) {: #0.22.4 }
 
 #### Bugfixes {: #0.22.4-bugfix }
@@ -222,6 +285,27 @@
 
 ---
 
+## 0.21.13 (2025-05-06) {: #0.21.13 }
+
+#### Bugfixes {: #0.21.13-bugfix }
+
+- Made collection sync slightly more resiliant in face of missing "next" links.
+
+---
+
+## 0.21.12 (2025-04-23) {: #0.21.12 }
+
+#### Features {: #0.21.12-feature }
+
+- Added namespace progress report.
+
+#### Bugfixes {: #0.21.12-bugfix }
+
+- Fixed optimization of fetching namespace logos during sync.
+  [#2138](https://github.com/pulp/pulp_ansible/issues/2138)
+
+---
+
 ## 0.21.11 (2025-04-15) {: #0.21.11 }
 
 #### Bugfixes {: #0.21.11-bugfix }
@@ -338,6 +422,27 @@ No significant changes.
 
 ---
 
+## 0.20.12 (2025-05-06) {: #0.20.12 }
+
+#### Bugfixes {: #0.20.12-bugfix }
+
+- Made collection sync slightly more resiliant in face of missing "next" links.
+
+---
+
+## 0.20.11 (2025-04-23) {: #0.20.11 }
+
+#### Features {: #0.20.11-feature }
+
+- Added namespace progress report.
+
+#### Bugfixes {: #0.20.11-bugfix }
+
+- Fixed optimization of fetching namespace logos during sync.
+  [#2138](https://github.com/pulp/pulp_ansible/issues/2138)
+
+---
+
 ## 0.20.10 (2025-01-16) {: #0.20.10 }
 
 No significant changes.

{pulp_ansible-0.25.0 → pulp_ansible-0.26.0}/PKG-INFO

@@ -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 → pulp_ansible-0.26.0}/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-0.26.0/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-0.26.0/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-0.25.0 → pulp_ansible-0.26.0}/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-0.25.0 → pulp_ansible-0.26.0}/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-0.25.0 → pulp_ansible-0.26.0}/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-0.25.0 → pulp_ansible-0.26.0}/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-0.25.0 → pulp_ansible-0.26.0}/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 → pulp_ansible-0.26.0}/pulp_ansible.egg-info/PKG-INFO

@@ -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 → pulp_ansible-0.26.0}/pulp_ansible.egg-info/SOURCES.txt

@@ -103,6 +103,8 @@ pulp_ansible/app/migrations/0056_collectionversion_sha256.py
 pulp_ansible/app/migrations/0057_collectionversion_sha256_migrate.py
 pulp_ansible/app/migrations/0058_fix_0056_regression.py
 pulp_ansible/app/migrations/0059_collectionversion_unique_sha256.py
+pulp_ansible/app/migrations/0060_remove_collectionversion_unique_is_highest_and_more.py
+pulp_ansible/app/migrations/0061_collectionversion_new_tags.py
 pulp_ansible/app/migrations/__init__.py
 pulp_ansible/app/schema/__init__.py
 pulp_ansible/app/schema/copy_config.json

{pulp_ansible-0.25.0 → pulp_ansible-0.26.0}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-ansible"
-version = "0.25.0"
+version = "0.26.0"
 description = "Pulp plugin to manage Ansible content, e.g. roles"
 readme = "README.rst"
 authors = [
@@ -101,7 +101,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "0.25.0"
+current_version = "0.26.0"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"