Skip to content

Commit facbf94

Browse files
TaylorMutchTaylorMutch
committed
feat(gateway): expose workspace service route discovery
Signed-off-by: Taylor Mutch <taylormutch@gmail.com>
1 parent 385d228 commit facbf94

20 files changed

Lines changed: 1789 additions & 434 deletions

‎crates/openshell-cli/tests/ensure_providers_integration.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,21 @@ impl TestOpenShell {
8080

8181
#[tonic::async_trait]
8282
impl OpenShell for TestOpenShell {
83+
async fn get_service_route_snapshot(
84+
&self,
85+
_: tonic::Request<openshell_core::proto::GetServiceRouteSnapshotRequest>,
86+
) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
87+
Err(Status::unimplemented("unused"))
88+
}
89+
type WatchServiceRoutesStream = tokio_stream::wrappers::ReceiverStream<
90+
Result<openshell_core::proto::WatchServiceRoutesResponse, Status>,
91+
>;
92+
async fn watch_service_routes(
93+
&self,
94+
_: tonic::Request<openshell_core::proto::WatchServiceRoutesRequest>,
95+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
96+
Err(Status::unimplemented("unused"))
97+
}
8398
async fn peer_notify_config_update(
8499
&self,
85100
_request: tonic::Request<openshell_core::proto::PeerNotifyConfigUpdateRequest>,

‎crates/openshell-cli/tests/mtls_integration.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,21 @@ struct TestOpenShell;
3232

3333
#[tonic::async_trait]
3434
impl OpenShell for TestOpenShell {
35+
async fn get_service_route_snapshot(
36+
&self,
37+
_: tonic::Request<openshell_core::proto::GetServiceRouteSnapshotRequest>,
38+
) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
39+
Err(Status::unimplemented("unused"))
40+
}
41+
type WatchServiceRoutesStream = tokio_stream::wrappers::ReceiverStream<
42+
Result<openshell_core::proto::WatchServiceRoutesResponse, Status>,
43+
>;
44+
async fn watch_service_routes(
45+
&self,
46+
_: tonic::Request<openshell_core::proto::WatchServiceRoutesRequest>,
47+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
48+
Err(Status::unimplemented("unused"))
49+
}
3550
async fn peer_notify_config_update(
3651
&self,
3752
_request: tonic::Request<openshell_core::proto::PeerNotifyConfigUpdateRequest>,

‎crates/openshell-cli/tests/provider_commands_integration.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,21 @@ impl TestOpenShell {
235235

236236
#[tonic::async_trait]
237237
impl OpenShell for TestOpenShell {
238+
async fn get_service_route_snapshot(
239+
&self,
240+
_: tonic::Request<openshell_core::proto::GetServiceRouteSnapshotRequest>,
241+
) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
242+
Err(Status::unimplemented("unused"))
243+
}
244+
type WatchServiceRoutesStream = tokio_stream::wrappers::ReceiverStream<
245+
Result<openshell_core::proto::WatchServiceRoutesResponse, Status>,
246+
>;
247+
async fn watch_service_routes(
248+
&self,
249+
_: tonic::Request<openshell_core::proto::WatchServiceRoutesRequest>,
250+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
251+
Err(Status::unimplemented("unused"))
252+
}
238253
async fn peer_notify_config_update(
239254
&self,
240255
_request: tonic::Request<openshell_core::proto::PeerNotifyConfigUpdateRequest>,

‎crates/openshell-cli/tests/sandbox_create_lifecycle_integration.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,21 @@ struct TestOpenShell {
102102

103103
#[tonic::async_trait]
104104
impl OpenShell for TestOpenShell {
105+
async fn get_service_route_snapshot(
106+
&self,
107+
_: tonic::Request<openshell_core::proto::GetServiceRouteSnapshotRequest>,
108+
) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
109+
Err(Status::unimplemented("unused"))
110+
}
111+
type WatchServiceRoutesStream = tokio_stream::wrappers::ReceiverStream<
112+
Result<openshell_core::proto::WatchServiceRoutesResponse, Status>,
113+
>;
114+
async fn watch_service_routes(
115+
&self,
116+
_: tonic::Request<openshell_core::proto::WatchServiceRoutesRequest>,
117+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
118+
Err(Status::unimplemented("unused"))
119+
}
105120
async fn peer_notify_config_update(
106121
&self,
107122
_request: tonic::Request<openshell_core::proto::PeerNotifyConfigUpdateRequest>,

‎crates/openshell-cli/tests/sandbox_exec_streaming_integration.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@ macro_rules! mock_gateway {
163163
) => {
164164
#[tonic::async_trait]
165165
impl OpenShell for MockGateway {
166+
async fn get_service_route_snapshot(&self, _: Request<openshell_core::proto::GetServiceRouteSnapshotRequest>) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
167+
Err(Status::unimplemented("unused"))
168+
}
169+
type WatchServiceRoutesStream = tokio_stream::wrappers::ReceiverStream<Result<openshell_core::proto::WatchServiceRoutesResponse, Status>>;
170+
async fn watch_service_routes(&self, _: Request<openshell_core::proto::WatchServiceRoutesRequest>) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
171+
Err(Status::unimplemented("unused"))
172+
}
166173
$(async fn $method(&self, _: Request<$request>) -> Result<Response<$response>, Status> {
167174
Err(Status::unimplemented("unused test RPC"))
168175
})*

‎crates/openshell-cli/tests/sandbox_name_fallback_integration.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,21 @@ struct TestOpenShell {
4747

4848
#[tonic::async_trait]
4949
impl OpenShell for TestOpenShell {
50+
async fn get_service_route_snapshot(
51+
&self,
52+
_: tonic::Request<openshell_core::proto::GetServiceRouteSnapshotRequest>,
53+
) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
54+
Err(Status::unimplemented("unused"))
55+
}
56+
type WatchServiceRoutesStream = tokio_stream::wrappers::ReceiverStream<
57+
Result<openshell_core::proto::WatchServiceRoutesResponse, Status>,
58+
>;
59+
async fn watch_service_routes(
60+
&self,
61+
_: tonic::Request<openshell_core::proto::WatchServiceRoutesRequest>,
62+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
63+
Err(Status::unimplemented("unused"))
64+
}
5065
async fn peer_notify_config_update(
5166
&self,
5267
_request: tonic::Request<openshell_core::proto::PeerNotifyConfigUpdateRequest>,

‎crates/openshell-sdk/tests/client_mock.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,20 @@ fn workload_template_proto(name: &str, workspace: &str) -> proto::SandboxWorkloa
245245

246246
#[tonic::async_trait]
247247
impl OpenShell for TestOpenShell {
248+
async fn get_service_route_snapshot(
249+
&self,
250+
_: tonic::Request<proto::GetServiceRouteSnapshotRequest>,
251+
) -> Result<Response<proto::GetServiceRouteSnapshotResponse>, Status> {
252+
Err(Status::unimplemented("unused"))
253+
}
254+
type WatchServiceRoutesStream =
255+
tokio_stream::wrappers::ReceiverStream<Result<proto::WatchServiceRoutesResponse, Status>>;
256+
async fn watch_service_routes(
257+
&self,
258+
_: tonic::Request<proto::WatchServiceRoutesRequest>,
259+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
260+
Err(Status::unimplemented("unused"))
261+
}
248262
async fn peer_notify_config_update(
249263
&self,
250264
_request: tonic::Request<proto::PeerNotifyConfigUpdateRequest>,

‎crates/openshell-server/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,27 @@ change durable sandbox protobufs. Reads revalidate owner, configuration,
253253
generation, and expiry. Cleanup scans bounded pages and uses conditional deletes
254254
so concurrent renewals are preserved. Discovery consumers must not treat these
255255
records as application health or external ingress readiness.
256+
257+
## Workspace service discovery
258+
259+
`GetServiceRouteSnapshot` and `WatchServiceRoutes` expose accepted installations
260+
for one explicit active workspace. They require `sandbox:read` and workspace
261+
user access; omitted/all-workspaces selectors and sandbox principals are rejected.
262+
Dedicated discovery machine grants are separate work.
263+
264+
Each successful response replaces the complete view. Consumers preserve the
265+
returned hostname as TLS SNI and HTTP authority when dialing the supervisor
266+
endpoint, remove absent routes, and expire cached entries at `expires_at` even
267+
when discovery is unavailable. An error is not an empty replacement. The opaque
268+
snapshot revision includes lease renewals; `installation_version` remains stable
269+
across those renewals and changes when installation identity changes. These
270+
records establish neither application health nor ingress readiness.
271+
272+
Collection checks installation resource versions across two scans, retrying once
273+
if changed. This is a verified view, not a transaction across configuration and
274+
owner resources. Reads are bounded to 1,000 installation records, 4,096 routes,
275+
4 MiB, and ten seconds. Overflow, corruption, or storage failure returns an error.
276+
Watches refresh and reauthorize each second, use a one-message buffer, and end
277+
after one minute or a five-second blocked send. Each gateway process accepts at
278+
most 32 watches. Reconnect and relist on stream termination; revisions are opaque
279+
equality tokens, not resumable cursors or an ordering across gateway replicas.

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub mod supervisor_host;
1414
pub use sandbox::mint_persisted_authentication;
1515
mod service;
1616
pub mod service_advertisement;
17+
mod service_discovery;
1718
mod validation;
1819
pub mod workspace;
1920

@@ -521,6 +522,22 @@ impl OpenShell for OpenShellService {
521522
service::handle_list_services(&self.state, request).await
522523
}
523524

525+
async fn get_service_route_snapshot(
526+
&self,
527+
request: Request<openshell_core::proto::GetServiceRouteSnapshotRequest>,
528+
) -> Result<Response<openshell_core::proto::GetServiceRouteSnapshotResponse>, Status> {
529+
service_discovery::get_snapshot(&self.state, request).await
530+
}
531+
532+
type WatchServiceRoutesStream = service_discovery::RouteWatchStream;
533+
534+
async fn watch_service_routes(
535+
&self,
536+
request: Request<openshell_core::proto::WatchServiceRoutesRequest>,
537+
) -> Result<Response<Self::WatchServiceRoutesStream>, Status> {
538+
service_discovery::watch(&self.state, request).await
539+
}
540+
524541
async fn delete_service(
525542
&self,
526543
request: Request<DeleteServiceRequest>,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ pub fn spawn_cleanup(state: Arc<ServerState>, mut shutdown: tokio::sync::watch::
495495
}
496496

497497
#[cfg(test)]
498-
mod tests {
498+
pub mod tests {
499499
use super::*;
500500

501501
fn route() -> SandboxServiceRoute {
@@ -645,6 +645,7 @@ mod tests {
645645
port: 9443,
646646
domain: "services.example.com".into(),
647647
};
648+
Arc::get_mut(&mut state).unwrap().admin_role = "openshell-admin".into();
648649
let sandbox = Sandbox {
649650
metadata: Some(ObjectMeta {
650651
id: "sandbox".into(),

0 commit comments

Comments
 (0)