Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/+rust-cli.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added CLI support for the unreleased / tech-preview "pulp_rust" plugin, for creating local private registries and mirrors of public registries (i.e. crates.io) for Rust package content.
Empty file.
61 changes: 61 additions & 0 deletions pulp-glue/src/pulp_glue/rust/context.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
from pulp_glue.common.context import (
PluginRequirement,
PulpContentContext,
PulpDistributionContext,
PulpRemoteContext,
PulpRepositoryContext,
PulpRepositoryVersionContext,
)
from pulp_glue.common.i18n import get_translation

translation = get_translation(__package__)
_ = translation.gettext


class PulpRustContentContext(PulpContentContext):
PLUGIN = "rust"
RESOURCE_TYPE = "packages"
ENTITY = _("rust package")
ENTITIES = _("rust packages")
HREF = "rust_rust_package_content_href"
Copy link
Copy Markdown
Contributor Author

@dralley dralley Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presuming we don't cut a release immediately, can we still keep the option open to rename the models?would

The package_content bit is a bit weird, maybe something to do with https://github.com/pulp/pulp_rust/blob/main/pulp_rust/app/viewsets.py#L64

I'm working on some renamings here: pulp/pulp_rust#32

ID_PREFIX = "content_rust_packages"
NEEDS_PLUGINS = [PluginRequirement("rust")]


class PulpRustDistributionContext(PulpDistributionContext):
PLUGIN = "rust"
RESOURCE_TYPE = "rust"
ENTITY = _("rust distribution")
ENTITIES = _("rust distributions")
HREF = "rust_rust_distribution_href"
ID_PREFIX = "distributions_rust_rust"
NEEDS_PLUGINS = [PluginRequirement("rust")]


class PulpRustRemoteContext(PulpRemoteContext):
PLUGIN = "rust"
RESOURCE_TYPE = "rust"
ENTITY = _("rust remote")
ENTITIES = _("rust remotes")
HREF = "rust_rust_remote_href"
ID_PREFIX = "remotes_rust_rust"
NEEDS_PLUGINS = [PluginRequirement("rust")]


class PulpRustRepositoryVersionContext(PulpRepositoryVersionContext):
HREF = "rust_rust_repository_version_href"
ID_PREFIX = "repositories_rust_rust_versions"
NEEDS_PLUGINS = [PluginRequirement("rust")]


class PulpRustRepositoryContext(PulpRepositoryContext):
PLUGIN = "rust"
RESOURCE_TYPE = "rust"
HREF = "rust_rust_repository_href"
ENTITY = _("rust repository")
ENTITIES = _("rust repositories")
ID_PREFIX = "repositories_rust_rust"
VERSION_CONTEXT = PulpRustRepositoryVersionContext
CAPABILITIES = {}
NULLABLES = PulpRepositoryContext.NULLABLES | {"remote"}
NEEDS_PLUGINS = [PluginRequirement("rust")]
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ core = "pulpcore.cli.core"
file = "pulpcore.cli.file"
python = "pulpcore.cli.python"
rpm = "pulpcore.cli.rpm"
rust = "pulpcore.cli.rust"

[dependency-groups]
dev = [
Expand Down
27 changes: 27 additions & 0 deletions src/pulpcore/cli/rust/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import typing as t

import click

from pulp_glue.common.i18n import get_translation

from pulp_cli.generic import pulp_group
from pulpcore.cli.rust.content import content
from pulpcore.cli.rust.distribution import distribution
from pulpcore.cli.rust.remote import remote
from pulpcore.cli.rust.repository import repository

translation = get_translation(__package__)
_ = translation.gettext


@pulp_group(name="rust")
def rust_group() -> None:
pass


def mount(main: click.Group, **kwargs: t.Any) -> None:
rust_group.add_command(repository)
rust_group.add_command(remote)
rust_group.add_command(distribution)
rust_group.add_command(content)
main.add_command(rust_group)
41 changes: 41 additions & 0 deletions src/pulpcore/cli/rust/content.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import click

from pulp_glue.common.i18n import get_translation
from pulp_glue.rust.context import PulpRustContentContext

from pulp_cli.generic import (
content_filter_options,
href_option,
list_command,
pulp_group,
show_command,
type_option,
)

translation = get_translation(__package__)
_ = translation.gettext


@pulp_group()
@type_option(
choices={"rust": PulpRustContentContext},
default="rust",
)
def content() -> None:
pass


lookup_options = [
href_option,
]

content.add_command(
list_command(
decorators=[
click.option("--name"),
click.option("--version"),
*content_filter_options,
]
)
)
content.add_command(show_command(decorators=lookup_options))
97 changes: 97 additions & 0 deletions src/pulpcore/cli/rust/distribution.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
import click

from pulp_glue.common.i18n import get_translation
from pulp_glue.rust.context import (
PulpRustDistributionContext,
PulpRustRemoteContext,
PulpRustRepositoryContext,
)

from pulp_cli.generic import (
common_distribution_create_options,
content_guard_option,
create_command,
destroy_command,
distribution_filter_options,
distribution_lookup_option,
href_option,
label_command,
list_command,
name_option,
pulp_group,
pulp_labels_option,
pulp_option,
resource_option,
show_command,
type_option,
update_command,
)

translation = get_translation(__package__)
_ = translation.gettext


repository_option = resource_option(
"--repository",
default_plugin="rust",
default_type="rust",
context_table={"rust:rust": PulpRustRepositoryContext},
href_pattern=PulpRustRepositoryContext.HREF_PATTERN,
help=_(
"Repository to be used for auto-distributing."
" Specified as '[[<plugin>:]<type>:]<name>' or as href."
),
)


@pulp_group()
@type_option(
choices={"rust": PulpRustDistributionContext},
default="rust",
)
def distribution() -> None:
pass


lookup_options = [href_option, name_option, distribution_lookup_option]
nested_lookup_options = [distribution_lookup_option]
update_options = [
repository_option,
pulp_option(
"--version",
type=int,
help=_(
"The repository version number to distribute."
" When unset, the latest version of the repository will be auto-distributed."
),
),
resource_option(
"--remote",
default_plugin="rust",
default_type="rust",
context_table={"rust:rust": PulpRustRemoteContext},
href_pattern=PulpRustRemoteContext.HREF_PATTERN,
help=_(
"Remote to use for pull-through caching."
" Specified as '[[<plugin>:]<type>:]<name>' or as href."
),
),
content_guard_option,
pulp_labels_option,
pulp_option(
"--allow-uploads/--no-allow-uploads",
is_flag=True,
default=None,
help=_("Allow publishing crates via ``cargo publish``."),
),
]
create_options = common_distribution_create_options + update_options

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))
51 changes: 51 additions & 0 deletions src/pulpcore/cli/rust/remote.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import click

from pulp_glue.common.i18n import get_translation
from pulp_glue.rust.context import PulpRustRemoteContext

from pulp_cli.generic import (
common_remote_create_options,
common_remote_update_options,
create_command,
destroy_command,
href_option,
label_command,
list_command,
name_option,
pulp_group,
remote_filter_options,
remote_lookup_option,
show_command,
type_option,
update_command,
)

translation = get_translation(__package__)
_ = translation.gettext


@pulp_group()
@type_option(
choices={"rust": PulpRustRemoteContext},
default="rust",
)
def remote() -> None:
pass


lookup_options = [href_option, name_option, remote_lookup_option]
nested_lookup_options = [remote_lookup_option]
rust_remote_options = [
click.option(
"--policy", type=click.Choice(["immediate", "on_demand", "streamed"], case_sensitive=False)
),
]

remote.add_command(list_command(decorators=remote_filter_options))
remote.add_command(show_command(decorators=lookup_options))
remote.add_command(create_command(decorators=common_remote_create_options + rust_remote_options))
remote.add_command(
update_command(decorators=lookup_options + common_remote_update_options + rust_remote_options)
)
remote.add_command(destroy_command(decorators=lookup_options))
remote.add_command(label_command(decorators=nested_lookup_options))
77 changes: 77 additions & 0 deletions src/pulpcore/cli/rust/repository.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import click

from pulp_glue.common.context import (
PulpRemoteContext,
)
from pulp_glue.common.i18n import get_translation
from pulp_glue.rust.context import (
PulpRustRemoteContext,
PulpRustRepositoryContext,
)

from pulp_cli.generic import (
create_command,
destroy_command,
href_option,
label_command,
label_select_option,
list_command,
name_option,
pulp_group,
pulp_labels_option,
repository_href_option,
repository_lookup_option,
resource_option,
retained_versions_option,
show_command,
type_option,
update_command,
version_command,
)
from pulpcore.cli.core.generic import task_command

translation = get_translation(__package__)
_ = translation.gettext


remote_option = resource_option(
"--remote",
default_plugin="rust",
default_type="rust",
context_table={"rust:rust": PulpRustRemoteContext},
href_pattern=PulpRemoteContext.HREF_PATTERN,
help=_("Remote used for syncing in the form '[[<plugin>:]<resource_type>:]<name>' or by href."),
)


@pulp_group()
@type_option(
choices={"rust": PulpRustRepositoryContext},
default="rust",
)
def repository() -> None:
pass


lookup_options = [href_option, name_option, repository_lookup_option]
nested_lookup_options = [repository_href_option, repository_lookup_option]
update_options = [
click.option("--description"),
remote_option,
retained_versions_option,
pulp_labels_option,
]
create_options = update_options + [click.option("--name", required=True)]

repository.add_command(
list_command(
decorators=[label_select_option, click.option("--name-startswith", "name__startswith")]
)
)
repository.add_command(show_command(decorators=lookup_options))
repository.add_command(create_command(decorators=create_options))
repository.add_command(update_command(decorators=lookup_options + update_options))
repository.add_command(destroy_command(decorators=lookup_options))
repository.add_command(task_command(decorators=nested_lookup_options))
repository.add_command(version_command(decorators=nested_lookup_options))
repository.add_command(label_command(decorators=nested_lookup_options))
12 changes: 12 additions & 0 deletions tests/scripts/pulp_rust/test_content.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -eu
# shellcheck source=tests/scripts/config.source
. "$(dirname "$(dirname "$(realpath "$0")")")"/config.source

pulp debug has-plugin --name "rust" || exit 23

expect_succ pulp rust content list
expect_succ pulp rust content list --limit 5
expect_succ pulp rust content list --name "itoa"
expect_succ pulp rust content list --version "1.0.0"
Loading
Loading