Skip to content

Commit

Permalink
Removing manifest and files from metadata endpoints.
Browse files Browse the repository at this point in the history
  • Loading branch information
fao89 committed Mar 4, 2021
1 parent 002fab0 commit b54eb1a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGES/8264.bugfix
@@ -0,0 +1 @@
Removing ``manifest``and ``files`` from metadata endpoints.
29 changes: 22 additions & 7 deletions pulp_ansible/app/galaxy/v3/serializers.py
Expand Up @@ -88,17 +88,13 @@ class CollectionVersionListSerializer(serializers.ModelSerializer):
href = serializers.SerializerMethodField()
created_at = serializers.DateTimeField(source="collection.pulp_created")
updated_at = serializers.DateTimeField(source="collection.pulp_last_updated")
manifest = serializers.DictField(help_text="A JSON field holding MANIFEST.json data.")
files = serializers.DictField(help_text="A JSON field holding FILES.json data.")

class Meta:
fields = (
"version",
"href",
"created_at",
"updated_at",
"manifest",
"files",
"requires_ansible",
)
model = models.CollectionVersion
Expand Down Expand Up @@ -174,9 +170,9 @@ class CollectionNamespaceSerializer(serializers.Serializer):
name = serializers.CharField(source="namespace")


class CollectionVersionSerializer(CollectionVersionListSerializer):
class UnpaginatedCollectionVersionSerializer(CollectionVersionListSerializer):
"""
A serializer for a CollectionVersion.
A serializer for unpaginated CollectionVersion.
"""

collection = CollectionRefSerializer(read_only=True)
Expand All @@ -186,7 +182,8 @@ class CollectionVersionSerializer(CollectionVersionListSerializer):
metadata = CollectionMetadataSerializer(source="*", read_only=True)
namespace = CollectionNamespaceSerializer(source="*", read_only=True)

class Meta(CollectionVersionListSerializer.Meta):
class Meta:
model = models.CollectionVersion
fields = CollectionVersionListSerializer.Meta.fields + (
"artifact",
"collection",
Expand Down Expand Up @@ -214,6 +211,24 @@ def get_download_url(self, obj) -> str:
return download_url


class CollectionVersionSerializer(UnpaginatedCollectionVersionSerializer):
"""
A serializer for a CollectionVersion.
"""

manifest = serializers.DictField(
help_text="A JSON field holding MANIFEST.json data.", read_only=True
)
files = serializers.DictField(help_text="A JSON field holding FILES.json data.", read_only=True)

class Meta:
model = models.CollectionVersion
fields = UnpaginatedCollectionVersionSerializer.Meta.fields + (
"manifest",
"files",
)


class CollectionVersionDocsSerializer(serializers.ModelSerializer):
"""A serializer to display the docs_blob of a CollectionVersion."""

Expand Down
2 changes: 2 additions & 0 deletions pulp_ansible/app/galaxy/v3/views.py
Expand Up @@ -29,6 +29,7 @@
CollectionVersionDocsSerializer,
CollectionVersionListSerializer,
RepoMetadataSerializer,
UnpaginatedCollectionVersionSerializer,
)
from pulp_ansible.app.models import (
AnsibleCollectionDeprecated,
Expand Down Expand Up @@ -424,6 +425,7 @@ def list(self, request, *args, **kwargs):
class UnpaginatedCollectionVersionViewSet(CollectionVersionViewSet):
"""Unpaginated ViewSet for CollectionVersions."""

serializer_class = UnpaginatedCollectionVersionSerializer
pagination_class = None

def get_queryset(self):
Expand Down

0 comments on commit b54eb1a

Please sign in to comment.