Skip to content

Commit bfa8b55

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

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
@@ -17,6 +17,7 @@ mod sidecar_control;
1717
use miette::{IntoDiagnostic, Result, WrapErr};
1818
use std::collections::{BTreeMap, BTreeSet, HashSet};
1919
use std::future::Future;
20+
use std::path::PathBuf;
2021
use std::pin::Pin;
2122
use std::sync::Arc;
2223
#[cfg(target_os = "linux")]
@@ -618,7 +619,7 @@ pub async fn run_sandbox(
618619
retained_proto: retained_proto.clone(),
619620
openshell_endpoint: openshell_endpoint.clone(),
620621
sandbox_id: sandbox_id.clone(),
621-
trusted_ssh_socket_path: std::path::PathBuf::from(trusted_ssh_socket_path),
622+
trusted_ssh_socket_path: PathBuf::from(trusted_ssh_socket_path),
622623
control_publisher: sidecar_control_publisher.clone(),
623624
},
624625
);
@@ -1294,7 +1295,7 @@ struct SidecarEntrypointHandler {
12941295
retained_proto: Option<openshell_core::proto::SandboxPolicy>,
12951296
openshell_endpoint: Option<String>,
12961297
sandbox_id: Option<String>,
1297-
trusted_ssh_socket_path: std::path::PathBuf,
1298+
trusted_ssh_socket_path: PathBuf,
12981299
control_publisher: Option<sidecar_control::Publisher>,
12991300
}
13001301

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2462,6 +2462,7 @@ mod tests {
24622462
let policy = policy_with_process(ProcessPolicy {
24632463
run_as_user: Some(current_user.name.clone()),
24642464
run_as_group: None,
2465+
..Default::default()
24652466
});
24662467
let workspace = ResolvedWorkspace::default();
24672468
let mut cmd = Command::new("/usr/bin/env");

0 commit comments

Comments
 (0)