Skip to content

Route job starts to their target #50

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
plotnick merged 1 commit into from
Aug 15, 2026
Merged

Route job starts to their target #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 6 deletions api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ pub trait SushApi {
// Job management.

/// Start an authorized job.
#[endpoint { method = POST, path = "/jobs/{job_id}/start" }]
#[endpoint { method = POST, path = "/jobs/{job_id}/start/{target}" }]
async fn job_start(
ctx: RequestContext<Self::Context>,
headers: Header<Authorization>,
params: PathParams<JobIdParam>,
params: PathParams<JobTargetParams>,
query: QueryParams<JobStartParams>,
body: TypedBody<SignedJob>,
) -> Result<HttpResponseUpdatedNoContent, HttpError>;
Expand Down Expand Up @@ -208,7 +208,7 @@ pub trait SushApi {
async fn job_attach(
ctx: RequestContext<Self::Context>,
headers: Header<Authorization>,
params: PathParams<JobAttachParams>,
params: PathParams<JobTargetParams>,
query: QueryParams<RoutingParam>,
upgrade: WebsocketUpgrade,
) -> WebsocketEndpointResult;
Expand Down Expand Up @@ -303,11 +303,11 @@ pub struct JobIdParam {
}

#[derive(Deserialize, JsonSchema)]
pub struct JobAttachParams {
/// Which job to attach to.
pub struct JobTargetParams {
/// Which job to act on.
pub job_id: JobId,

/// To be used by Nexus for routing.
/// Used by proxies for routing.
pub target: String,
}

Expand Down
3 changes: 2 additions & 1 deletion client/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,10 +1229,11 @@ async fn job_start(
max_fsize,
} = limits.as_limits();
let mut start_ctx = ctx.clone();
let start = with_login(&mut start_ctx, client, async || {
let start = with_login_via(&mut start_ctx, client, Some(&target), async || {
let mut start = client
.job_start()
.job_id(job.job_id())
.target(target.to_string())
.max_cpu(max_cpu)
.max_mem(max_mem)
.max_fsize(max_fsize)
Expand Down
7 changes: 6 additions & 1 deletion server/src/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fn named_target<B>(request: &Request<B>) -> Option<Result<Target, String>> {
let uri = request.uri();
let segments: Vec<&str> = uri.path().trim_start_matches('/').split('/').collect();
let named = match segments.as_slice() {
["jobs", _, "output" | "attach", target, ..] if *target != "*" => Some(*target),
["jobs", _, "attach" | "output" | "start", target, ..] if *target != "*" => Some(*target),
_ => uri.query().and_then(|query| {
query.split('&').find_map(|param| {
param
Expand Down Expand Up @@ -431,6 +431,11 @@ mod test {
named_target(&request("/jobs/some-job/output/test%20part:0000/stdout")),
Some(Ok(target("test part:0000"))),
);
assert_eq!(
named_target(&request("/jobs/some-job/start/test%20part:0000")),
Some(Ok(target("test part:0000"))),
);
assert_eq!(named_target(&request("/jobs/some-job/start/*")), None);
assert_eq!(
named_target(&request("/jobs/some-job/attach/test%20part:0000")),
Some(Ok(target("test part:0000"))),
Expand Down
14 changes: 7 additions & 7 deletions server/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ use x509_cert::Certificate;
use x509_cert::der::DecodePem as _;

use sush_api::{
AccessParam, Authorization, AuthorizedRangeRequest, JobAttachParams, JobHistoryParams,
JobIdParam, JobOutputParams, JobStartParams, JobStopParams, KeyIdParam, RoutingParam,
AccessParam, Authorization, AuthorizedRangeRequest, JobHistoryParams, JobIdParam,
JobOutputParams, JobStartParams, JobStopParams, JobTargetParams, KeyIdParam, RoutingParam,
SessionAndJobIds, SessionAndKeyIds, SessionIdParam, SushApi, WaitParam,
};
use sush_common::authn::Identity;
Expand Down Expand Up @@ -257,7 +257,7 @@ impl SushApi for ApiServer {
async fn job_start(
ctx: RequestContext<Self::Context>,
headers: Header<Authorization>,
params: PathParams<JobIdParam>,
params: PathParams<JobTargetParams>,
query: QueryParams<JobStartParams>,
body: TypedBody<SignedJob>,
) -> Result<HttpResponseUpdatedNoContent, HttpError> {
Expand All @@ -266,13 +266,13 @@ impl SushApi for ApiServer {
let authn = mgr
.iam(authorization, None, request_line(&ctx.request))
.await?;
let JobIdParam { job_id } = params.into_inner();
let JobTargetParams { job_id, target: _ } = params.into_inner();
let job = body.into_inner();
if *job.job_id() != job_id {
return Err(HttpError::for_client_error(
None,
ClientErrorStatusCode::BAD_REQUEST,
String::from("Query parameter job ID does not match body"),
String::from("Path parameter job ID does not match body"),
));
}
mgr.job_start(&authn, job, query.into_inner()).await?;
Expand Down Expand Up @@ -355,7 +355,7 @@ impl SushApi for ApiServer {
async fn job_attach(
ctx: RequestContext<Self::Context>,
headers: Header<Authorization>,
params: PathParams<JobAttachParams>,
params: PathParams<JobTargetParams>,
_query: QueryParams<RoutingParam>,
upgrade: WebsocketUpgrade,
) -> WebsocketEndpointResult {
Expand All @@ -364,7 +364,7 @@ impl SushApi for ApiServer {
let authn = mgr
.iam(authorization, None, request_line(&ctx.request))
.await?;
let JobAttachParams { job_id, target } = params.into_inner();
let JobTargetParams { job_id, target } = params.into_inner();
let target = if target == "*" {
mgr.own_baseboard().clone()
} else {
Expand Down
16 changes: 13 additions & 3 deletions sush.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions tests/src/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ async fn client_server() {
client
.job_start()
.job_id(job_id)
.target("*")
.max_cpu(max_cpu)
.max_mem(max_mem)
.max_fsize(max_fsize)
Expand Down Expand Up @@ -217,6 +218,7 @@ async fn client_proxy_server() {
client
.job_start()
.job_id(job_id)
.target(test_baseboard_id().to_string())
.max_cpu(max_cpu)
.max_mem(max_mem)
.max_fsize(max_fsize)
Expand Down Expand Up @@ -566,6 +568,7 @@ async fn interactive_job() {
client
.job_start()
.job_id(job_id)
.target(test_baseboard_id().to_string())
.max_cpu(max_cpu)
.max_mem(max_mem)
.max_fsize(max_fsize)
Expand Down