diff --git a/nexus/src/external_api/console_api.rs b/nexus/src/external_api/console_api.rs index ee15844800d..9c7b4d0f8b2 100644 --- a/nexus/src/external_api/console_api.rs +++ b/nexus/src/external_api/console_api.rs @@ -637,6 +637,18 @@ pub async fn console_settings_page( console_index_or_login_redirect(rqctx).await } +#[endpoint { + method = GET, + path = "/sys/{path:.*}", + unpublished = true, +}] +pub async fn console_system_page( + rqctx: Arc>>, + _path_params: Path, +) -> Result, HttpError> { + console_index_or_login_redirect(rqctx).await +} + #[endpoint { method = GET, path = "/", diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs index a0a4c6e50b7..bcc2ffc8bd2 100644 --- a/nexus/src/external_api/http_entrypoints.rs +++ b/nexus/src/external_api/http_entrypoints.rs @@ -253,6 +253,7 @@ pub fn external_api() -> NexusApiDescription { api.register(console_api::console_page)?; api.register(console_api::console_root)?; api.register(console_api::console_settings_page)?; + api.register(console_api::console_system_page)?; api.register(console_api::asset)?; api.register(console_api::login)?; diff --git a/nexus/tests/integration_tests/console_api.rs b/nexus/tests/integration_tests/console_api.rs index 42b1e92c237..7e0bfd0f448 100644 --- a/nexus/tests/integration_tests/console_api.rs +++ b/nexus/tests/integration_tests/console_api.rs @@ -163,6 +163,7 @@ async fn test_console_pages(cptestctx: &ControlPlaneTestContext) { "/", "/orgs/irrelevant-path", "/settings/irrelevant-path", + "/sys/irrelevant-path", "/device/success", "/device/verify", ]; diff --git a/tools/populate/populate-alpine.sh b/tools/populate/populate-alpine.sh index cd1b01e824c..c08dc0c225c 100755 --- a/tools/populate/populate-alpine.sh +++ b/tools/populate/populate-alpine.sh @@ -1,8 +1,8 @@ #!/bin/bash # Simple script to install the alpine image included with propolis. -if ! oxide api images > /dev/null; then - echo "Problem detected running the oxide CLI" +if ! oxide api /system/images > /dev/null; then + echo "Problem detected running the oxide CLI" echo "Please install, set path, or setup authorization" exit 1 fi