WIP

Author: jobselko

pulp-glue/src/pulp_glue/python/context.py

@@ -73,10 +73,23 @@ def preprocess_entity(self, body: EntityDefinition, partial: bool = False) -> En
             if "repository" not in body and "publication" in body:
                 body["repository"] = None
 
-        version = body.pop("version", None)
-        if version is not None:
-            repository_href = body.pop("repository")
-            body["repository_version"] = f"{repository_href}versions/{version}/"
+        if self.pulp_ctx.has_plugin(PluginRequirement("python", specifier=">=3.21.0")):
+            version = body.pop("version", None)
+            if version is not None:
+                if repository_href := body.pop("repository", None):
+                    body["repository_version"] = f"{repository_href}versions/{version}/"
+                    body["repository"] = None
+                else:
+                    current_entity = getattr(self, "entity", {})
+                    if repository_href := current_entity.get("repository"):
+                        body["repository_version"] = f"{repository_href}versions/{version}/"
+                        body["repository"] = None
+                    elif repository_version_href := current_entity.get("repository_version"):
+                        repository_href = repository_version_href.partition("versions")[0]
+                        body["repository_version"] = f"{repository_href}versions/{version}/"
+            elif "repository" in body:
+                body["repository_version"] = None
+
         return body
 
 

src/pulpcore/cli/python/distribution.py

@@ -1,13 +1,6 @@
-import typing as t
-
 import click
 
-from pulp_glue.common.context import (
-    EntityDefinition,
-    EntityFieldDefinition,
-    PluginRequirement,
-    PulpEntityContext,
-)
+from pulp_glue.common.context import PluginRequirement
 from pulp_glue.common.i18n import get_translation
 from pulp_glue.python.context import (
     PulpPythonDistributionContext,
@@ -27,13 +20,13 @@
     label_command,
     list_command,
     name_option,
-    pass_entity_context,
     pass_pulp_context,
     pulp_group,
     pulp_labels_option,
     pulp_option,
     resource_option,
     show_command,
+    update_command,
 )
 
 translation = get_translation(__package__)
@@ -110,77 +103,8 @@ def distribution(ctx: click.Context, pulp_ctx: PulpCLIContext, /, distribution_t
 distribution.add_command(list_command(decorators=distribution_filter_options))
 distribution.add_command(show_command(decorators=lookup_options))
 distribution.add_command(create_command(decorators=create_options))
+distribution.add_command(
+    update_command(decorators=lookup_options + update_options + [click.option("--base-path")])
+)
 distribution.add_command(destroy_command(decorators=lookup_options))
 distribution.add_command(label_command(decorators=nested_lookup_options))
-
-
-def apply_decorators(decorators_list: list[t.Callable[..., t.Any]]) -> t.Callable[..., t.Any]:
-    def decorator(func: t.Callable[..., t.Any]) -> t.Callable[..., t.Any]:
-        for d in decorators_list:
-            func = d(func)
-        return func
-
-    return decorator
-
-
-@distribution.command()
-@apply_decorators(lookup_options + update_options + [click.option("--base-path")])
-@pass_entity_context
-def update(
-    distribution_ctx: PulpEntityContext,
-    /,
-    publication: str | None,
-    repository: EntityFieldDefinition,
-    version: int | None,
-    content_guard: EntityFieldDefinition,
-    allow_uploads: bool | None,
-    remote: EntityFieldDefinition,
-    pulp_labels: dict[str, str] | None,
-    base_path: str | None,
-) -> None:
-    """
-    Update a Python distribution.
-    """
-    assert isinstance(distribution_ctx, PulpPythonDistributionContext)
-
-    dist_body: EntityDefinition = distribution_ctx.entity
-    body: EntityDefinition = dict()
-
-    if publication is not None:
-        body["publication"] = publication
-    if content_guard is not None:
-        body["content_guard"] = content_guard
-    if allow_uploads is not None:
-        body["allow_uploads"] = allow_uploads
-    if remote is not None:
-        body["remote"] = remote
-    if pulp_labels is not None:
-        body["pulp_labels"] = pulp_labels
-    if base_path is not None:
-        body["base_path"] = base_path
-
-    if repository is not None and isinstance(repository, PulpPythonRepositoryContext):
-        repo = repository.entity
-        if version is not None:
-            if dist_body.get("repository"):
-                distribution_ctx.update(body={"repository": ""}, non_blocking=True)
-            body["repository_version"] = f"{repo['versions_href']}{version}/"
-        else:
-            if dist_body.get("repository_version"):
-                distribution_ctx.update(body={"repository_version": ""}, non_blocking=True)
-            body["repository"] = repo["pulp_href"]
-    elif version is not None:
-        if dist_body.get("repository"):
-            distribution_ctx.update(body={"repository": ""}, non_blocking=True)
-            body["repository_version"] = f"{dist_body['repository']}versions/{version}/"
-        elif dist_body.get("repository_version"):
-            repository_href = dist_body["repository_version"].partition("versions")[0]
-            body["repository_version"] = f"{repository_href}versions/{version}/"
-        else:
-            raise click.ClickException(
-                _(
-                    "Distribution doesn't have a repository set, "
-                    "please specify the repository to use with --repository"
-                )
-            )
-    distribution_ctx.update(body=body)

tests/scripts/pulp_python/test_distribution.sh

@@ -64,4 +64,18 @@ expect_succ pulp python distribution show --distribution "cli_test_python_distro
 echo "$OUTPUT" | jq -e '.repository_version | contains("/versions/1/")'
 echo "$OUTPUT" | jq -e '.repository == null'
 
+expect_succ pulp python distribution update \
+  --distribution "cli_test_python_distro_repo_version" \
+  --version 0
+expect_succ pulp python distribution show --distribution "cli_test_python_distro_repo_version"
+echo "$OUTPUT" | jq -e '.repository_version | contains("/versions/0/")'
+echo "$OUTPUT" | jq -e '.repository == null'
+
+expect_succ pulp python distribution update \
+  --distribution "cli_test_python_distro_repo_version" \
+  --repository "cli_test_python_distribution_repository"
+expect_succ pulp python distribution show --distribution "cli_test_python_distro_repo_version"
+echo "$OUTPUT" | jq -e '.repository_version == null'
+echo "$OUTPUT" | jq -e '.repository != null'
+
 expect_succ pulp python distribution destroy --distribution "cli_test_python_distro_repo_version"