Skip to content

/sys/* route for console system pages #1764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2022
Merged

/sys/* route for console system pages #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b60a8b1
fix populate alpine script
david-crespo Sep 30, 2022
3a5e0c1
add temporary /sys/* path for console system routes
david-crespo Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions nexus/src/external_api/console_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<RequestContext<Arc<ServerContext>>>,
_path_params: Path<RestPathParam>,
) -> Result<Response<Body>, HttpError> {
console_index_or_login_redirect(rqctx).await
}

#[endpoint {
method = GET,
path = "/",
Expand Down
1 change: 1 addition & 0 deletions nexus/src/external_api/http_entrypoints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
Expand Down
1 change: 1 addition & 0 deletions nexus/tests/integration_tests/console_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ async fn test_console_pages(cptestctx: &ControlPlaneTestContext) {
"/",
"/orgs/irrelevant-path",
"/settings/irrelevant-path",
"/sys/irrelevant-path",
"/device/success",
"/device/verify",
];
Expand Down
4 changes: 2 additions & 2 deletions tools/populate/populate-alpine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down