Make widespead use of type_option

Author: mdellweg

src/pulpcore/cli/ansible/content.py

@@ -30,6 +30,7 @@
     pulp_option,
     resource_option,
     show_command,
+    type_option,
 )
 
 translation = get_translation(__package__)
@@ -66,24 +67,15 @@ def _content_callback(ctx: click.Context, value: t.Any) -> t.Any:
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "content_type",
-    type=click.Choice(["collection-version", "role", "signature"], case_sensitive=False),
-    default="collection-version",
+@type_option(
+    choices={
+        "collection-version": PulpAnsibleCollectionVersionContext,
+        "role": PulpAnsibleRoleContext,
+        "signature": PulpAnsibleCollectionVersionSignatureContext,
+    }
 )
-@pass_pulp_context
-@click.pass_context
-def content(ctx: click.Context, pulp_ctx: PulpCLIContext, /, content_type: str) -> None:
-    if content_type == "collection-version":
-        ctx.obj = PulpAnsibleCollectionVersionContext(pulp_ctx)
-    elif content_type == "role":
-        ctx.obj = PulpAnsibleRoleContext(pulp_ctx)
-    elif content_type == "signature":
-        ctx.obj = PulpAnsibleCollectionVersionSignatureContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+def content() -> None:
+    pass
 
 
 list_options = [

src/pulpcore/cli/ansible/distribution.py

@@ -5,7 +5,6 @@
     EntityDefinition,
     EntityFieldDefinition,
     PluginRequirement,
-    PulpContext,
     PulpEntityContext,
 )
 from pulp_glue.common.i18n import get_translation
@@ -21,11 +20,11 @@
     list_command,
     name_option,
     pass_entity_context,
-    pass_pulp_context,
     pulp_group,
     pulp_labels_option,
     resource_option,
     show_command,
+    type_option,
 )
 
 translation = get_translation(__package__)
@@ -42,20 +41,9 @@
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "distribution_type",
-    type=click.Choice(["ansible"], case_sensitive=False),
-    default="ansible",
-)
-@pass_pulp_context
-@click.pass_context
-def distribution(ctx: click.Context, pulp_ctx: PulpContext, /, distribution_type: str) -> None:
-    if distribution_type == "ansible":
-        ctx.obj = PulpAnsibleDistributionContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+@type_option(choices={"ansible": PulpAnsibleDistributionContext})
+def distribution() -> None:
+    pass
 
 
 lookup_options = [href_option, name_option, distribution_lookup_option]

src/pulpcore/cli/ansible/remote.py

@@ -10,7 +10,6 @@
 from pulp_glue.common.i18n import get_translation
 
 from pulp_cli.generic import (
-    PulpCLIContext,
     common_remote_create_options,
     common_remote_update_options,
     create_command,
@@ -20,12 +19,12 @@
     list_command,
     load_file_wrapper,
     name_option,
-    pass_pulp_context,
     pulp_group,
     pulp_option,
     remote_filter_options,
     remote_lookup_option,
     show_command,
+    type_option,
     update_command,
 )
 
@@ -43,23 +42,14 @@ def yaml_callback(ctx: click.Context, param: click.Parameter, value: t.Any) -> s
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "remote_type",
-    type=click.Choice(["collection", "role"], case_sensitive=False),
-    default="collection",
-    is_eager=True,
+@type_option(
+    choices={
+        "collection": PulpAnsibleCollectionRemoteContext,
+        "role": PulpAnsibleRoleRemoteContext,
+    }
 )
-@pass_pulp_context
-@click.pass_context
-def remote(ctx: click.Context, pulp_ctx: PulpCLIContext, /, remote_type: str) -> None:
-    if remote_type == "role":
-        ctx.obj = PulpAnsibleRoleRemoteContext(pulp_ctx)
-    elif remote_type == "collection":
-        ctx.obj = PulpAnsibleCollectionRemoteContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+def remote() -> None:
+    pass
 
 
 collection_context = (PulpAnsibleCollectionRemoteContext,)

src/pulpcore/cli/ansible/repository.py

@@ -32,7 +32,6 @@
     load_string_callback,
     name_option,
     option_group,
-    pass_pulp_context,
     pass_repository_context,
     pulp_group,
     pulp_labels_option,
@@ -43,6 +42,7 @@
     resource_option,
     retained_versions_option,
     show_command,
+    type_option,
     update_command,
     version_command,
 )
@@ -68,7 +68,13 @@
 
 
 CONTENT_LIST_SCHEMA = s.Schema(
-    [{"name": s.And(str, len), "namespace": s.And(str, len), "version": s.And(str, len)}]
+    [
+        {
+            "name": s.And(str, len),
+            "namespace": s.And(str, len),
+            "version": s.And(str, len),
+        }
+    ]
 )
 
 
@@ -87,20 +93,9 @@ def _signing_service_callback(ctx: click.Context, param: click.Parameter, value:
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "repo_type",
-    type=click.Choice(["ansible"], case_sensitive=False),
-    default="ansible",
-)
-@pass_pulp_context
-@click.pass_context
-def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, /, repo_type: str) -> None:
-    if repo_type == "ansible":
-        ctx.obj = PulpAnsibleRepositoryContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+@type_option(choices={"ansible": PulpAnsibleRepositoryContext})
+def repository() -> None:
+    pass
 
 
 lookup_options = [href_option, name_option, repository_lookup_option]
@@ -112,7 +107,9 @@ def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, /, repo_type: str)
         callback=load_string_callback,
         needs_plugins=[
             PluginRequirement(
-                "ansible", specifier=">=0.15.0", feature="gpgkeys on ansible repositories"
+                "ansible",
+                specifier=">=0.15.0",
+                feature="gpgkeys on ansible repositories",
             )
         ],
     ),

src/pulpcore/cli/container/content.py

@@ -11,16 +11,15 @@
 )
 
 from pulp_cli.generic import (
-    PulpCLIContext,
     content_filter_options,
     href_option,
     label_command,
     list_command,
     option_group,
-    pass_pulp_context,
     pulp_group,
     pulp_option,
     show_command,
+    type_option,
 )
 
 _ = gettext.gettext
@@ -36,24 +35,16 @@ def _content_callback(ctx: click.Context, value: t.Dict[str, t.Any]) -> None:
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "content_type",
-    type=click.Choice(["blob", "manifest", "tag"], case_sensitive=False),
+@type_option(
+    choices={
+        "blob": PulpContainerBlobContext,
+        "manifest": PulpContainerManifestContext,
+        "tag": PulpContainerTagContext,
+    },
     default="tag",
 )
-@pass_pulp_context
-@click.pass_context
-def content(ctx: click.Context, pulp_ctx: PulpCLIContext, /, content_type: str) -> None:
-    if content_type == "manifest":
-        ctx.obj = PulpContainerManifestContext(pulp_ctx)
-    elif content_type == "tag":
-        ctx.obj = PulpContainerTagContext(pulp_ctx)
-    elif content_type == "blob":
-        ctx.obj = PulpContainerBlobContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+def content() -> None:
+    pass
 
 
 list_options = [

src/pulpcore/cli/container/distribution.py

@@ -17,7 +17,6 @@
 )
 
 from pulp_cli.generic import (
-    PulpCLIContext,
     content_guard_option,
     create_command,
     destroy_command,
@@ -28,12 +27,12 @@
     list_command,
     name_option,
     pass_entity_context,
-    pass_pulp_context,
     pulp_group,
     pulp_labels_option,
     resource_option,
     role_command,
     show_command,
+    type_option,
 )
 
 translation = get_translation(__package__)
@@ -53,20 +52,9 @@
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "distribution_type",
-    type=click.Choice(["container"], case_sensitive=False),
-    default="container",
-)
-@pass_pulp_context
-@click.pass_context
-def distribution(ctx: click.Context, pulp_ctx: PulpCLIContext, /, distribution_type: str) -> None:
-    if distribution_type == "container":
-        ctx.obj = PulpContainerDistributionContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+@type_option(choices={"container": PulpContainerDistributionContext})
+def distribution() -> None:
+    pass
 
 
 lookup_options = [href_option, name_option, distribution_lookup_option]

src/pulpcore/cli/container/namespace.py

@@ -28,20 +28,10 @@
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "namespace_type",
-    type=click.Choice(["container"], case_sensitive=False),
-    default="container",
-)
 @pass_pulp_context
 @click.pass_context
-def namespace(ctx: click.Context, pulp_ctx: PulpCLIContext, /, namespace_type: str) -> None:
-    if namespace_type == "container":
-        ctx.obj = PulpContainerNamespaceContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+def namespace(ctx: click.Context, pulp_ctx: PulpCLIContext, /) -> None:
+    ctx.obj = PulpContainerNamespaceContext(pulp_ctx)
 
 
 lookup_options = [href_option, name_option, namespace_lookup_option]

src/pulpcore/cli/container/remote.py

@@ -4,7 +4,6 @@
 from pulp_glue.container.context import PulpContainerRemoteContext
 
 from pulp_cli.generic import (
-    PulpCLIContext,
     common_remote_create_options,
     common_remote_update_options,
     create_command,
@@ -14,12 +13,12 @@
     list_command,
     load_json_callback,
     name_option,
-    pass_pulp_context,
     pulp_group,
     remote_filter_options,
     remote_lookup_option,
     role_command,
     show_command,
+    type_option,
     update_command,
 )
 
@@ -28,27 +27,17 @@
 
 
 @pulp_group()
-@click.option(
-    "-t",
-    "--type",
-    "remote_type",
-    type=click.Choice(["container"], case_sensitive=False),
-    default="container",
-)
-@pass_pulp_context
-@click.pass_context
-def remote(ctx: click.Context, pulp_ctx: PulpCLIContext, /, remote_type: str) -> None:
-    if remote_type == "container":
-        ctx.obj = PulpContainerRemoteContext(pulp_ctx)
-    else:
-        raise NotImplementedError()
+@type_option(choices={"container": PulpContainerRemoteContext})
+def remote() -> None:
+    pass
 
 
 lookup_options = [href_option, name_option, remote_lookup_option]
 nested_lookup_options = [remote_lookup_option]
 remote_options = [
     click.option(
-        "--policy", type=click.Choice(["immediate", "on_demand", "streamed"], case_sensitive=False)
+        "--policy",
+        type=click.Choice(["immediate", "on_demand", "streamed"], case_sensitive=False),
     ),
     click.option("--include-tags", callback=load_json_callback),
     click.option("--exclude-tags", callback=load_json_callback),

src/pulpcore/cli/core/group.py

@@ -105,7 +105,8 @@ def group(ctx: click.Context, pulp_ctx: PulpCLIContext, /) -> None:
 group.add_command(create_command(decorators=create_options))
 group.add_command(
     role_command(
-        decorators=lookup_options, needs_plugins=[PluginRequirement("core", specifier=">=3.17.0")]
+        decorators=lookup_options,
+        needs_plugins=[PluginRequirement("core", specifier=">=3.17.0")],
     )
 )
 
@@ -138,7 +139,8 @@ def permission(
 
 permission.add_command(
     list_command(
-        help=_("Show a list of the permissioons granted to a group."), decorators=[group_option]
+        help=_("Show a list of the permissioons granted to a group."),
+        decorators=[group_option],
     )
 )