draft

CHANGES/479.feature

@@ -1,2 +1,2 @@
-Replaced `artifacts` by pulp-file `repo_version` (Pulp File plugin repository
+Replaced `artifacts` by pulp-file `repository_version` (Pulp File plugin repository
 version href) as the parameter to provide the build context for a Containerfile.

pulp_container/app/global_access_conditions.py

@@ -119,20 +119,3 @@ def has_distribution_perms(request, view, action, permission):
     return any(
         (request.user.has_perm(permission, distribution.cast()) for distribution in distributions)
     )
-
-
-def has_repository_perms(request, view, action, permission):
-    """
-    Check if the user has permissions on the corresponding repository.
-    """
-    obj = view.get_object() if view.detail else None
-    context = {"request": request}
-    serializer = view.serializer_class(instance=obj, data=request.data, context=context)
-    serializer.is_valid(raise_exception=True)
-    repo_version = serializer.validated_data.get("repo_version", None)
-    if not repo_version:
-        return True
-
-    repo_version_qs = RepositoryVersion.objects.filter(pk=repo_version)
-    repositories = get_objects_for_user(request.user, permission, repo_version_qs)
-    return repo_version_qs == repositories

pulp_container/app/serializers.py

@@ -749,7 +749,7 @@ class OCIBuildImageSerializer(ValidateFieldsMixin, serializers.Serializer):
     tag = serializers.CharField(
         required=False, default="latest", help_text="A tag name for the new image being built."
     )
-    repo_version = RepositoryVersionRelatedField(
+    repository_version = RepositoryVersionRelatedField(
         required=False,
         help_text=_("RepositoryVersion to be used as the build context for container images."),
         allow_null=True,
@@ -777,9 +777,6 @@ def validate(self, data):
                 _("'containerfile' or 'containerfile_artifact' must " "be specified.")
             )
 
-        if "repo_version" in data:
-            data["repo_version"] = data["repo_version"].pk
-
         return data
 
     class Meta:
@@ -788,7 +785,7 @@ class Meta:
             "containerfile",
             "repository",
             "tag",
-            "repo_version",
+            "repository_version",
         )
 
 

pulp_container/app/tasks/builder.py

@@ -96,7 +96,7 @@ def add_image_from_directory_to_repository(path, repository, tag):
 
 
 def build_image_from_containerfile(
-    containerfile_pk=None, repository_pk=None, tag=None, repo_version=None
+    containerfile_pk=None, repo_version=None, repository_pk=None, tag=None
 ):
     """
     Builds an OCI container image from a Containerfile.

pulp_container/app/viewsets.py

@@ -696,7 +696,7 @@ class ContainerRepositoryViewSet(
                 "condition": [
                     "has_model_or_obj_perms:container.build_image_containerrepository",
                     "has_model_or_obj_perms:container.view_containerrepository",
-                    "has_repository_perms:file.view_filerepository",
+                    "has_repo_or_repo_ver_param_model_or_obj_perms:file.view_filerepository",
                 ],
             },
             {
@@ -947,7 +947,7 @@ def build_image(self, request, pk):
             containerfile.touch()
         tag = serializer.validated_data["tag"]
 
-        repo_version = serializer.validated_data.get("repo_version", None)
+        repo_version = serializer.validated_data.get("repository_version", None)
 
         result = dispatch(
             tasks.build_image_from_containerfile,
@@ -956,7 +956,7 @@ def build_image(self, request, pk):
                 "containerfile_pk": str(containerfile.pk),
                 "tag": tag,
                 "repository_pk": str(repository.pk),
-                "repo_version": repo_version,
+                "repo_version": repo_version.pk,
             },
         )
         return OperationPostponedResponse(result, request)

pulp_container/tests/functional/api/test_build_images.py

@@ -59,7 +59,7 @@ def _build_image(repository, containerfile, repo_version=None):
         build_response = container_repository_api.build_image(
             container_container_repository_href=repository,
             containerfile=containerfile,
-            repo_version=repo_version,
+            repository_version=repo_version,
         )
         monitor_task(build_response.task)
 

staging_docs/admin/guides/build-image.md

@@ -43,7 +43,7 @@ CMD ["cat", "/inside-image.txt"]' >> Containerfile
 
 ```bash
 TASK_HREF=$(http --form POST :$CONTAINER_REPO'build_image/' "containerfile@./Containerfile" \
-repo_version=${FILE_REPO}versions/1/ | jq -r '.task')
+repository_version=${FILE_REPO}versions/1/ | jq -r '.task')
 ```