Add pre/post lease hooks

buf.gen.yaml

@@ -6,6 +6,10 @@ plugins:
     out: ./packages/jumpstarter-protocol/jumpstarter_protocol
   - remote: buf.build/grpc/python
     out: ./packages/jumpstarter-protocol/jumpstarter_protocol
+  - remote: buf.build/community/nipunn1313-mypy:v3.7.0
+    out: ./packages/jumpstarter-protocol/jumpstarter_protocol
+  - remote: buf.build/community/nipunn1313-mypy-grpc:v3.7.0
+    out: ./packages/jumpstarter-protocol/jumpstarter_protocol
 inputs:
   - git_repo: https://github.com/jumpstarter-dev/jumpstarter-protocol.git
     branch: main

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py

@@ -234,7 +234,9 @@ def test_create_client(
             "name": "{name}-credential"
         }},
         "devices": [],
-        "endpoint": "{endpoint}"
+        "endpoint": "{endpoint}",
+        "exporterStatus": null,
+        "statusMessage": null
     }}
 }}
 """.format(name=EXPORTER_NAME, endpoint=EXPORTER_ENDPOINT)
@@ -250,6 +252,8 @@ def test_create_client(
     name: {name}-credential
   devices: []
   endpoint: {endpoint}
+  exporterStatus: null
+  statusMessage: null
 
 """.format(name=EXPORTER_NAME, endpoint=EXPORTER_ENDPOINT)
 

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/get_test.py

@@ -301,7 +301,10 @@ def test_get_clients(_load_kube_config_mock, list_clients_mock: AsyncMock):
     kind="Exporter",
     metadata=V1ObjectMeta(name="test", namespace="testing", creation_timestamp="2024-01-01T21:00:00Z"),
     status=V1Alpha1ExporterStatus(
-        endpoint="grpc://example.com:443", credential=V1ObjectReference(name="test-credential"), devices=[]
+        endpoint="grpc://example.com:443",
+        credential=V1ObjectReference(name="test-credential"),
+        devices=[],
+        exporter_status="Available",
     ),
 )
 
@@ -318,7 +321,9 @@ def test_get_clients(_load_kube_config_mock, list_clients_mock: AsyncMock):
             "name": "test-credential"
         },
         "devices": [],
-        "endpoint": "grpc://example.com:443"
+        "endpoint": "grpc://example.com:443",
+        "exporterStatus": "Available",
+        "statusMessage": null
     }
 }
 """
@@ -334,6 +339,8 @@ def test_get_clients(_load_kube_config_mock, list_clients_mock: AsyncMock):
     name: test-credential
   devices: []
   endpoint: grpc://example.com:443
+  exporterStatus: Available
+  statusMessage: null
 
 """
 
@@ -348,6 +355,7 @@ def test_get_exporter(_load_kube_config_mock, get_exporter_mock: AsyncMock):
     result = runner.invoke(get, ["exporter", "test"])
     assert result.exit_code == 0
     assert "test" in result.output
+    assert "Available" in result.output
     assert "grpc://example.com:443" in result.output
     get_exporter_mock.reset_mock()
 
@@ -396,6 +404,7 @@ def test_get_exporter(_load_kube_config_mock, get_exporter_mock: AsyncMock):
             V1Alpha1ExporterDevice(labels={"hardware": "rpi4"}, uuid="82a8ac0d-d7ff-4009-8948-18a3c5c607b1"),
             V1Alpha1ExporterDevice(labels={"hardware": "rpi4"}, uuid="f7cd30ac-64a3-42c6-ba31-b25f033b97c1"),
         ],
+        exporter_status="Available",
     ),
 )
 
@@ -425,7 +434,9 @@ def test_get_exporter(_load_kube_config_mock, get_exporter_mock: AsyncMock):
                 "uuid": "f7cd30ac-64a3-42c6-ba31-b25f033b97c1"
             }
         ],
-        "endpoint": "grpc://example.com:443"
+        "endpoint": "grpc://example.com:443",
+        "exporterStatus": "Available",
+        "statusMessage": null
     }
 }
 """
@@ -447,6 +458,8 @@ def test_get_exporter(_load_kube_config_mock, get_exporter_mock: AsyncMock):
       hardware: rpi4
     uuid: f7cd30ac-64a3-42c6-ba31-b25f033b97c1
   endpoint: grpc://example.com:443
+  exporterStatus: Available
+  statusMessage: null
 
 """
 
@@ -460,6 +473,7 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
     result = runner.invoke(get, ["exporter", "test", "--devices"])
     assert result.exit_code == 0
     assert "test" in result.output
+    assert "Available" in result.output
     assert "grpc://example.com:443" in result.output
     assert "hardware:rpi4" in result.output
     assert "82a8ac0d-d7ff-4009-8948-18a3c5c607b1" in result.output
@@ -510,6 +524,7 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
                 endpoint="grpc://example.com:443",
                 credential=V1ObjectReference(name="test-credential"),
                 devices=[],
+                exporter_status="Available",
             ),
         ),
         V1Alpha1Exporter(
@@ -520,6 +535,7 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
                 endpoint="grpc://example.com:443",
                 credential=V1ObjectReference(name="another-credential"),
                 devices=[],
+                exporter_status="Available",
             ),
         ),
     ]
@@ -541,7 +557,9 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
                     "name": "test-credential"
                 },
                 "devices": [],
-                "endpoint": "grpc://example.com:443"
+                "endpoint": "grpc://example.com:443",
+                "exporterStatus": "Available",
+                "statusMessage": null
             }
         },
         {
@@ -557,7 +575,9 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
                     "name": "another-credential"
                 },
                 "devices": [],
-                "endpoint": "grpc://example.com:443"
+                "endpoint": "grpc://example.com:443",
+                "exporterStatus": "Available",
+                "statusMessage": null
             }
         }
     ],
@@ -578,6 +598,8 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
       name: test-credential
     devices: []
     endpoint: grpc://example.com:443
+    exporterStatus: Available
+    statusMessage: null
 - apiVersion: jumpstarter.dev/v1alpha1
   kind: Exporter
   metadata:
@@ -589,6 +611,8 @@ def test_get_exporter_devices(_load_kube_config_mock, get_exporter_mock: AsyncMo
       name: another-credential
     devices: []
     endpoint: grpc://example.com:443
+    exporterStatus: Available
+    statusMessage: null
 kind: ExporterList
 
 """
@@ -609,6 +633,7 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
     assert result.exit_code == 0
     assert "test" in result.output
     assert "another" in result.output
+    assert "Available" in result.output
     list_exporters_mock.reset_mock()
 
     # List exporters JSON output
@@ -655,6 +680,7 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
                 devices=[
                     V1Alpha1ExporterDevice(labels={"hardware": "rpi4"}, uuid="82a8ac0d-d7ff-4009-8948-18a3c5c607b1")
                 ],
+                exporter_status="Available",
             ),
         ),
         V1Alpha1Exporter(
@@ -667,6 +693,7 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
                 devices=[
                     V1Alpha1ExporterDevice(labels={"hardware": "rpi4"}, uuid="f7cd30ac-64a3-42c6-ba31-b25f033b97c1"),
                 ],
+                exporter_status="Available",
             ),
         ),
     ]
@@ -695,7 +722,9 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
                         "uuid": "82a8ac0d-d7ff-4009-8948-18a3c5c607b1"
                     }
                 ],
-                "endpoint": "grpc://example.com:443"
+                "endpoint": "grpc://example.com:443",
+                "exporterStatus": "Available",
+                "statusMessage": null
             }
         },
         {
@@ -718,7 +747,9 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
                         "uuid": "f7cd30ac-64a3-42c6-ba31-b25f033b97c1"
                     }
                 ],
-                "endpoint": "grpc://example.com:443"
+                "endpoint": "grpc://example.com:443",
+                "exporterStatus": "Available",
+                "statusMessage": null
             }
         }
     ],
@@ -742,6 +773,8 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
         hardware: rpi4
       uuid: 82a8ac0d-d7ff-4009-8948-18a3c5c607b1
     endpoint: grpc://example.com:443
+    exporterStatus: Available
+    statusMessage: null
 - apiVersion: jumpstarter.dev/v1alpha1
   kind: Exporter
   metadata:
@@ -756,6 +789,8 @@ def test_get_exporters(_load_kube_config_mock, list_exporters_mock: AsyncMock):
         hardware: rpi4
       uuid: f7cd30ac-64a3-42c6-ba31-b25f033b97c1
     endpoint: grpc://example.com:443
+    exporterStatus: Available
+    statusMessage: null
 kind: ExporterList
 
 """
@@ -774,6 +809,7 @@ def test_get_exporters_devices(_load_kube_config_mock, list_exporters_mock: Asyn
     assert result.exit_code == 0
     assert "test" in result.output
     assert "another" in result.output
+    assert "Available" in result.output
     assert "hardware:rpi4" in result.output
     assert "82a8ac0d-d7ff-4009-8948-18a3c5c607b1" in result.output
     assert "f7cd30ac-64a3-42c6-ba31-b25f033b97c1" in result.output

packages/jumpstarter-cli/jumpstarter_cli/get.py

@@ -21,8 +21,8 @@ def get():
 @opt_output_all
 @opt_comma_separated(
     "with",
-    {"leases", "online"},
-    help_text="Include fields: leases, online (comma-separated or repeated)"
+    {"leases", "online", "status"},
+    help_text="Include fields: leases, online, status (comma-separated or repeated)",
 )
 @handle_exceptions_with_reauthentication(relogin_client)
 def get_exporters(config, selector: str | None, output: OutputType, with_options: list[str]):
@@ -32,7 +32,10 @@ def get_exporters(config, selector: str | None, output: OutputType, with_options
 
     include_leases = "leases" in with_options
     include_online = "online" in with_options
-    exporters = config.list_exporters(filter=selector, include_leases=include_leases, include_online=include_online)
+    include_status = "status" in with_options
+    exporters = config.list_exporters(
+        filter=selector, include_leases=include_leases, include_online=include_online, include_status=include_status
+    )
 
     model_print(exporters, output)
 

packages/jumpstarter-cli/jumpstarter_cli/run.py

@@ -76,11 +76,22 @@ async def signal_handler():
                 except* Exception as excgroup:
                     _handle_exporter_exceptions(excgroup)
 
+                # Check if exporter set an exit code (e.g., from hook failure with on_failure='exit')
+                exporter_exit_code = exporter.exit_code
+
             # Cancel the signal handler after exporter completes
             signal_tg.cancel_scope.cancel()
 
-        # Return signal number if received, otherwise 0 for immediate restart
-        return received_signal if received_signal else 0
+        # Return exit code in priority order:
+        # 1. Signal number if received (for signal-based termination)
+        # 2. Exporter's exit code if set (for hook failure with on_failure='exit')
+        # 3. 0 for immediate restart (normal exit without signal or explicit exit code)
+        if received_signal:
+            return received_signal
+        elif exporter_exit_code is not None:
+            return exporter_exit_code
+        else:
+            return 0
 
     sys.exit(anyio.run(serve_with_graceful_shutdown))
 

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/exporters.py

@@ -26,6 +26,8 @@ class V1Alpha1ExporterStatus(JsonBaseModel):
     credential: SerializeV1ObjectReference
     devices: list[V1Alpha1ExporterDevice]
     endpoint: str
+    exporter_status: str | None = Field(alias="exporterStatus", default=None)
+    status_message: str | None = Field(alias="statusMessage", default=None)
 
 
 class V1Alpha1Exporter(JsonBaseModel):
@@ -55,24 +57,29 @@ def from_dict(dict: dict):
                 devices=[V1Alpha1ExporterDevice(labels=d["labels"], uuid=d["uuid"]) for d in dict["status"]["devices"]]
                 if "devices" in dict["status"]
                 else [],
+                exporter_status=dict["status"].get("exporterStatus"),
+                status_message=dict["status"].get("statusMessage"),
             ),
         )
 
     @classmethod
     def rich_add_columns(cls, table, devices: bool = False):
         if devices:
             table.add_column("NAME", no_wrap=True)
+            table.add_column("STATUS")
             table.add_column("ENDPOINT")
             table.add_column("AGE")
             table.add_column("LABELS")
             table.add_column("UUID")
         else:
             table.add_column("NAME", no_wrap=True)
+            table.add_column("STATUS")
             table.add_column("ENDPOINT")
             table.add_column("DEVICES")
             table.add_column("AGE")
 
     def rich_add_rows(self, table, devices: bool = False):
+        status = self.status.exporter_status if self.status else "Unknown"
         if devices:
             if self.status is not None:
                 for d in self.status.devices:
@@ -82,6 +89,7 @@ def rich_add_rows(self, table, devices: bool = False):
                             labels.append(f"{label}:{str(d.labels[label])}")
                     table.add_row(
                         self.metadata.name,
+                        status or "Unknown",
                         self.status.endpoint,
                         time_since(self.metadata.creation_timestamp),
                         ",".join(labels),
@@ -91,6 +99,7 @@ def rich_add_rows(self, table, devices: bool = False):
         else:
             table.add_row(
                 self.metadata.name,
+                status or "Unknown",
                 self.status.endpoint,
                 str(len(self.status.devices) if self.status and self.status.devices else 0),
                 time_since(self.metadata.creation_timestamp),