Dedup client config handling

Author: NickCao

packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py

@@ -3,19 +3,18 @@
 import asyncclick as click
 from jumpstarter_cli_common.exceptions import handle_exceptions
 
-from .common import load_context, opt_context, opt_selector_simple, selector_to_labels
+from .common import opt_config, opt_selector_simple, selector_to_labels
 from jumpstarter.common import MetadataFilter
 from jumpstarter.common.utils import launch_shell
 
 
 @click.command("shell", short_help="Spawns a shell connecting to a leased remote exporter")
 @click.option("-n", "--lease", "lease_name", type=str)
-@opt_context
+@opt_config
 @opt_selector_simple
 @handle_exceptions
-def client_shell(context: str | None, selector: str, lease_name):
+def client_shell(config, selector: str, lease_name):
     """Spawns a shell connecting to a leased remote exporter"""
-    config = load_context(context)
 
     exit_code = 0
 

packages/jumpstarter-cli-client/jumpstarter_cli_client/common.py

@@ -8,8 +8,6 @@
     UserConfigV1Alpha1,
 )
 
-opt_context = click.option("--client", "--context", "context", help="Name of client config")
-
 opt_selector_simple = click.option(
     "-l",
     "--selector",
@@ -24,17 +22,20 @@ def selector_to_labels(selector: str):
     return dict([term.split("=") for term in selector.split(",")])
 
 
-def load_context(context: str | None) -> ClientConfigV1Alpha1:
-    if context:
-        config = ClientConfigV1Alpha1.load(context)
-    else:
-        config = UserConfigV1Alpha1.load_or_create().config.current_client
-    if not config:
-        raise click.BadOptionUsage(
-            "--context",
-            "no client context specified, and no default client context set",
-        )
-    return config
+class ClientParamType(click.ParamType):
+    name = "client"
+
+    def convert(self, value, param, ctx):
+        if isinstance(value, ClientConfigV1Alpha1):
+            return value
+
+        if isinstance(value, bool):  # hack to allow loading the default config
+            config = UserConfigV1Alpha1.load_or_create().config.current_client
+            if config is None:
+                self.fail("no client config specified, and no default client config set", param, ctx)
+            return config
+        else:
+            return ClientConfigV1Alpha1.load(value)
 
 
 class DurationParamType(click.ParamType):
@@ -51,3 +52,6 @@ def convert(self, value, param, ctx):
 
 
 DURATION = DurationParamType()
+CLIENT = ClientParamType()
+
+opt_config = click.option("--client", "config", type=CLIENT, default=False, help="Name of client config")

packages/jumpstarter-cli-client/jumpstarter_cli_client/create.py

@@ -9,7 +9,7 @@
 )
 from jumpstarter_cli_common.exceptions import handle_exceptions
 
-from .common import DURATION, load_context, opt_context, opt_selector_simple
+from .common import DURATION, opt_config, opt_selector_simple
 
 
 @click.group()
@@ -20,12 +20,12 @@ def create():
 
 
 @create.command(name="lease")
-@opt_context
+@opt_config
 @opt_selector_simple
 @click.option("--duration", "duration", type=DURATION, required=True)
 @opt_output_all
 @handle_exceptions
-async def create_lease(context: str | None, selector: str, duration: timedelta, output: OutputType):
+async def create_lease(config, selector: str, duration: timedelta, output: OutputType):
     """
     Create a lease
 
@@ -50,7 +50,6 @@ async def create_lease(context: str | None, selector: str, duration: timedelta,
         $ jmp client delete lease "${JMP_LEASE}"
 
     """
-    config = load_context(context)
 
     lease = config.create_lease(selector=selector, duration=duration)
 

packages/jumpstarter-cli-client/jumpstarter_cli_client/delete.py

@@ -2,7 +2,7 @@
 from jumpstarter_cli_common import OutputMode, OutputType, opt_output_name_only
 from jumpstarter_cli_common.exceptions import handle_exceptions
 
-from .common import load_context, opt_context
+from .common import opt_config
 
 
 @click.group()
@@ -13,18 +13,16 @@ def delete():
 
 
 @delete.command(name="leases")
-@opt_context
+@opt_config
 @click.argument("name", required=False)
 @click.option("--all", "all", is_flag=True)
 @opt_output_name_only
 @handle_exceptions
-def delete_leases(context: str | None, name: str, all: bool, output: OutputType):
+def delete_leases(config, name: str, all: bool, output: OutputType):
     """
     Delete leases
     """
 
-    config = load_context(context)
-
     names = []
 
     if name is not None:

packages/jumpstarter-cli-client/jumpstarter_cli_client/get.py

@@ -2,7 +2,7 @@
 from jumpstarter_cli_common import OutputMode, OutputType, make_table, opt_output_all
 from jumpstarter_cli_common.exceptions import handle_exceptions
 
-from .common import load_context, opt_context
+from .common import opt_config
 
 opt_selector = click.option(
     "-l",
@@ -20,15 +20,14 @@ def get():
 
 
 @get.command(name="exporters")
-@opt_context
+@opt_config
 @opt_selector
 @opt_output_all
 @handle_exceptions
-def get_exporters(context: str | None, selector: str | None, output: OutputType):
+def get_exporters(config, selector: str | None, output: OutputType):
     """
     Display one or many exporters
     """
-    config = load_context(context)
 
     exporters = config.list_exporters(filter=selector)
 
@@ -53,15 +52,14 @@ def get_exporters(context: str | None, selector: str | None, output: OutputType)
 
 
 @get.command(name="leases")
-@opt_context
+@opt_config
 @opt_selector
 @opt_output_all
 @handle_exceptions
-def get_leases(context: str | None, selector: str | None, output: OutputType):
+def get_leases(config, selector: str | None, output: OutputType):
     """
     Display one or many leases
     """
-    config = load_context(context)
 
     leases = config.list_leases(filter=selector)
 

packages/jumpstarter-cli-client/jumpstarter_cli_client/update.py

@@ -4,7 +4,7 @@
 from jumpstarter_cli_common import OutputMode, OutputType, make_table, opt_output_all
 from jumpstarter_cli_common.exceptions import handle_exceptions
 
-from .common import DURATION, load_context, opt_context
+from .common import DURATION, opt_config
 
 
 @click.group()
@@ -15,18 +15,16 @@ def update():
 
 
 @update.command(name="lease")
-@opt_context
+@opt_config
 @click.argument("name")
 @click.option("--duration", "duration", type=DURATION, required=True)
 @opt_output_all
 @handle_exceptions
-async def update_lease(context: str | None, name: str, duration: timedelta, output: OutputType):
+async def update_lease(config, name: str, duration: timedelta, output: OutputType):
     """
     Update a lease
     """
 
-    config = load_context(context)
-
     lease = config.update_lease(name, duration)
 
     match output: