Implement kubectl style get command

Author: NickCao

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

@@ -9,6 +9,7 @@
 from .client_lease import client_lease
 from .client_login import client_login
 from .client_shell import client_shell
+from .get import get
 from jumpstarter.common.utils import env
 
 
@@ -27,6 +28,7 @@ def j():
         client.cli()(standalone_mode=True)
 
 
+client.add_command(get)
 client.add_command(create_client_config)
 client.add_command(delete_client_config)
 client.add_command(list_client_configs)

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

@@ -0,0 +1,100 @@
+import asyncclick as click
+from jumpstarter_cli_common import OutputMode, OutputType, make_table, opt_output_all
+
+from jumpstarter.config import (
+    ClientConfigV1Alpha1,
+    UserConfigV1Alpha1,
+)
+
+opt_context = click.option("--context")
+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.",
+)
+
+
+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
+
+
+@click.group()
+def get():
+    """
+    Display one or many resources
+    """
+
+
+@get.command(name="exporters")
+@opt_context
+@opt_selector
+@opt_output_all
+def get_exporters(context: str | None, selector: str | None, output: OutputType):
+    """
+    Display one or many exporters
+    """
+    config = _load_context(context)
+
+    exporters = config.list_exporters(filter=selector)
+
+    match output:
+        case OutputMode.JSON:
+            click.echo(exporters.dump_json())
+        case OutputMode.YAML:
+            click.echo(exporters.dump_yaml())
+        case OutputMode.NAME:
+            for exporter in exporters.exporters:
+                click.echo(exporter.name)
+        case _:
+            columns = ["NAME", "LABELS"]
+            rows = [
+                {
+                    "NAME": exporter.name,
+                    "LABELS": ",".join(("{}={}".format(i[0], i[1]) for i in exporter.labels.items())),
+                }
+                for exporter in exporters.exporters
+            ]
+            click.echo(make_table(columns, rows))
+
+
+@get.command(name="leases")
+@opt_context
+@opt_selector
+@opt_output_all
+async def get_leases(context: str | None, selector: str | None, output: OutputType):
+    """
+    Display one or many leases
+    """
+    config = _load_context(context)
+
+    leases = config.list_leases(filter=selector)
+
+    match output:
+        case OutputMode.JSON:
+            click.echo(leases.dump_json())
+        case OutputMode.YAML:
+            click.echo(leases.dump_yaml())
+        case OutputMode.NAME:
+            for lease in leases.leases:
+                click.echo(lease.name)
+        case _:
+            columns = ["NAME", "CLIENT", "EXPORTER"]
+            rows = [
+                {
+                    "NAME": lease.name,
+                    "CLIENT": lease.client,
+                    "EXPORTER": lease.exporter,
+                }
+                for lease in leases.leases
+            ]
+            click.echo(make_table(columns, rows))

packages/jumpstarter/jumpstarter/client/grpc.py

@@ -4,11 +4,11 @@
 from datetime import timedelta
 
 import yaml
-from google.protobuf import duration_pb2, field_mask_pb2
+from google.protobuf import duration_pb2, field_mask_pb2, json_format
 from grpc.aio import Channel
 from jumpstarter_protocol import kubernetes_pb2
 from jumpstarter_protocol.jumpstarter.client.v1 import client_pb2, client_pb2_grpc
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field, field_serializer
 
 
 def parse_identifier(identifier: str, kind: str) -> (str, str):
@@ -22,6 +22,10 @@ def parse_identifier(identifier: str, kind: str) -> (str, str):
     return segments[1], segments[3]
 
 
+def parse_client_identifier(identifier: str) -> (str, str):
+    return parse_identifier(identifier, "clients")
+
+
 def parse_exporter_identifier(identifier: str) -> (str, str):
     return parse_identifier(identifier, "exporters")
 
@@ -44,25 +48,35 @@ def from_protobuf(cls, data: client_pb2.Exporter) -> Exporter:
 class Lease(BaseModel):
     namespace: str
     name: str
+    client: str
     exporter: str
     conditions: list[kubernetes_pb2.Condition]
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+    @field_serializer("conditions")
+    def serialize_conditions(self, conditions: list[kubernetes_pb2.Condition], _info):
+        return [json_format.MessageToDict(condition) for condition in conditions]
+
     @classmethod
     def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
         namespace, name = parse_lease_identifier(data.name)
+
+        _, client = parse_client_identifier(data.client)
+        _, exporter = parse_exporter_identifier(data.exporter)
+
         return cls(
             namespace=namespace,
             name=name,
-            exporter=data.exporter,
+            client=client,
+            exporter=exporter,
             conditions=data.conditions,
         )
 
 
 class ExporterList(BaseModel):
     exporters: list[Exporter]
-    next_page_token: str | None
+    next_page_token: str | None = Field(exclude=True)
 
     @classmethod
     def from_protobuf(cls, data: client_pb2.ListExportersResponse) -> ExporterList:
@@ -80,7 +94,7 @@ def dump_yaml(self):
 
 class LeaseList(BaseModel):
     leases: list[Lease]
-    next_page_token: str | None
+    next_page_token: str | None = Field(exclude=True)
 
     @classmethod
     def from_protobuf(cls, data: client_pb2.ListLeasesResponse) -> LeaseList:

packages/jumpstarter/jumpstarter/config/client.py

@@ -127,6 +127,7 @@ async def request_lease_async(
 
         lease = Lease(
             channel=await self.channel(),
+            namespace=self.metadata.namespace,
             name=None,
             metadata_filter=metadata_filter,
             portal=portal,