Skip to content

Commit e30634c

Browse files
committed
fix(sandbox): resolve rebase regressions
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 4da6b05 commit e30634c

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

crates/openshell-sandbox/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ mod sidecar_control;
2828
use miette::{IntoDiagnostic, Result, WrapErr};
2929
use std::collections::{BTreeMap, BTreeSet, HashSet};
3030
use std::future::Future;
31+
use std::path::PathBuf;
3132
use std::pin::Pin;
3233
use std::sync::Arc;
3334
#[cfg(target_os = "linux")]
@@ -674,7 +675,7 @@ pub async fn run_sandbox(
674675
retained_proto: retained_proto.clone(),
675676
openshell_endpoint: openshell_endpoint.clone(),
676677
sandbox_id: sandbox_id.clone(),
677-
trusted_ssh_socket_path: std::path::PathBuf::from(trusted_ssh_socket_path),
678+
trusted_ssh_socket_path: PathBuf::from(trusted_ssh_socket_path),
678679
control_publisher: sidecar_control_publisher.clone(),
679680
supervisor_session_updates: supervisor_session_updates.clone(),
680681
},
@@ -1382,7 +1383,7 @@ struct SidecarEntrypointHandler {
13821383
retained_proto: Option<openshell_core::proto::SandboxPolicy>,
13831384
openshell_endpoint: Option<String>,
13841385
sandbox_id: Option<String>,
1385-
trusted_ssh_socket_path: std::path::PathBuf,
1386+
trusted_ssh_socket_path: PathBuf,
13861387
control_publisher: Option<sidecar_control::Publisher>,
13871388
supervisor_session_updates: tokio::sync::watch::Sender<Option<String>>,
13881389
}

crates/openshell-supervisor-process/src/process.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2469,6 +2469,7 @@ mod tests {
24692469
let policy = policy_with_process(ProcessPolicy {
24702470
run_as_user: Some(current_user.name.clone()),
24712471
run_as_group: None,
2472+
..Default::default()
24722473
});
24732474
let workspace = ResolvedWorkspace::default();
24742475
let mut cmd = Command::new("/usr/bin/env");

0 commit comments

Comments
 (0)