Skip to content

Commit 84fd5ec

Browse files
committed
fix(sandbox): resolve rebase regressions
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 9aa2a40 commit 84fd5ec

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
@@ -27,6 +27,7 @@ mod sidecar_control;
2727
use miette::{IntoDiagnostic, Result, WrapErr};
2828
use std::collections::{BTreeMap, BTreeSet, HashSet};
2929
use std::future::Future;
30+
use std::path::PathBuf;
3031
use std::pin::Pin;
3132
use std::sync::Arc;
3233
#[cfg(target_os = "linux")]
@@ -628,7 +629,7 @@ pub async fn run_sandbox(
628629
retained_proto: retained_proto.clone(),
629630
openshell_endpoint: openshell_endpoint.clone(),
630631
sandbox_id: sandbox_id.clone(),
631-
trusted_ssh_socket_path: std::path::PathBuf::from(trusted_ssh_socket_path),
632+
trusted_ssh_socket_path: PathBuf::from(trusted_ssh_socket_path),
632633
control_publisher: sidecar_control_publisher.clone(),
633634
},
634635
);
@@ -1326,7 +1327,7 @@ struct SidecarEntrypointHandler {
13261327
retained_proto: Option<openshell_core::proto::SandboxPolicy>,
13271328
openshell_endpoint: Option<String>,
13281329
sandbox_id: Option<String>,
1329-
trusted_ssh_socket_path: std::path::PathBuf,
1330+
trusted_ssh_socket_path: PathBuf,
13301331
control_publisher: Option<sidecar_control::Publisher>,
13311332
}
13321333

‎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)