Dedup opt_selector

Author: NickCao

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

@@ -8,6 +8,13 @@
     UserConfigV1Alpha1,
 )
 
+opt_selector = click.option(
+    "-l",
+    "--selector",
+    help="Selector (label query) to filter on, supports '=', '==', and '!=' (e.g. -l key1=value1,key2=value2)."
+    " Matching objects must satisfy all of the specified label constraints.",
+)
+
 opt_selector_simple = click.option(
     "-l",
     "--selector",

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 opt_config
+from .common import opt_config, opt_selector
 
 
 @click.group()
@@ -15,10 +15,11 @@ def delete():
 @delete.command(name="leases")
 @opt_config
 @click.argument("name", required=False)
+@opt_selector
 @click.option("--all", "all", is_flag=True)
 @opt_output_name_only
 @handle_exceptions
-def delete_leases(config, name: str, all: bool, output: OutputType):
+def delete_leases(config, name: str, selector: str | None, all: bool, output: OutputType):
     """
     Delete leases
     """
@@ -27,13 +28,18 @@ def delete_leases(config, name: str, all: bool, output: OutputType):
 
     if name is not None:
         names.append(name)
+    elif selector:
+        leases = config.list_leases(filter=selector)
+        for lease in leases.leases:
+            if lease.client == config.metadata.name:
+                names.append(lease.name)
     elif all:
-        leases = config.list_leases(filter="")
+        leases = config.list_leases(filter=None)
         for lease in leases.leases:
             if lease.client == config.metadata.name:
                 names.append(lease.name)
     else:
-        raise click.ClickException("One of NAME or --all must be specified")
+        raise click.ClickException("One of NAME, --selector or --all must be specified")
 
     for name in names:
         config.delete_lease(name=name)

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

@@ -2,14 +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 opt_config
-
-opt_selector = click.option(
-    "-l",
-    "--selector",
-    help="Selector (label query) to filter on, supports '=', '==', and '!=' (e.g. -l key1=value1,key2=value2)."
-    " Matching objects must satisfy all of the specified label constraints.",
-)
+from .common import opt_config, opt_selector
 
 
 @click.group()