Skip to content

Commit fbf3f69

Browse files
committed
fix: resolve rebase artifacts (fingerprint, conflict marker, missing field)
- Update public RPC schema fingerprint for the upstream+OtelExportData closure - Add capabilities field to provider_readiness_tests SupervisorHello literal - Remove stale conflict marker in supervisor lib.rs module list Signed-off-by: Roland Huß <rhuss@redhat.com>
1 parent 77c988f commit fbf3f69

6 files changed

Lines changed: 20 additions & 22 deletions

File tree

‎crates/openshell-server/src/grpc/provider_readiness_tests.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ fn hello() -> SupervisorHello {
7171
sandbox_id: Uuid::new_v4().to_string(),
7272
instance_id: Uuid::new_v4().to_string(),
7373
connection_epoch: 0,
74+
capabilities: Vec::new(),
7475
supports_provider_readiness: true,
7576
}
7677
}

‎crates/openshell-server/src/grpc/sandbox.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3982,7 +3982,8 @@ mod tests {
39823982
annotations: HashMap::new(),
39833983
workspace_scope: Some(openshell_core::proto::workspace_selector("default")),
39843984
await_main_process_attachment: false,
3985-
workload_template_name: String::new(),
3985+
workload_template: String::new(),
3986+
service_exposures: Vec::new(),
39863987
request_id: String::new(),
39873988
}
39883989
}

‎crates/openshell-server/src/storage_proto.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ mod tests {
122122
// timestamps are stored in SandboxStatus. Legacy payloads decode with
123123
// Unspecified (treated as Never), zero count, and absent timestamps.
124124
const PUBLIC_RPC_SCHEMA_SHA256: &str =
125-
"PLACEHOLDER_RECOMPUTE_AFTER_REBASE";
125+
"a403537ddf974f3f412b47a92741cbb6bc481d9eb70d103374eba95955a3e43c";
126126
const DURABLE_SCHEMA_SHA256: &str =
127127
"517561b578c88d28ffd74d128faf668e65aef03c784dd794aeb5208e1dbf6de3";
128128
const PUBLIC_DURABLE_OVERLAP_SHA256: &str =
@@ -589,7 +589,7 @@ mod tests {
589589
overlap_hash.as_str(),
590590
),
591591
(
592-
(308, 26),
592+
(305, 26),
593593
(92, 20),
594594
(80, 20),
595595
PUBLIC_RPC_SCHEMA_SHA256,

‎crates/openshell-server/src/supervisor_session.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ async fn establish_supervisor_session(
19111911
}
19121912

19131913
// Step 3: Determine confirmed capabilities.
1914-
let confirmed_capabilities = confirm_capabilities(&hello.capabilities, state);
1914+
let confirmed_capabilities = confirm_capabilities(&hello.capabilities, &state);
19151915

19161916
// Step 4: Send SessionAccepted.
19171917
let accepted = GatewayMessage {

‎crates/openshell-supervisor-network/src/proxy.rs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7725,12 +7725,11 @@ process: { run_as_user: sandbox, run_as_group: sandbox }
77257725
timing: MediationTiming::default(),
77267726
decision,
77277727
};
7728-
let (stream, supplied_identity, socket_addrs, transparent) =
7729-
preauthorize_transparent_open(
7730-
pending, None, &engine, &cache, None, None, true, None, None
7731-
)
7732-
.await
7733-
.expect("sandbox-local open is admitted");
7728+
let (stream, supplied_identity, socket_addrs, transparent) = preauthorize_transparent_open(
7729+
pending, None, &engine, &cache, None, None, true, None, None,
7730+
)
7731+
.await
7732+
.expect("sandbox-local open is admitted");
77347733
assert_eq!(completion.await.unwrap(), TcpOpenDecision::RelayReady);
77357734

77367735
let proposals = AgentProposals::new(true);
@@ -7858,12 +7857,11 @@ network_policies:
78587857
timing: MediationTiming::default(),
78597858
decision,
78607859
};
7861-
let (stream, supplied_identity, socket_addrs, transparent) =
7862-
preauthorize_transparent_open(
7863-
pending, None, &engine, &cache, None, None, false, None, None
7864-
)
7865-
.await
7866-
.expect("open is admitted");
7860+
let (stream, supplied_identity, socket_addrs, transparent) = preauthorize_transparent_open(
7861+
pending, None, &engine, &cache, None, None, false, None, None,
7862+
)
7863+
.await
7864+
.expect("open is admitted");
78677865
assert_eq!(completion.await.unwrap(), TcpOpenDecision::RelayReady);
78687866
// The workload writes before the proxy reads anything, so its request sits
78697867
// right behind the synthesized CONNECT header in the proxy's first read.

‎crates/openshell-supervisor/src/lib.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ mod activity_aggregator;
1919
mod denial_aggregator;
2020
mod endpoint_status;
2121
mod mechanistic_mapper;
22-
<<<<<<< HEAD
23-
mod provider_readiness;
24-
=======
2522
mod otlp_relay;
26-
>>>>>>> e9eff28c0 (feat(supervisor): wire the OTLP relay into the proxy and gateway session)
23+
mod provider_readiness;
2724

2825
use miette::{IntoDiagnostic, Result, WrapErr};
2926
use std::future::Future;
@@ -841,7 +838,6 @@ pub async fn run_sandbox(
841838
// Span enrichment reads these after the descriptor's identity moves into
842839
// the sandbox context below.
843840
let workload_uid = runtime_descriptor.workload_identity.uid;
844-
let driver_name = runtime_descriptor.driver_fence.driver_name();
845841
let context = openshell_isolation_interface::contract::SandboxContext {
846842
sandbox_id: sandbox_id.clone().unwrap_or_default(),
847843
session_id,
@@ -939,7 +935,9 @@ pub async fn run_sandbox(
939935
// Only the Podman driver sets this today; the OCSF context reads
940936
// the same variable and shares the gap.
941937
image: std::env::var("OPENSHELL_CONTAINER_IMAGE").unwrap_or_default(),
942-
driver: driver_name.to_string(),
938+
// The backend-neutral runtime descriptor no longer names the
939+
// compute driver; empty until the gateway injects it.
940+
driver: String::new(),
943941
},
944942
);
945943
let otlp_destination = otlp_relay::reserved_destination(otlp_server);

0 commit comments

Comments
 (0)