mirror of
https://github.com/NVIDIA/OpenShell.git
synced 2026-10-30 07:33:59 +08:00
* feat(workspace): implement workspace model (Phase 1 of RFC 0011) Implements workspace and membership model providing hard isolation boundaries for multi-player OpenShell deployments. Workspace CRUD with Kubernetes-style Terminating phase for graceful deletion. All resources scoped by workspace via ObjectMeta. Membership RPCs for workspace access control. Persistence migration shifts name uniqueness to (object_type, workspace, name). Provider profiles support platform and workspace scoping. Service routing uses workspace-prefixed DNS labels. Inference routes renamed and workspace-scoped with DeleteInferenceRoute RPC. Python SDK with WorkspaceClient, two-method list pattern (workspace-scoped and for_all_workspaces), and workspace parameter on all methods. CLI workspace flags, TUI workspace cycling. K8s driver filters unmanaged CRs and uses delete preconditions. Podman driver uses immutable container IDs. Label serialization fixed across all put_if call sites. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(cli): delegate sandbox upload command to existing upload function The standalone `sandbox upload` command reimplemented upload logic inline with two bugs: it used `Path::exists()` which follows symlinks (rejecting dangling symlinks), and it ran git-aware filtering on symlink sources. The `run::sandbox_upload()` function already handles both cases correctly via `sandbox_upload_plan()`. Replace the inline logic with a call to the existing function. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): shorten sandbox names and fix test compatibility Shorten the sandbox name in initial_sparse_policy_is_acknowledged_as_loaded from 'e2e-2159-sparse-enrich' (22 chars) to 'e2e-sparse-enrich' (17 chars) to comply with MAX_ROUTABLE_NAME_LEN (19 chars). Also capture stderr in create_keep_with_args so future sandbox creation failures include the actual CLI error instead of reporting empty output. Signed-off-by: Derek Carr <decarr@redhat.com> * test(workspace): add test coverage for workspace CRUD and persistence isolation Add unit tests for workspace create happy path, get round-trip, get not-found, get empty-name rejection, already-exists error, and resolve_workspace not-found. Add persistence test proving cross-workspace name uniqueness (same name in different workspaces produces separate records). Add workspace name max-length boundary tests. Fix e2e harness to include stderr in name-parse-failure error path. Align Python e2e test_workspace_crud with try/finally pattern. Document provider profile catalog workspace scoping gap in RFC 0011. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(examples): update examples for workspace model compatibility Shorten sandbox names in demo scripts to fit the 19-character MAX_ROUTABLE_NAME_LEN limit: policy-demo prefix to pd-, multi-agent notepad derives a short SANDBOX_TAG from the run ID, governance interceptor uses gs-PID-RANDOM. Update vscode-remote-sandbox.md SSH host aliases from openshell-{name} to openshell-{name}.{workspace} format. Signed-off-by: Derek Carr <decarr@redhat.com> * feat(sdk): add workspace-scoped client and workspace CRUD Add WorkspaceScopedClient modeled after kube::Api::namespaced — captures workspace once and injects it into every sandbox request. Add workspace CRUD methods (create, get, list, delete) and list_sandboxes_all_workspaces on OpenShellClient. Extend SandboxRef with workspace field and add WorkspaceRef type. Include mock tests for all new operations. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(lint): resolve clippy warnings in workspace test assertions Signed-off-by: Derek Carr <decarr@redhat.com> * fix(docs): convert indented code blocks to fenced in RFC 0011 Signed-off-by: Derek Carr <decarr@redhat.com> * fix(lint): resolve clippy warnings and apply cargo fmt across workspace Auto-format with cargo fmt and fix clippy warnings exposed by the reformat: unnecessary qualifications, map_unwrap_or, identical match arms, unused variable prefix, dead code annotations, and let-unit-value in e2e harness. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): address workspace scoping issues from review - Add workspace field to settings JSON output (CLI) - Skip Podman containers missing workspace label instead of defaulting to empty string, matching K8s driver behavior - Add resource_version to list_by_scope SELECT in both SQLite and Postgres backends, with regression test - Gate PolicyLocalContext proposal/lookup routes on workspace readiness, returning 503 when workspace is not yet discovered - Block sandbox and provider creation in TUI all-workspaces mode - Clear workspace vectors in TUI reset_sandbox_state Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): make provider profile catalog workspace-aware Thread workspace through snapshot_catalog so the EffectiveProviderProfileCatalog enforces workspace boundaries on both read and write paths. UserProviderProfileSource now loads platform-scoped profiles (workspace "") plus the target workspace's profiles, preventing cross-workspace duplicate profile ID collisions that previously caused global catalog failures. Update RFC 0011 to reflect catalog scoping is implemented in Phase 1 rather than deferred to future work. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(persistence): include workspace column in atomic policy revision INSERT put_policy_revision_atomic omitted the workspace column from the INSERT into the objects table in both SQLite and Postgres backends, causing atomically-written policy revisions to lose their workspace association. Add workspace field to AtomicPolicyRevisionWrite and thread it through both backend INSERT statements, matching the non-atomic put_policy_revision path which already included it. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(proxy): skip ancestor walk when socket owner is the entrypoint collect_ancestor_identities walked the entire process tree above the entrypoint when the connecting process was the entrypoint itself, SHA256-hashing every ancestor binary (IDE, shell, container runtime). On dev machines with large binaries in the ancestor chain this exceeded the 30-second test timeout. When start_pid == stop_pid there are no intermediate ancestors to verify, so return an empty list immediately. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): make provider profile catalog scope-aware Allow the same profile ID at platform and workspace scopes by introducing layered catalog entries where workspace profiles shadow platform profiles. Add source and scope fields to the ProviderProfile proto and CLI output. Migrate List/Get handlers to the catalog, fixing divergence with runtime profile resolution. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): align podman e2e labels with centralized driver constants The podman driver moved its container labels to the centralized openshell.ai/ prefix, but the e2e test harness and cleanup script still referenced the old openshell.sandbox-* keys, causing the local_driver_token_restart test to fail on container lookup. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): align python profile isolation test with scope-aware catalog Platform profiles are now visible in workspace listings as fallbacks per the layered catalog design. Update the assertion to match. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): honor profile_workspace in runtime profile resolution Runtime profile lookups now consult provider.profile_workspace via get_type_profile_for_scope. Providers created with --global-profile (profile_workspace="") resolve to the platform profile even when a workspace profile shadows the same ID. All 6 runtime call sites updated; type-only call sites remain scope-agnostic. Signed-off-by: Derek Carr <decarr@redhat.com> --------- Signed-off-by: Derek Carr <decarr@redhat.com>
396 lines
13 KiB
Rust
396 lines
13 KiB
Rust
// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
#![cfg(feature = "e2e")]
|
|
|
|
//! Local-driver E2E regression for sandbox supervisor restart from bootstrap
|
|
//! JWT material. Docker and Podman supervisors reload their mounted token file
|
|
//! after a container restart. VM sandboxes reboot from persisted driver state
|
|
//! after the VM driver restarts. Local single-player gateway configs should
|
|
//! mint that token with `exp = 0` so reconnect does not depend on token refresh.
|
|
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use std::process::Stdio;
|
|
use std::time::{Duration, Instant};
|
|
|
|
use base64::Engine as _;
|
|
use openshell_e2e::harness::cli::{wait_for_healthy, wait_for_sandbox_exec_contains};
|
|
use openshell_e2e::harness::container::{ContainerEngine, e2e_driver};
|
|
use openshell_e2e::harness::gateway::ManagedGateway;
|
|
use openshell_e2e::harness::sandbox::SandboxGuard;
|
|
use prost::Message;
|
|
use tokio::time::sleep;
|
|
|
|
const READY_MARKER: &str = "local-driver-token-restart-ready";
|
|
const RESTART_FILE: &str = "/sandbox/local-driver-token-restart-state";
|
|
const CONTAINER_TOKEN_MOUNT_PATH: &str = "/etc/openshell/auth/sandbox.jwt";
|
|
const VM_STATE_DIR_ENV: &str = "OPENSHELL_E2E_VM_STATE_DIR";
|
|
|
|
#[derive(Clone, PartialEq, Message)]
|
|
struct PersistedDriverSandbox {
|
|
#[prost(string, tag = "2")]
|
|
name: String,
|
|
#[prost(message, optional, tag = "4")]
|
|
spec: Option<PersistedDriverSandboxSpec>,
|
|
}
|
|
|
|
#[derive(Clone, PartialEq, Message)]
|
|
struct PersistedDriverSandboxSpec {
|
|
#[prost(string, tag = "11")]
|
|
sandbox_token: String,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
enum LocalDriver {
|
|
Docker,
|
|
Podman,
|
|
Vm,
|
|
}
|
|
|
|
impl LocalDriver {
|
|
fn from_env() -> Option<Self> {
|
|
match e2e_driver().as_deref() {
|
|
Some("docker") => Some(Self::Docker),
|
|
Some("podman") => Some(Self::Podman),
|
|
Some("vm") => Some(Self::Vm),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn is_container(self) -> bool {
|
|
matches!(self, Self::Docker | Self::Podman)
|
|
}
|
|
|
|
fn container_filters(self, namespace: &str, sandbox_name: &str) -> Vec<String> {
|
|
match self {
|
|
Self::Docker => vec![
|
|
"label=openshell.ai/managed-by=openshell".to_string(),
|
|
format!("label=openshell.ai/sandbox-namespace={namespace}"),
|
|
format!("label=openshell.ai/sandbox-name={sandbox_name}"),
|
|
],
|
|
Self::Podman => vec![
|
|
"label=openshell.managed=true".to_string(),
|
|
format!("label=openshell.ai/sandbox-name={sandbox_name}"),
|
|
],
|
|
Self::Vm => Vec::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn run_engine(engine: &ContainerEngine, args: &[String]) -> Result<String, String> {
|
|
let output = engine
|
|
.command()
|
|
.args(args)
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.output()
|
|
.map_err(|err| format!("failed to run {} {}: {err}", engine.name(), args.join(" ")))?;
|
|
let stdout = String::from_utf8_lossy(&output.stdout);
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
let combined = format!("{stdout}{stderr}");
|
|
if !output.status.success() {
|
|
return Err(format!(
|
|
"{} {} failed (exit {:?}):\n{combined}",
|
|
engine.name(),
|
|
args.join(" "),
|
|
output.status.code()
|
|
));
|
|
}
|
|
Ok(stdout.trim().to_string())
|
|
}
|
|
|
|
fn sandbox_container_id(
|
|
engine: &ContainerEngine,
|
|
driver: LocalDriver,
|
|
namespace: &str,
|
|
sandbox_name: &str,
|
|
) -> Result<String, String> {
|
|
let mut args = vec!["ps".to_string(), "-aq".to_string()];
|
|
for filter in driver.container_filters(namespace, sandbox_name) {
|
|
args.push("--filter".to_string());
|
|
args.push(filter);
|
|
}
|
|
|
|
let stdout = run_engine(engine, &args)?;
|
|
let ids = stdout
|
|
.lines()
|
|
.map(str::trim)
|
|
.filter(|line| !line.is_empty())
|
|
.collect::<Vec<_>>();
|
|
match ids.as_slice() {
|
|
[id] => Ok((*id).to_string()),
|
|
[] => Err(format!(
|
|
"no {driver:?} container found for sandbox '{sandbox_name}' in namespace '{namespace}'"
|
|
)),
|
|
_ => Err(format!(
|
|
"multiple {driver:?} containers found for sandbox '{sandbox_name}' in namespace '{namespace}': {ids:?}"
|
|
)),
|
|
}
|
|
}
|
|
|
|
fn container_running(engine: &ContainerEngine, container_id: &str) -> Result<bool, String> {
|
|
let output = run_engine(
|
|
engine,
|
|
&[
|
|
"inspect".to_string(),
|
|
"-f".to_string(),
|
|
"{{.State.Running}}".to_string(),
|
|
container_id.to_string(),
|
|
],
|
|
)?;
|
|
match output.trim() {
|
|
"true" => Ok(true),
|
|
"false" => Ok(false),
|
|
other => Err(format!(
|
|
"unexpected running state for container {container_id}: {other}"
|
|
)),
|
|
}
|
|
}
|
|
|
|
async fn wait_for_container_running(
|
|
engine: &ContainerEngine,
|
|
container_id: &str,
|
|
expected: bool,
|
|
timeout: Duration,
|
|
) -> Result<(), String> {
|
|
let start = Instant::now();
|
|
|
|
loop {
|
|
let last_state = match container_running(engine, container_id) {
|
|
Ok(running) if running == expected => return Ok(()),
|
|
Ok(running) => format!("running={running}"),
|
|
Err(err) => err,
|
|
};
|
|
|
|
if start.elapsed() > timeout {
|
|
return Err(format!(
|
|
"container {container_id} did not reach running={expected} within {}s. Last state: {last_state}",
|
|
timeout.as_secs()
|
|
));
|
|
}
|
|
sleep(Duration::from_secs(1)).await;
|
|
}
|
|
}
|
|
|
|
fn read_bootstrap_token(engine: &ContainerEngine, container_id: &str) -> Result<String, String> {
|
|
run_engine(
|
|
engine,
|
|
&[
|
|
"exec".to_string(),
|
|
container_id.to_string(),
|
|
"cat".to_string(),
|
|
CONTAINER_TOKEN_MOUNT_PATH.to_string(),
|
|
],
|
|
)
|
|
}
|
|
|
|
fn read_vm_bootstrap_token(sandbox_name: &str) -> Result<String, String> {
|
|
let state_dir = std::env::var_os(VM_STATE_DIR_ENV)
|
|
.map(PathBuf::from)
|
|
.ok_or_else(|| format!("{VM_STATE_DIR_ENV} must be set for VM restart coverage"))?;
|
|
let sandboxes_dir = state_dir.join("sandboxes");
|
|
let entries = fs::read_dir(&sandboxes_dir)
|
|
.map_err(|err| format!("read VM sandboxes dir '{}': {err}", sandboxes_dir.display()))?;
|
|
|
|
let mut decoded_names = Vec::new();
|
|
for entry in entries {
|
|
let entry = entry.map_err(|err| {
|
|
format!(
|
|
"read VM sandbox dir entry under '{}': {err}",
|
|
sandboxes_dir.display()
|
|
)
|
|
})?;
|
|
let request_path = entry.path().join("sandbox.pb");
|
|
let bytes = match fs::read(&request_path) {
|
|
Ok(bytes) => bytes,
|
|
Err(err) if err.kind() == std::io::ErrorKind::NotFound => continue,
|
|
Err(err) => {
|
|
return Err(format!(
|
|
"read VM sandbox request '{}': {err}",
|
|
request_path.display()
|
|
));
|
|
}
|
|
};
|
|
|
|
let sandbox = PersistedDriverSandbox::decode(bytes.as_slice()).map_err(|err| {
|
|
format!(
|
|
"decode VM sandbox request '{}': {err}",
|
|
request_path.display()
|
|
)
|
|
})?;
|
|
decoded_names.push(sandbox.name.clone());
|
|
if sandbox.name != sandbox_name {
|
|
continue;
|
|
}
|
|
|
|
let spec = sandbox
|
|
.spec
|
|
.ok_or_else(|| format!("VM sandbox '{sandbox_name}' is missing driver spec"))?;
|
|
if spec.sandbox_token.trim().is_empty() {
|
|
return Err(format!(
|
|
"VM sandbox '{sandbox_name}' persisted driver spec has no sandbox token"
|
|
));
|
|
}
|
|
return Ok(spec.sandbox_token);
|
|
}
|
|
|
|
Err(format!(
|
|
"no VM sandbox request found for '{sandbox_name}' under '{}'. Decoded sandbox names: {decoded_names:?}",
|
|
sandboxes_dir.display()
|
|
))
|
|
}
|
|
|
|
fn token_exp_claim(token: &str) -> Result<i64, String> {
|
|
let payload_b64 = token
|
|
.trim()
|
|
.split('.')
|
|
.nth(1)
|
|
.ok_or_else(|| "sandbox JWT has no payload segment".to_string())?;
|
|
let payload = base64::engine::general_purpose::URL_SAFE_NO_PAD
|
|
.decode(payload_b64)
|
|
.map_err(|err| format!("failed to decode sandbox JWT payload: {err}"))?;
|
|
let claims: serde_json::Value = serde_json::from_slice(&payload)
|
|
.map_err(|err| format!("failed to parse sandbox JWT claims: {err}"))?;
|
|
claims
|
|
.get("exp")
|
|
.and_then(serde_json::Value::as_i64)
|
|
.ok_or_else(|| format!("sandbox JWT missing integer exp claim: {claims}"))
|
|
}
|
|
|
|
fn require_non_expiring_token(token: &str, context: &str) -> Result<(), String> {
|
|
let exp = token_exp_claim(token)?;
|
|
if exp != 0 {
|
|
return Err(format!("{context} should use exp=0, got exp={exp}"));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
async fn restart_container_sandbox(
|
|
engine: &ContainerEngine,
|
|
driver: LocalDriver,
|
|
namespace: &str,
|
|
sandbox_name: &str,
|
|
) -> Result<(), String> {
|
|
let container_id = sandbox_container_id(engine, driver, namespace, sandbox_name)?;
|
|
let token = read_bootstrap_token(engine, &container_id)?;
|
|
require_non_expiring_token(&token, "local-driver bootstrap JWT")?;
|
|
|
|
run_engine(engine, &["stop".to_string(), container_id.clone()])?;
|
|
wait_for_container_running(engine, &container_id, false, Duration::from_secs(60)).await?;
|
|
|
|
run_engine(engine, &["start".to_string(), container_id.clone()])?;
|
|
wait_for_container_running(engine, &container_id, true, Duration::from_secs(60)).await
|
|
}
|
|
|
|
async fn restart_vm_sandbox(gateway: &ManagedGateway, sandbox_name: &str) -> Result<(), String> {
|
|
let token = read_vm_bootstrap_token(sandbox_name)?;
|
|
require_non_expiring_token(&token, "VM bootstrap JWT")?;
|
|
|
|
gateway.stop()?;
|
|
gateway.start()?;
|
|
wait_for_healthy(Duration::from_secs(120)).await
|
|
}
|
|
|
|
async fn wait_for_driver_reconnect(driver: LocalDriver, sandbox_name: &str) -> Result<(), String> {
|
|
match driver {
|
|
LocalDriver::Docker | LocalDriver::Podman => {
|
|
wait_for_sandbox_exec_contains(
|
|
sandbox_name,
|
|
&["cat", RESTART_FILE],
|
|
"before-local-driver-restart",
|
|
Duration::from_secs(240),
|
|
)
|
|
.await
|
|
}
|
|
LocalDriver::Vm => {
|
|
wait_for_sandbox_exec_contains(
|
|
sandbox_name,
|
|
&["echo", "vm-reconnect-ok"],
|
|
"vm-reconnect-ok",
|
|
Duration::from_secs(240),
|
|
)
|
|
.await
|
|
}
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn local_driver_sandbox_restarts_with_non_expiring_bootstrap_jwt() {
|
|
let Some(driver) = LocalDriver::from_env() else {
|
|
eprintln!(
|
|
"Skipping local-driver token restart test: e2e driver is not Docker, Podman, or VM"
|
|
);
|
|
return;
|
|
};
|
|
let namespace = if driver.is_container() {
|
|
let Some(namespace) = std::env::var("OPENSHELL_E2E_SANDBOX_NAMESPACE")
|
|
.ok()
|
|
.filter(|value| !value.trim().is_empty())
|
|
else {
|
|
eprintln!(
|
|
"Skipping local-driver token restart test: OPENSHELL_E2E_SANDBOX_NAMESPACE is unavailable"
|
|
);
|
|
return;
|
|
};
|
|
Some(namespace)
|
|
} else {
|
|
None
|
|
};
|
|
let engine = if driver.is_container() {
|
|
Some(
|
|
ContainerEngine::from_env()
|
|
.unwrap_or_else(|err| panic!("resolve e2e container engine: {err}")),
|
|
)
|
|
} else {
|
|
None
|
|
};
|
|
let gateway = if driver == LocalDriver::Vm {
|
|
let Some(gateway) = ManagedGateway::from_env().expect("load managed e2e gateway metadata")
|
|
else {
|
|
eprintln!(
|
|
"Skipping local-driver token restart test: VM e2e gateway is not managed by this test run"
|
|
);
|
|
return;
|
|
};
|
|
Some(gateway)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
wait_for_healthy(Duration::from_secs(30))
|
|
.await
|
|
.expect("gateway should start healthy");
|
|
|
|
let script = format!(
|
|
"echo before-local-driver-restart > {RESTART_FILE}; echo {READY_MARKER}; while true; do sleep 1; done"
|
|
);
|
|
let mut sandbox = SandboxGuard::create_keep(&["sh", "-lc", &script], READY_MARKER)
|
|
.await
|
|
.expect("create long-running local-driver sandbox");
|
|
|
|
match driver {
|
|
LocalDriver::Docker | LocalDriver::Podman => {
|
|
let engine = engine.as_ref().expect("container engine should be set");
|
|
let namespace = namespace
|
|
.as_deref()
|
|
.expect("container namespace should be set");
|
|
restart_container_sandbox(engine, driver, namespace, &sandbox.name)
|
|
.await
|
|
.expect("restart sandbox container");
|
|
}
|
|
LocalDriver::Vm => {
|
|
let gateway = gateway.as_ref().expect("managed VM gateway should be set");
|
|
restart_vm_sandbox(gateway, &sandbox.name)
|
|
.await
|
|
.expect("restart e2e VM gateway");
|
|
}
|
|
}
|
|
|
|
wait_for_driver_reconnect(driver, &sandbox.name)
|
|
.await
|
|
.expect("sandbox supervisor should reconnect after local-driver restart");
|
|
|
|
sandbox.cleanup().await;
|
|
}
|