Revert "fixup! Add sha256 uniqueness to CollectionVersion"

This reverts commit d6c27284f5ecad16ae58fc6fcf2257d1d5229e2f.

CHANGES/+sha256_uniqueness.removal

@@ -0,0 +1,7 @@
+Added the final migration to make the sha256 of the collection version artifact the uniqueness
+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
+``datarepair-ansible-collection-sha256`` prior to upgrading.
+This version removed the content repair command.

pulp_ansible/app/migrations/0058_collectionversion_unique_sha256.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.14 on 2022-07-21 23:05
+
+from django.db import migrations, models
+from pulpcore.plugin.migrations import RequireVersion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ansible', '0057_collectionversion_sha256_migrate'),
+        ('core', '0110_apiappstatus'),
+    ]
+
+    operations = [
+        # TODO adjust this version!!!
+        RequireVersion("ansible", "0.22.0"),
+        migrations.AlterField(
+            model_name='collectionversion',
+            name='sha256',
+            field=models.CharField(db_index=True, max_length=64, null=False),
+        ),
+        migrations.AlterUniqueTogether(
+            name='collectionversion',
+            unique_together={('sha256',)},
+        ),
+    ]

pulp_ansible/app/models.py

@@ -179,7 +179,7 @@ class CollectionVersion(Content):
     namespace = models.CharField(max_length=64, editable=False)
     repository = models.CharField(default="", blank=True, max_length=2000, editable=False)
     requires_ansible = models.CharField(null=True, max_length=255)
-    sha256 = models.CharField(max_length=64, null=True, blank=False)
+    sha256 = models.CharField(max_length=64, db_index=True, null=False, blank=False)
 
     version = models.CharField(max_length=128, db_collation="pulp_ansible_semver")
     version_major = models.IntegerField()
@@ -229,7 +229,7 @@ def __str__(self):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = (("namespace", "name", "version"), ("sha256",))
+        unique_together = ("sha256",)
         constraints = [
             UniqueConstraint(
                 fields=("collection", "is_highest"),

pulp_ansible/app/serializers.py

@@ -525,23 +525,7 @@ def deferred_validate(self, data):
 
     def retrieve(self, validated_data):
         """Reuse existing CollectionVersion if provided artifact matches."""
-        namespace = validated_data["namespace"]
-        name = validated_data["name"]
-        version = validated_data["version"]
-        artifact = self.context["artifact"]
-        # TODO switch this check to use digest when ColVersion uniqueness constraint is changed
-        col = CollectionVersion.objects.filter(
-            namespace=namespace, name=name, version=version
-        ).first()
-        if col:
-            if col._artifacts.get() != artifact:
-                raise ValidationError(
-                    _("Collection {}.{}-{} already exists with a different artifact").format(
-                        namespace, name, version
-                    )
-                )
-
-        return col
+        return CollectionVersion.objects.filter(sha256=validated_data["sha256"]).first()
 
     def create(self, validated_data):
         """Final step in creating the CollectionVersion."""

pulp_ansible/app/tasks/collections.py

@@ -122,7 +122,7 @@ async def declarative_content_from_git_repo(remote, url, git_ref=None, metadata_
 
     artifact = metadata["artifact"]
     try:
-        with transaction.atomic:
+        with transaction.atomic():
             collection_version = await sync_to_async(create_collection_from_importer)(
                 metadata, metadata_only=metadata_only
             )
@@ -292,7 +292,7 @@ def import_collection(
         collection_version = create_collection_from_importer(importer_result)
         collection_version.manifest = manifest_data
         collection_version.files = files_data
-        with transaction.atomic():
+        with transaction.atomic:
             collection_version.save()
             ContentArtifact.objects.create(
                 artifact=artifact,

pulp_ansible/tests/functional/api/collection/test_crud_collection_versions.py

@@ -1,5 +1,8 @@
 """Tests related to sync ansible plugin collection content type."""
 
+import hashlib
+from pathlib import Path
+
 import pytest
 
 from orionutils.generator import randstr
@@ -100,3 +103,32 @@ def test_content_unit_lifecycle(ansible_bindings, build_and_upload_collection, m
         ansible_bindings.ContentCollectionVersionsApi.create(file=collection_artifact.filename).task
     )
     assert content_unit_href in create_task.created_resources
+
+
+@pytest.mark.parallel
+def test_duplicate_collection_key(
+    ansible_bindings,
+    ansible_repo_factory,
+    build_and_upload_collection,
+    monitor_task,
+):
+    """Create two content units with the same name but different artifacts."""
+    repository1 = ansible_repo_factory()
+    repository2 = ansible_repo_factory()
+
+    attrs = {"namespace": randstr(), "name": "squeezer", "version": "0.0.9"}
+    collection_artifact1, content_unit_href1 = build_and_upload_collection(
+        repository1, config=attrs
+    )
+    collection_artifact2, content_unit_href2 = build_and_upload_collection(
+        repository2, config=attrs
+    )
+
+    sha256_1 = hashlib.sha256(Path(collection_artifact1.filename).read_bytes()).hexdigest()
+    sha256_2 = hashlib.sha256(Path(collection_artifact2.filename).read_bytes()).hexdigest()
+    assert sha256_1 != sha256_2
+
+    content_unit_1 = ansible_bindings.ContentCollectionVersionsApi.read(content_unit_href1)
+    assert content_unit_1.sha256 == sha256_1
+    content_unit_2 = ansible_bindings.ContentCollectionVersionsApi.read(content_unit_href2)
+    assert content_unit_2.sha256 == sha256_2

pulp_ansible/tests/unit/migrations/test_0057_collection_version_sha256_migrate.py

@@ -37,3 +37,9 @@ def test_collection_version_sha256_migrate(migrate):
 
     cv = CollectionVersion.objects.get(pk=cv.pk)
     assert cv.sha256 == "SENTINEL"
+
+    apps = migrate([("ansible", "0058_collectionversion_unique_sha256")])
+    CollectionVersion = apps.get_model("ansible", "CollectionVersion")
+
+    cv = CollectionVersion.objects.get(pk=cv.pk)
+    assert cv.sha256 == "SENTINEL"