Adjust FileContentSerializer to upstream change

re #5428 https://pulp.plan.io/issues/5428 Required PR: pulp/pulpcore#294 Required PR: pulp/pulp-smash#1219
pulp · Sep 12, 2019 · 4f3ac9f · 4f3ac9f
1 parent b348e97
commit 4f3ac9f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/CHANGES/5428.removal b/CHANGES/5428.removal
@@ -0,0 +1 @@
+Adjust FileContentSerializer to upstream change.
diff --git a/docs/_static/api.json b/docs/_static/api.json
diff --git a/pulp_file/app/serializers.py b/pulp_file/app/serializers.py
@@ -10,7 +10,6 @@
     PublicationSerializer,
     RemoteSerializer,
     SingleArtifactContentSerializer,
-    relative_path_validator,
 )
 
 from .models import FileContent, FileDistribution, FileRemote, FilePublication
@@ -21,19 +20,11 @@ class FileContentSerializer(SingleArtifactContentSerializer, ContentChecksumSeri
     Serializer for File Content.
     """
 
-    relative_path = serializers.CharField(
-        help_text=_(
-            "Relative location of the file within the repository. " "Example: `path/to/file.txt`"
-        ),
-        validators=[relative_path_validator],
-    )
-
     def validate(self, data):
         """Validate the FileContent data."""
         data = super().validate(data)
 
-        data["digest"] = data["_artifact"].sha256
-        data["_relative_path"] = data["relative_path"]
+        data["digest"] = data["artifact"].sha256
 
         content = FileContent.objects.filter(
             digest=data["digest"], relative_path=data["relative_path"]
@@ -44,17 +35,13 @@ def validate(self, data):
                 _(
                     "There is already a file content with relative path '{path}' and artifact "
                     "'{artifact}'."
-                ).format(path=data["relative_path"], artifact=self.initial_data["_artifact"])
+                ).format(path=data["relative_path"], artifact=self.initial_data["artifact"])
             )
 
         return data
 
     class Meta:
-        fields = (
-            tuple(set(SingleArtifactContentSerializer.Meta.fields) - {"_relative_path"})
-            + ContentChecksumSerializer.Meta.fields
-            + ("relative_path",)
-        )
+        fields = SingleArtifactContentSerializer.Meta.fields + ContentChecksumSerializer.Meta.fields
         model = FileContent
 
 

diff --git a/pulp_file/tests/functional/utils.py b/pulp_file/tests/functional/utils.py
@@ -57,7 +57,7 @@ def gen_file_content_attrs(artifact):
     :param artifact: A dict of info about the artifact.
     :returns: A semi-random dict for use in creating a content unit.
     """
-    return {"_artifact": artifact["_href"], "relative_path": utils.uuid4()}
+    return {"artifact": artifact["_href"], "relative_path": utils.uuid4()}
 
 
 def populate_pulp(cfg, url=FILE_FIXTURE_MANIFEST_URL):

diff --git a/pulp_file/tests/unit/test_serializers.py b/pulp_file/tests/unit/test_serializers.py
@@ -26,7 +26,7 @@ def setUp(self):
     def test_valid_data(self):
         """Test that the FileContentSerializer accepts valid data."""
         data = {
-            "_artifact": "/pulp/api/v3/artifacts/{}/".format(self.artifact.pk),
+            "artifact": "/pulp/api/v3/artifacts/{}/".format(self.artifact.pk),
             "relative_path": "foo",
         }
         serializer = FileContentSerializer(data=data)
@@ -35,7 +35,7 @@ def test_valid_data(self):
     def test_absolute_path_data(self):
         """Test that the FileContentSerializer does not accept data."""
         data = {
-            "_artifact": "/pulp/api/v3/artifacts/{}/".format(self.artifact.pk),
+            "artifact": "/pulp/api/v3/artifacts/{}/".format(self.artifact.pk),
             "relative_path": "/foo",
         }
         serializer = FileContentSerializer(data=data)
@@ -45,7 +45,7 @@ def test_duplicate_data(self):
         """Test that the FileContentSerializer does not accept data."""
         FileContent.objects.create(relative_path="foo", digest=self.artifact.sha256)
         data = {
-            "_artifact": "/pulp/api/v3/artifacts/{}/".format(self.artifact.pk),
+            "artifact": "/pulp/api/v3/artifacts/{}/".format(self.artifact.pk),
             "relative_path": "foo",
         }
         serializer = FileContentSerializer(data=data)