fix(docker): resolve rebase regressions

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

crates/openshell-driver-docker/src/lib.rs

@@ -59,7 +59,6 @@ use openshell_core::proto_struct::{
 use openshell_core::{Error, Result as CoreResult};
 use opentelemetry::trace::TraceContextExt as _;
 use std::collections::{HashMap, HashSet};
-use std::future::Future;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
@@ -978,12 +977,6 @@ impl DockerComputeDriver {
             image.ref = %template.image,
         ))
         .await?;
-        let token_file_created = write_sandbox_token_file(sandbox, &self.config)
-            .await
-            .map_err(|status| {
-                DockerProvisioningFailure::new("SandboxTokenWriteFailed", status.message())
-            })?;
-
         let container_name = container_name_for_sandbox(sandbox);
         let gpu_devices = self
             .resolve_gpu_cdi_devices(

crates/openshell-driver-docker/src/tests.rs

@@ -238,7 +238,7 @@ async fn standalone_traced_client() -> (
     let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
     let address = listener.local_addr().unwrap();
     let (shutdown, shutdown_rx) = tokio::sync::oneshot::channel();
-    let service = ComputeDriverService::new(test_driver_with_config(runtime_config()));
+    let service = ComputeDriverService::new(test_driver_with_config(runtime_config(false)));
     let server = tokio::spawn(async move {
         tonic::transport::Server::builder()
             .layer(openshell_otel::compute_driver_rpc_layer())
@@ -346,7 +346,8 @@ async fn tracing_in_process_service_preserves_the_driver_rpc_server_boundary() {
             otel_tracing::TRACING.in_process_targets(),
         ))
         .with(otel_tracing::TRACING.in_process_layer(&driver_provider));
-    let service = ComputeDriverService::new_in_process(test_driver_with_config(runtime_config()));
+    let service =
+        ComputeDriverService::new_in_process(test_driver_with_config(runtime_config(false)));
 
     async {
         let gateway_span = tracing::info_span!(
@@ -486,7 +487,7 @@ async fn tracing_lifecycle_rpc_failures_export_docker_operation_spans() {
         .with_simple_exporter(exporter.clone())
         .build();
     let subscriber = tracing_subscriber::registry().with(otel_tracing::TRACING.layer(&provider));
-    let driver = test_driver_with_config(runtime_config());
+    let driver = test_driver_with_config(runtime_config(false));
 
     async {
         ComputeDriver::create_sandbox(
@@ -540,7 +541,7 @@ async fn tracing_direct_start_exports_a_docker_start_span() {
         .with_simple_exporter(exporter.clone())
         .build();
     let subscriber = tracing_subscriber::registry().with(otel_tracing::TRACING.layer(&provider));
-    let driver = test_driver_with_config(runtime_config());
+    let driver = test_driver_with_config(runtime_config(false));
 
     DockerComputeDriver::start_sandbox(&driver, "", "")
         .with_subscriber(subscriber)
@@ -572,7 +573,7 @@ async fn tracing_image_preparation_failure_exports_nested_failed_spans() {
         .with_simple_exporter(exporter.clone())
         .build();
     let subscriber = tracing_subscriber::registry().with(otel_tracing::TRACING.layer(&provider));
-    let mut config = runtime_config();
+    let mut config = runtime_config(false);
     config.image_pull_policy = "unsupported".to_string();
     let driver = test_driver_with_config(config);
 
@@ -1284,7 +1285,7 @@ fn build_environment_keeps_network_capabilities_driver_controlled() {
         openshell_core::sandbox_env::NETWORK_RUNTIME_CAPABILITIES.to_string(),
         "spoofed".to_string(),
     );
-    let env = build_environment(&sandbox, &runtime_config());
+    let env = build_environment(&sandbox, &runtime_config(false), false);
     assert!(env.contains(&format!(
         "{}={}",
         openshell_core::sandbox_env::NETWORK_RUNTIME_CAPABILITIES,