Merge pull request #367 from jumpstarter-dev/unified-cli

Unified cli

Author: NickCao

Makefile

@@ -62,7 +62,6 @@ clean: clean-docs clean-venv clean-build clean-test
 .PHONY: sync docs docs-all serve-all test test-packages build clean-test clean-docs clean-venv clean-build \
 	mypy-jumpstarter \
 	mypy-jumpstarter-cli-admin \
-	mypy-jumpstarter-cli-client \
 	mypy-jumpstarter-driver-can \
 	mypy-jumpstarter-driver-dutlink \
 	mypy-jumpstarter-driver-network \

docs/source/api-reference/drivers/flashers.md

@@ -85,7 +85,7 @@ This doesn't work with sphinx-click, so we'll just use the raw CLI
 ```
 -->
 ```bash
-$ jmp client shell -l board ti-03
+$ jmp shell -l board=ti-03
 INFO:jumpstarter.client.lease:Created lease request for labels {'board': 'ti-03'} for 0:30:00
 jumpstarter ⚡remote ➤ j storage
 Usage: j storage [OPTIONS] COMMAND [ARGS]...

docs/source/api-reference/drivers/yepkit.md

@@ -51,7 +51,7 @@ client.power.off()
 
 ### CLI access
 ```bash
-$ sudo ~/.cargo/bin/uv run jmp exporter shell -c ./packages/jumpstarter-driver-yepkit/examples/exporter.yaml
+$ sudo ~/.cargo/bin/uv run jmp shell --exporter-config ./packages/jumpstarter-driver-yepkit/examples/exporter.yaml
 WARNING:Ykush:No serial number provided for ykush, using the first one found: YK25838
 INFO:Ykush:Power OFF for Ykush YK25838 on port 1
 INFO:Ykush:Power OFF for Ykush YK25838 on port 2

docs/source/cli/clients.md

@@ -82,10 +82,10 @@ self-signed certificates.
 
 3. Those details can be installed as a secret on CI, or passed down to the final user.
 
-    Then the user can create the client using the [jmp client](./reference/jmp-client.md#jmp-client-config-create) CLI:
+    Then the user can create the client using the [jmp](./reference/jmp.md#jmp-config-client-create) CLI:
 
     ```bash
-    $ jmp client config create my-client
+    $ jmp config client create my-client
     Enter a valid Jumpstarter service endpoint: devl.jumpstarter.dev
     Enter a Jumpstarter auth token (hidden): ***
     Enter a comma-separated list of allowed driver packages (optional):

docs/source/cli/reference/index.md

@@ -5,39 +5,24 @@ This section provides details on the Jumpstarter CLI.
 ## jmp
 
 The base jmp command contains a set of subcommands for the different featuers, those
-can also be installed and used independently as `jmp-admin`, `jmp-client`, and
-`jmp-exporter`, `jmp-driver`.
+can also be installed and used independently as `jmp-admin` and `jmp`.
 
 ```bash
 jmp [OPTIONS] COMMAND [ARGS]...
 ```
 
 ### commands
 
-```{toctree}
-:maxdepth: 1
-jmp-admin.md
-```
-
 The `jmp-admin` or `jmp admin` CLI allows administration of exporters and clients in a Kubernetes cluster. To use this CLI, you must have a valid `kubeconfig` and access to the cluter/namespace where the Jumpstarter controller resides.
 
 ```{toctree}
 :maxdepth: 1
-jmp-client.md
+jmp-admin.md
 ```
 
-The `jmp-client` or `jmp client` CLI allows interaction with Jumpstarter as a clients.
-
-
-```{toctree}
-:maxdepth: 1
-jmp-exporter.md
-```
-The `jmp-exporter` or `jmp exporter` CLI allows you to run Jumpstarter exporters as services, container, or standalone.
+The `jmp` CLI allows interaction with Jumpstarter as a clients or exporter.
 
 ```{toctree}
 :maxdepth: 1
-jmp-driver.md
+jmp.md
 ```
-
-The `jmp-driver` or `jmp driver` CLI allows you to list and create Jumpstarter drivers.

docs/source/cli/reference/jmp-admin.md

@@ -1,4 +1,4 @@
-# admin
+# jmp-admin
 
 ```{eval-rst}
 .. click:: jumpstarter_cli_admin:admin

docs/source/cli/reference/jmp-client.md

@@ -0,0 +1,7 @@
+# jmp
+
+```{eval-rst}
+.. click:: jumpstarter_cli:jmp
+   :prog: jmp
+   :nested: full
+```