From 17389cf1f95bab921a42ad2673ffc779864bce4c Mon Sep 17 00:00:00 2001 From: Taylor Mutch Date: Tue, 17 Nov 2026 23:51:05 -0800 Subject: [PATCH 1/2] test(grpc): generate default handlers for partial test servers Signed-off-by: Taylor Mutch --- Cargo.lock | 1 + .../tests/grpc_default_stubs_integration.rs | 69 +++ .../openshell-cli/tests/mtls_integration.rs | 526 +----------------- .../sandbox_exec_streaming_integration.rs | 198 ++----- crates/openshell-server/Cargo.toml | 3 +- crates/openshell-server/README.md | 14 + crates/openshell-server/build.rs | 32 +- crates/openshell-server/src/test_support.rs | 24 + 8 files changed, 196 insertions(+), 671 deletions(-) create mode 100644 crates/openshell-cli/tests/grpc_default_stubs_integration.rs diff --git a/Cargo.lock b/Cargo.lock index 120b635c8c..aea6c7ecbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5270,6 +5270,7 @@ dependencies = [ "tokio-tungstenite 0.26.2", "toml", "tonic", + "tonic-prost", "tonic-prost-build", "tonic-reflection", "tower", diff --git a/crates/openshell-cli/tests/grpc_default_stubs_integration.rs b/crates/openshell-cli/tests/grpc_default_stubs_integration.rs new file mode 100644 index 0000000000..36ef9ec8b3 --- /dev/null +++ b/crates/openshell-cli/tests/grpc_default_stubs_integration.rs @@ -0,0 +1,69 @@ +// SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +use std::time::Duration; + +use openshell_core::proto::{self, open_shell_client::OpenShellClient}; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; +use tokio::net::TcpListener; +use tokio::sync::oneshot; +use tokio_stream::wrappers::TcpListenerStream; +use tonic::transport::{Endpoint, Server}; + +struct EmptyGateway; + +#[tonic::async_trait] +impl OpenShell for EmptyGateway {} + +#[tokio::test] +async fn production_client_gets_unimplemented_for_every_unused_rpc_shape() { + let listener = TcpListener::bind("127.0.0.1:0").await.unwrap(); + let address = listener.local_addr().unwrap(); + let (shutdown, stopped) = oneshot::channel(); + let server = tokio::spawn(async move { + Server::builder() + .add_service(OpenShellServer::new(EmptyGateway)) + .serve_with_incoming_shutdown(TcpListenerStream::new(listener), async { + let _ = stopped.await; + }) + .await + }); + let channel = Endpoint::from_shared(format!("http://{address}")) + .unwrap() + .connect_timeout(Duration::from_secs(5)) + .timeout(Duration::from_secs(5)) + .connect() + .await + .unwrap(); + let mut client = OpenShellClient::new(channel); + + let unary = client.health(proto::HealthRequest {}).await.unwrap_err(); + let added_rpc = client + .get_sandbox_provider_access_token(proto::GetSandboxProviderAccessTokenRequest::default()) + .await + .unwrap_err(); + let server_stream = client + .watch_sandbox(proto::WatchSandboxRequest::default()) + .await + .unwrap_err(); + let client_stream = client + .push_sandbox_logs(tokio_stream::empty::()) + .await + .unwrap_err(); + let bidirectional = client + .exec_sandbox_interactive(tokio_stream::empty::()) + .await + .unwrap_err(); + for status in [ + unary, + added_rpc, + server_stream, + client_stream, + bidirectional, + ] { + assert_eq!(status.code(), tonic::Code::Unimplemented); + } + + shutdown.send(()).unwrap(); + server.await.unwrap().unwrap(); +} diff --git a/crates/openshell-cli/tests/mtls_integration.rs b/crates/openshell-cli/tests/mtls_integration.rs index f659ffe8e2..d5813cc017 100644 --- a/crates/openshell-cli/tests/mtls_integration.rs +++ b/crates/openshell-cli/tests/mtls_integration.rs @@ -11,14 +11,11 @@ use openshell_cli::{ tls::{TlsOptions, grpc_client}, }; use openshell_core::proto::{ - CreateProviderRequest, CreateSshSessionRequest, CreateSshSessionResponse, - DeleteProviderRequest, DeleteProviderResponse, ExchangeProviderSubjectTokenRequest, - ExchangeProviderSubjectTokenResponse, ExecSandboxEvent, ExecSandboxInput, ExecSandboxRequest, - GetProviderRequest, HealthRequest, HealthResponse, ListProvidersRequest, ListProvidersResponse, - ProviderResponse, RevokeSshSessionRequest, RevokeSshSessionResponse, ServiceStatus, - UpdateProviderRequest, - open_shell_server::{OpenShell, OpenShellServer}, + CreateSshSessionRequest, CreateSshSessionResponse, ExecSandboxEvent, ExecSandboxRequest, + HealthRequest, HealthResponse, RevokeSshSessionRequest, RevokeSshSessionResponse, + ServiceStatus, }; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; use tokio::net::TcpListener; use tokio::sync::mpsc; use tokio_stream::wrappers::TcpListenerStream; @@ -32,42 +29,6 @@ struct TestOpenShell; #[tonic::async_trait] impl OpenShell for TestOpenShell { - async fn get_sandbox_provider_access_token( - &self, - _request: tonic::Request, - ) -> Result, Status> - { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_notify_config_update( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_endpoint_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn report_endpoint_status( &self, _request: tonic::Request, @@ -77,34 +38,6 @@ impl OpenShell for TestOpenShell { )) } - async fn begin_rootfs_tar_staging( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn report_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn finalize_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn get_current_user( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn health( &self, _request: tonic::Request, @@ -115,13 +48,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_gateway_info( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_sandbox( &self, _request: tonic::Request, @@ -131,34 +57,6 @@ impl OpenShell for TestOpenShell { )) } - async fn stop_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn start_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn suspend_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn resume_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn get_sandbox( &self, _request: tonic::Request, @@ -177,8 +75,6 @@ impl OpenShell for TestOpenShell { )) } - unimplemented_sandbox_template_rpcs!(); - async fn list_sandbox_providers( &self, _request: tonic::Request, @@ -236,24 +132,6 @@ impl OpenShell for TestOpenShell { )) } - async fn get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider readiness is not exercised by this mock", - )) - } - - async fn report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider installation reports are not exercised by this mock", - )) - } - async fn get_sandbox_provider_environment( &self, _request: tonic::Request, @@ -280,27 +158,6 @@ impl OpenShell for TestOpenShell { )) } - async fn get_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn list_services( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn revoke_ssh_session( &self, _request: tonic::Request, @@ -308,385 +165,28 @@ impl OpenShell for TestOpenShell { Ok(Response::new(RevokeSshSessionResponse::default())) } - async fn exchange_provider_subject_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn create_provider( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "create_provider not implemented in test", - )) - } - - async fn get_provider_credentials( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this mock")) - } - - async fn get_provider( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "get_provider not implemented in test", - )) - } - - async fn list_providers( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "list_providers not implemented in test", - )) - } - - async fn list_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_provider_profile( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn import_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn lint_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_provider_profile( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_provider( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "update_provider not implemented in test", - )) - } - async fn get_provider_refresh_status( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn configure_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn rotate_provider_credential( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_provider( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "delete_provider not implemented in test", - )) - } - - type WatchSandboxStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - type ExecSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ConnectSupervisorStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - async fn watch_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result< + Response>, + Status, + > { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } async fn exec_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } - - type ExecSandboxInteractiveStream = - tokio_stream::wrappers::ReceiverStream>; - async fn exec_sandbox_interactive( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_config( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_sandbox_policies( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_sandbox_configuration( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_logs( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn push_sandbox_logs( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn submit_policy_analysis( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_policy( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn reject_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_all_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn edit_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn undo_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn clear_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_history( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn issue_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn refresh_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn connect_supervisor( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type RelayStreamStream = - tokio_stream::wrappers::ReceiverStream>; - - async fn relay_stream( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type PeerRelayStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn peer_relay( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type ForwardTcpStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn forward_tcp( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn create_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspaces( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn add_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn remove_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspace_members( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } } async fn run_server( diff --git a/crates/openshell-cli/tests/sandbox_exec_streaming_integration.rs b/crates/openshell-cli/tests/sandbox_exec_streaming_integration.rs index 3d56cecf99..657ee8e12c 100644 --- a/crates/openshell-cli/tests/sandbox_exec_streaming_integration.rs +++ b/crates/openshell-cli/tests/sandbox_exec_streaming_integration.rs @@ -11,8 +11,8 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; use helpers::{build_ca, build_client_cert, build_server_cert}; -use openshell_core::proto::open_shell_server::{OpenShell, OpenShellServer}; use openshell_core::proto::{self, exec_sandbox_event, exec_sandbox_input}; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; use tokio::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader}; use tokio::net::TcpListener; use tokio::process::{Child, Command}; @@ -25,7 +25,7 @@ use tonic::{Request, Response, Status}; const DEADLINE: Duration = Duration::from_secs(10); const STDIN_LIMIT: usize = 4 * 1024 * 1024; -type EventStream = ReceiverStream>; +type EventStream = tonic::codegen::BoxStream; #[derive(Clone, Copy)] enum Scenario { @@ -152,163 +152,49 @@ async fn send_trailer_error(output: &mpsc::Sender $response:ty; )* } - client_stream { $( $client_method:ident($client_request:ty) -> $client_response:ty; )* } - server_stream { $( $server_method:ident($server_request:ty) -> $stream_type:ident($server_response:ty); )* } - bidi { $( $bidi_method:ident($bidi_request:ty) -> $bidi_type:ident($bidi_response:ty); )* } - ) => { - #[tonic::async_trait] - impl OpenShell for MockGateway { - $(async fn $method(&self, _: Request<$request>) -> Result, Status> { - Err(Status::unimplemented("unused test RPC")) - })* - $(async fn $client_method(&self, _: Request>) -> Result, Status> { - Err(Status::unimplemented("unused test RPC")) - })* - $(type $stream_type = ReceiverStream>; - async fn $server_method(&self, _: Request<$server_request>) -> Result, Status> { - Err(Status::unimplemented("unused test RPC")) - })* - $(type $bidi_type = ReceiverStream>; - async fn $bidi_method(&self, _: Request>) -> Result, Status> { - Err(Status::unimplemented("unused test RPC")) - })* - - async fn get_sandbox(&self, _: Request) -> Result, Status> { - self.calls.lock().unwrap().lookups += 1; - Ok(Response::new(proto::SandboxResponse { - sandbox: Some(proto::Sandbox { - metadata: Some(proto::datamodel::v1::ObjectMeta { - id: "test-id".to_string(), - name: "test-sandbox".to_string(), - workspace: "default".to_string(), - ..Default::default() - }), - status: Some(proto::SandboxStatus { - phase: proto::SandboxPhase::Ready.into(), - ..Default::default() - }), - ..Default::default() - }), +#[tonic::async_trait] +impl OpenShell for MockGateway { + async fn get_sandbox( + &self, + _: Request, + ) -> Result, Status> { + self.calls.lock().unwrap().lookups += 1; + Ok(Response::new(proto::SandboxResponse { + sandbox: Some(proto::Sandbox { + metadata: Some(proto::datamodel::v1::ObjectMeta { + id: "test-id".to_string(), + name: "test-sandbox".to_string(), + workspace: "default".to_string(), ..Default::default() - })) - } - - type ExecSandboxStream = EventStream; - async fn exec_sandbox(&self, _: Request) -> Result, Status> { - self.calls.lock().unwrap().unary += 1; - Err(Status::unimplemented("test requires streaming exec")) - } - - type ExecSandboxInteractiveStream = EventStream; - async fn exec_sandbox_interactive(&self, request: Request>) -> Result, Status> { - let (sender, receiver) = mpsc::channel(1); - let service = self.clone(); - tokio::spawn(async move { - service.exchange(request.into_inner(), sender).await; - }); - Ok(Response::new(ReceiverStream::new(receiver))) - } - } - }; -} - -mock_gateway! { - unary { - health(proto::HealthRequest) -> proto::HealthResponse; - get_current_user(proto::GetCurrentUserRequest) -> proto::GetCurrentUserResponse; - get_gateway_info(proto::GetGatewayInfoRequest) -> proto::GetGatewayInfoResponse; - create_sandbox(proto::CreateSandboxRequest) -> proto::SandboxResponse; - begin_rootfs_tar_staging(proto::BeginRootfsTarStagingRequest) -> proto::BeginRootfsTarStagingResponse; - list_sandboxes(proto::ListSandboxesRequest) -> proto::ListSandboxesResponse; - create_sandbox_template(proto::CreateSandboxTemplateRequest) -> proto::SandboxTemplateResponse; - get_sandbox_template(proto::GetSandboxTemplateRequest) -> proto::SandboxTemplateResponse; - list_sandbox_templates(proto::ListSandboxTemplatesRequest) -> proto::ListSandboxTemplatesResponse; - delete_sandbox_template(proto::DeleteSandboxTemplateRequest) -> proto::DeleteSandboxTemplateResponse; - list_sandbox_providers(proto::ListSandboxProvidersRequest) -> proto::ListSandboxProvidersResponse; - attach_sandbox_provider(proto::AttachSandboxProviderRequest) -> proto::AttachSandboxProviderResponse; - detach_sandbox_provider(proto::DetachSandboxProviderRequest) -> proto::DetachSandboxProviderResponse; - get_sandbox_provider_status(proto::GetSandboxProviderStatusRequest) -> proto::GetSandboxProviderStatusResponse; - delete_sandbox(proto::DeleteSandboxRequest) -> proto::DeleteSandboxResponse; - stop_sandbox(proto::StopSandboxRequest) -> proto::SandboxResponse; - start_sandbox(proto::StartSandboxRequest) -> proto::SandboxResponse; - suspend_sandbox(proto::SuspendSandboxRequest) -> proto::SandboxResponse; - resume_sandbox(proto::ResumeSandboxRequest) -> proto::SandboxResponse; - create_ssh_session(proto::CreateSshSessionRequest) -> proto::CreateSshSessionResponse; - expose_service(proto::ExposeServiceRequest) -> proto::ServiceEndpointResponse; - get_service(proto::GetServiceRequest) -> proto::ServiceEndpointResponse; - list_services(proto::ListServicesRequest) -> proto::ListServicesResponse; - delete_service(proto::DeleteServiceRequest) -> proto::DeleteServiceResponse; - revoke_ssh_session(proto::RevokeSshSessionRequest) -> proto::RevokeSshSessionResponse; - create_provider(proto::CreateProviderRequest) -> proto::ProviderResponse; - get_provider_credentials(proto::GetProviderCredentialsRequest) -> proto::GetProviderCredentialsResponse; - get_provider(proto::GetProviderRequest) -> proto::ProviderResponse; - list_providers(proto::ListProvidersRequest) -> proto::ListProvidersResponse; - list_provider_profiles(proto::ListProviderProfilesRequest) -> proto::ListProviderProfilesResponse; - get_provider_profile(proto::GetProviderProfileRequest) -> proto::ProviderProfileResponse; - import_provider_profiles(proto::ImportProviderProfilesRequest) -> proto::ImportProviderProfilesResponse; - update_provider_profiles(proto::UpdateProviderProfilesRequest) -> proto::UpdateProviderProfilesResponse; - lint_provider_profiles(proto::LintProviderProfilesRequest) -> proto::LintProviderProfilesResponse; - update_provider(proto::UpdateProviderRequest) -> proto::ProviderResponse; - get_provider_refresh_status(proto::GetProviderRefreshStatusRequest) -> proto::GetProviderRefreshStatusResponse; - configure_provider_refresh(proto::ConfigureProviderRefreshRequest) -> proto::ConfigureProviderRefreshResponse; - rotate_provider_credential(proto::RotateProviderCredentialRequest) -> proto::RotateProviderCredentialResponse; - delete_provider_refresh(proto::DeleteProviderRefreshRequest) -> proto::DeleteProviderRefreshResponse; - delete_provider(proto::DeleteProviderRequest) -> proto::DeleteProviderResponse; - delete_provider_profile(proto::DeleteProviderProfileRequest) -> proto::DeleteProviderProfileResponse; - get_sandbox_config(proto::GetSandboxConfigRequest) -> proto::GetSandboxConfigResponse; - get_gateway_config(proto::GetGatewayConfigRequest) -> proto::GetGatewayConfigResponse; - update_config(proto::UpdateConfigRequest) -> proto::UpdateConfigResponse; - get_sandbox_policy_status(proto::GetSandboxPolicyStatusRequest) -> proto::GetSandboxPolicyStatusResponse; - list_sandbox_policies(proto::ListSandboxPoliciesRequest) -> proto::ListSandboxPoliciesResponse; - report_policy_status(proto::ReportPolicyStatusRequest) -> proto::ReportPolicyStatusResponse; - report_endpoint_status(proto::ReportEndpointStatusRequest) -> proto::ReportEndpointStatusResponse; - report_provider_readiness(proto::ReportProviderReadinessRequest) -> proto::ReportProviderReadinessResponse; - report_sandbox_configuration(proto::ReportSandboxConfigurationRequest) -> proto::ReportSandboxConfigurationResponse; - get_sandbox_provider_environment(proto::GetSandboxProviderEnvironmentRequest) -> proto::GetSandboxProviderEnvironmentResponse; - exchange_provider_subject_token(proto::ExchangeProviderSubjectTokenRequest) -> proto::ExchangeProviderSubjectTokenResponse; - get_sandbox_provider_access_token(proto::GetSandboxProviderAccessTokenRequest) -> proto::GetSandboxProviderAccessTokenResponse; - get_sandbox_logs(proto::GetSandboxLogsRequest) -> proto::GetSandboxLogsResponse; - report_main_process_exit(proto::ReportMainProcessExitRequest) -> proto::ReportMainProcessExitResponse; - finalize_main_process_exit(proto::FinalizeMainProcessExitRequest) -> proto::FinalizeMainProcessExitResponse; - peer_report_provider_readiness(proto::ReportProviderReadinessRequest) -> proto::ReportProviderReadinessResponse; - peer_report_endpoint_status(proto::ReportEndpointStatusRequest) -> proto::ReportEndpointStatusResponse; - peer_get_sandbox_provider_status(proto::GetSandboxProviderStatusRequest) -> proto::GetSandboxProviderStatusResponse; - peer_notify_config_update(proto::PeerNotifyConfigUpdateRequest) -> proto::PeerNotifyConfigUpdateResponse; - submit_policy_analysis(proto::SubmitPolicyAnalysisRequest) -> proto::SubmitPolicyAnalysisResponse; - get_draft_policy(proto::GetDraftPolicyRequest) -> proto::GetDraftPolicyResponse; - approve_draft_chunk(proto::ApproveDraftChunkRequest) -> proto::ApproveDraftChunkResponse; - reject_draft_chunk(proto::RejectDraftChunkRequest) -> proto::RejectDraftChunkResponse; - approve_all_draft_chunks(proto::ApproveAllDraftChunksRequest) -> proto::ApproveAllDraftChunksResponse; - edit_draft_chunk(proto::EditDraftChunkRequest) -> proto::EditDraftChunkResponse; - undo_draft_chunk(proto::UndoDraftChunkRequest) -> proto::UndoDraftChunkResponse; - clear_draft_chunks(proto::ClearDraftChunksRequest) -> proto::ClearDraftChunksResponse; - get_draft_history(proto::GetDraftHistoryRequest) -> proto::GetDraftHistoryResponse; - issue_sandbox_token(proto::IssueSandboxTokenRequest) -> proto::IssueSandboxTokenResponse; - refresh_sandbox_token(proto::RefreshSandboxTokenRequest) -> proto::RefreshSandboxTokenResponse; - create_workspace(proto::CreateWorkspaceRequest) -> proto::CreateWorkspaceResponse; - get_workspace(proto::GetWorkspaceRequest) -> proto::GetWorkspaceResponse; - list_workspaces(proto::ListWorkspacesRequest) -> proto::ListWorkspacesResponse; - delete_workspace(proto::DeleteWorkspaceRequest) -> proto::DeleteWorkspaceResponse; - add_workspace_member(proto::AddWorkspaceMemberRequest) -> proto::AddWorkspaceMemberResponse; - remove_workspace_member(proto::RemoveWorkspaceMemberRequest) -> proto::RemoveWorkspaceMemberResponse; - list_workspace_members(proto::ListWorkspaceMembersRequest) -> proto::ListWorkspaceMembersResponse; - } - client_stream { - push_sandbox_logs(proto::PushSandboxLogsRequest) -> proto::PushSandboxLogsResponse; + }), + status: Some(proto::SandboxStatus { + phase: proto::SandboxPhase::Ready.into(), + ..Default::default() + }), + ..Default::default() + }), + ..Default::default() + })) } - server_stream { - watch_sandbox(proto::WatchSandboxRequest) -> WatchSandboxStream(proto::SandboxStreamEvent); + + async fn exec_sandbox( + &self, + _: Request, + ) -> Result, Status> { + self.calls.lock().unwrap().unary += 1; + Err(Status::unimplemented("test requires streaming exec")) } - bidi { - forward_tcp(proto::TcpForwardFrame) -> ForwardTcpStream(proto::TcpForwardFrame); - connect_supervisor(proto::SupervisorMessage) -> ConnectSupervisorStream(proto::GatewayMessage); - relay_stream(proto::RelayFrame) -> RelayStreamStream(proto::RelayFrame); - peer_relay(proto::PeerRelayFrame) -> PeerRelayStream(proto::PeerRelayFrame); + + async fn exec_sandbox_interactive( + &self, + request: Request>, + ) -> Result, Status> { + let (sender, receiver) = mpsc::channel(1); + let service = self.clone(); + tokio::spawn(async move { + service.exchange(request.into_inner(), sender).await; + }); + Ok(Response::new(Box::pin(ReceiverStream::new(receiver)))) } } diff --git a/crates/openshell-server/Cargo.toml b/crates/openshell-server/Cargo.toml index 21766e5fcb..f62f37b3a9 100644 --- a/crates/openshell-server/Cargo.toml +++ b/crates/openshell-server/Cargo.toml @@ -42,6 +42,7 @@ libc = "0.2" # gRPC tonic = { workspace = true, features = ["channel", "tls-native-roots"] } tonic-reflection = { workspace = true } +tonic-prost = { workspace = true, optional = true } prost = { workspace = true } prost-reflect = { workspace = true } prost-types = { workspace = true } @@ -125,7 +126,7 @@ default = ["telemetry"] telemetry = ["openshell-core/telemetry"] vendored-z3 = ["openshell-prover/vendored-z3"] prebuilt-z3 = ["openshell-prover/prebuilt-z3"] -test-support = ["openshell-credential-issuer/test-support"] +test-support = ["dep:tonic-prost", "openshell-credential-issuer/test-support"] [build-dependencies] tonic-prost-build = { workspace = true } diff --git a/crates/openshell-server/README.md b/crates/openshell-server/README.md index c9185f5ba9..e05dbe1c40 100644 --- a/crates/openshell-server/README.md +++ b/crates/openshell-server/README.md @@ -268,6 +268,20 @@ runs under `mise run test:rust:postgres` (see `TESTING.md`) and still accepts It exercises independent sessions without the local mutex. Do not point this fixture at an existing deployment database. +### Partial gRPC test services + +With `test-support`, import mock server traits and servers from +`openshell_server::test_support::grpc::open_shell_server`. These are generated +from the public protobuf schema with the production message types and RPC paths. +Omitted methods return `UNIMPLEMENTED`, so new RPCs need no edits to unrelated +mocks. The production traits in `openshell_core::proto` still require every +handler. + +The [mTLS fixture](../openshell-cli/tests/mtls_integration.rs) implements its +successful responses, and the [streaming fixture](../openshell-cli/tests/sandbox_exec_streaming_integration.rs) +implements only its three exercised RPCs. Streaming overrides return +`tonic::codegen::BoxStream` rather than declaring associated stream types. + ## Sandbox identity broker `openshell.gateway.spiffe_broker` enables gateway-owned SPIFFE Broker API diff --git a/crates/openshell-server/build.rs b/crates/openshell-server/build.rs index 6230f8d259..97211c37ac 100644 --- a/crates/openshell-server/build.rs +++ b/crates/openshell-server/build.rs @@ -58,7 +58,7 @@ fn main() -> Result<(), Box> { }; let descriptor_path = PathBuf::from(env::var("OUT_DIR")?).join("storage_descriptor.bin"); - let mut include_dirs = vec![storage_proto_dir, public_proto_dir]; + let mut include_dirs = vec![storage_proto_dir, public_proto_dir.clone()]; include_dirs.extend(proto_include); tonic_prost_build::configure() .build_server(false) @@ -75,5 +75,35 @@ fn main() -> Result<(), Box> { .file_descriptor_set_path(&descriptor_path) .compile_with_config(proto_config, &[storage_proto, image_proto], &include_dirs)?; + if env::var_os("CARGO_FEATURE_TEST_SUPPORT").is_some() { + let output = PathBuf::from(env::var("OUT_DIR")?).join("test_grpc"); + std::fs::create_dir_all(&output)?; + let mut config = tonic_prost_build::Config::new(); + if use_vendored_protoc { + config.protoc_executable(protoc_bin_vendored::protoc_bin_path()?); + } + // Only test fixtures get default UNIMPLEMENTED handlers. Keep the + // production trait exhaustive and reuse its existing wire types. + tonic_prost_build::configure() + .build_client(false) + .build_server(true) + .generate_default_stubs(true) + .extern_path(".openshell.v1", "::openshell_core::proto") + .extern_path( + ".openshell.datamodel.v1", + "::openshell_core::proto::datamodel::v1", + ) + .extern_path( + ".openshell.sandbox.v1", + "::openshell_core::proto::sandbox::v1", + ) + .out_dir(output) + .compile_with_config( + config, + &[public_proto_dir.join("openshell.proto")], + &include_dirs, + )?; + } + Ok(()) } diff --git a/crates/openshell-server/src/test_support.rs b/crates/openshell-server/src/test_support.rs index b1d5736a93..969e05928b 100644 --- a/crates/openshell-server/src/test_support.rs +++ b/crates/openshell-server/src/test_support.rs @@ -3,6 +3,30 @@ //! Test fixtures for exercising gateway integration points. +/// Test-only gRPC services whose unused methods return `UNIMPLEMENTED`. +/// +/// These use the production message types and RPC paths. Implement only the +/// methods the test exercises; the production server trait stays exhaustive. +/// +/// ```compile_fail +/// struct IncompleteGateway; +/// #[tonic::async_trait] +/// impl openshell_core::proto::open_shell_server::OpenShell for IncompleteGateway {} +/// ``` +#[cfg(feature = "test-support")] +#[allow( + clippy::all, + clippy::pedantic, + clippy::nursery, + dead_code, + unused_imports, + unused_qualifications, + rust_2018_idioms +)] +pub mod grpc { + include!(concat!(env!("OUT_DIR"), "/test_grpc/openshell.v1.rs")); +} + use crate::ServerState; use crate::auth::identity::{Identity, IdentityProvider}; use crate::auth::principal::{Principal, UserPrincipal}; From e8490a05380b02249168301c69bebcaa3f458e33 Mon Sep 17 00:00:00 2001 From: Taylor Mutch Date: Wed, 18 Nov 2026 01:40:41 -0800 Subject: [PATCH 2/2] test(cli): remove remaining unused gateway mock handlers Signed-off-by: Taylor Mutch --- .../tests/ensure_providers_integration.rs | 464 +---------------- crates/openshell-cli/tests/helpers/mod.rs | 89 ---- .../tests/provider_commands_integration.rs | 424 +-------------- .../sandbox_create_lifecycle_integration.rs | 463 +---------------- .../sandbox_name_fallback_integration.rs | 481 +----------------- 5 files changed, 76 insertions(+), 1845 deletions(-) diff --git a/crates/openshell-cli/tests/ensure_providers_integration.rs b/crates/openshell-cli/tests/ensure_providers_integration.rs index 8066c99f5d..3f17d22921 100644 --- a/crates/openshell-cli/tests/ensure_providers_integration.rs +++ b/crates/openshell-cli/tests/ensure_providers_integration.rs @@ -11,24 +11,21 @@ use helpers::TempDir; use helpers::{Environment, build_ca, build_client_cert, build_server_cert}; use openshell_cli::run; use openshell_cli::tls::TlsOptions; -use openshell_core::proto::open_shell_server::{OpenShell, OpenShellServer}; use openshell_core::proto::{ AttachSandboxProviderRequest, AttachSandboxProviderResponse, CreateProviderRequest, CreateSandboxRequest, CreateSshSessionRequest, CreateSshSessionResponse, DeleteProviderRequest, DeleteProviderResponse, DeleteSandboxRequest, DeleteSandboxResponse, - DetachSandboxProviderRequest, DetachSandboxProviderResponse, - ExchangeProviderSubjectTokenRequest, ExchangeProviderSubjectTokenResponse, ExecSandboxEvent, - ExecSandboxInput, ExecSandboxRequest, GatewayMessage, GetGatewayConfigRequest, - GetGatewayConfigResponse, GetProviderRequest, GetSandboxConfigRequest, - GetSandboxConfigResponse, GetSandboxProviderEnvironmentRequest, + DetachSandboxProviderRequest, DetachSandboxProviderResponse, ExecSandboxEvent, + ExecSandboxRequest, GetGatewayConfigRequest, GetGatewayConfigResponse, GetProviderRequest, + GetSandboxConfigRequest, GetSandboxConfigResponse, GetSandboxProviderEnvironmentRequest, GetSandboxProviderEnvironmentResponse, GetSandboxRequest, HealthRequest, HealthResponse, ListProvidersRequest, ListProvidersResponse, ListSandboxProvidersRequest, ListSandboxProvidersResponse, ListSandboxesRequest, ListSandboxesResponse, Provider, ProviderResponse, RevokeSshSessionRequest, RevokeSshSessionResponse, SandboxResponse, - SandboxStreamEvent, ServiceStatus, SupervisorMessage, UpdateProviderRequest, - WatchSandboxRequest, + SandboxStreamEvent, ServiceStatus, UpdateProviderRequest, WatchSandboxRequest, }; use openshell_core::{ObjectId, ObjectName}; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; use std::collections::HashMap; use std::sync::Arc; use tokio::net::TcpListener; @@ -80,42 +77,6 @@ impl TestOpenShell { #[tonic::async_trait] impl OpenShell for TestOpenShell { - async fn get_sandbox_provider_access_token( - &self, - _request: tonic::Request, - ) -> Result, Status> - { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_notify_config_update( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_endpoint_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn report_endpoint_status( &self, _request: tonic::Request, @@ -125,34 +86,6 @@ impl OpenShell for TestOpenShell { )) } - async fn begin_rootfs_tar_staging( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn report_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn finalize_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn get_current_user( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn health( &self, _request: tonic::Request, @@ -163,13 +96,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_gateway_info( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_sandbox( &self, _request: tonic::Request, @@ -177,34 +103,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(SandboxResponse::default())) } - async fn stop_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn start_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn suspend_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn resume_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn get_sandbox( &self, _request: tonic::Request, @@ -219,8 +117,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(ListSandboxesResponse::default())) } - unimplemented_sandbox_template_rpcs!(); - async fn list_sandbox_providers( &self, _request: tonic::Request, @@ -266,24 +162,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(GetGatewayConfigResponse::default())) } - async fn get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider readiness is not exercised by this mock", - )) - } - - async fn report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider installation reports are not exercised by this mock", - )) - } - async fn get_sandbox_provider_environment( &self, _request: tonic::Request, @@ -309,27 +187,6 @@ impl OpenShell for TestOpenShell { )) } - async fn get_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn list_services( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn revoke_ssh_session( &self, _request: tonic::Request, @@ -337,13 +194,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(RevokeSshSessionResponse::default())) } - async fn exchange_provider_subject_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_provider( &self, request: tonic::Request, @@ -369,13 +219,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_provider_credentials( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this mock")) - } - async fn get_provider( &self, request: tonic::Request, @@ -448,34 +291,6 @@ impl OpenShell for TestOpenShell { )) } - async fn import_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn lint_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_provider_profile( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - async fn update_provider( &self, request: tonic::Request, @@ -549,33 +364,6 @@ impl OpenShell for TestOpenShell { ..Default::default() })) } - async fn get_provider_refresh_status( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn configure_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn rotate_provider_credential( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } async fn delete_provider( &self, @@ -592,255 +380,25 @@ impl OpenShell for TestOpenShell { })) } - type WatchSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ExecSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ConnectSupervisorStream = - tokio_stream::wrappers::ReceiverStream>; - async fn watch_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } async fn exec_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } - - type ExecSandboxInteractiveStream = - tokio_stream::wrappers::ReceiverStream>; - async fn exec_sandbox_interactive( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_config( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_sandbox_policies( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_sandbox_configuration( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_logs( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn push_sandbox_logs( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn submit_policy_analysis( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_policy( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn reject_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_all_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn edit_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn undo_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn clear_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_history( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn issue_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn refresh_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn connect_supervisor( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type RelayStreamStream = - tokio_stream::wrappers::ReceiverStream>; - - async fn relay_stream( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type PeerRelayStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn peer_relay( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type ForwardTcpStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn forward_tcp( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn create_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspaces( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn add_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn remove_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspace_members( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } } // ── test server fixture ────────────────────────────────────────────── diff --git a/crates/openshell-cli/tests/helpers/mod.rs b/crates/openshell-cli/tests/helpers/mod.rs index be84c9ce6e..424c57b92f 100644 --- a/crates/openshell-cli/tests/helpers/mod.rs +++ b/crates/openshell-cli/tests/helpers/mod.rs @@ -22,95 +22,6 @@ pub fn example_profiles() -> &'static [openshell_providers::ProviderTypeProfile] .as_slice() } -#[macro_export] -macro_rules! unimplemented_sandbox_template_rpcs { - () => { - fn create_sandbox_template<'life0, 'async_trait>( - &'life0 self, - _request: tonic::Request, - ) -> std::pin::Pin< - Box< - dyn std::future::Future< - Output = Result< - tonic::Response, - tonic::Status, - >, - > + Send - + 'async_trait, - >, - > - where - 'life0: 'async_trait, - Self: 'async_trait, - { - Box::pin(async { Err(tonic::Status::unimplemented("unused")) }) - } - - fn get_sandbox_template<'life0, 'async_trait>( - &'life0 self, - _request: tonic::Request, - ) -> std::pin::Pin< - Box< - dyn std::future::Future< - Output = Result< - tonic::Response, - tonic::Status, - >, - > + Send - + 'async_trait, - >, - > - where - 'life0: 'async_trait, - Self: 'async_trait, - { - Box::pin(async { Err(tonic::Status::unimplemented("unused")) }) - } - - fn list_sandbox_templates<'life0, 'async_trait>( - &'life0 self, - _request: tonic::Request, - ) -> std::pin::Pin< - Box< - dyn std::future::Future< - Output = Result< - tonic::Response, - tonic::Status, - >, - > + Send - + 'async_trait, - >, - > - where - 'life0: 'async_trait, - Self: 'async_trait, - { - Box::pin(async { Err(tonic::Status::unimplemented("unused")) }) - } - - fn delete_sandbox_template<'life0, 'async_trait>( - &'life0 self, - _request: tonic::Request, - ) -> std::pin::Pin< - Box< - dyn std::future::Future< - Output = Result< - tonic::Response, - tonic::Status, - >, - > + Send - + 'async_trait, - >, - > - where - 'life0: 'async_trait, - Self: 'async_trait, - { - Box::pin(async { Err(tonic::Status::unimplemented("unused")) }) - } - }; -} - use openshell_crypto::pki::Certificate; use openshell_crypto::pki::KeyPair; use rcgen::{BasicConstraints, CertificateParams, ExtendedKeyUsagePurpose, IsCa}; diff --git a/crates/openshell-cli/tests/provider_commands_integration.rs b/crates/openshell-cli/tests/provider_commands_integration.rs index 1821749316..d1e521e4d0 100644 --- a/crates/openshell-cli/tests/provider_commands_integration.rs +++ b/crates/openshell-cli/tests/provider_commands_integration.rs @@ -7,33 +7,32 @@ use helpers::TempDir; use helpers::{Environment, build_ca, build_client_cert, build_server_cert}; use openshell_cli::run; use openshell_cli::tls::TlsOptions; -use openshell_core::proto::open_shell_server::{OpenShell, OpenShellServer}; use openshell_core::proto::{ AttachSandboxProviderRequest, AttachSandboxProviderResponse, CreateProviderRequest, CreateSandboxRequest, CreateSshSessionRequest, CreateSshSessionResponse, DeleteProviderRefreshRequest, DeleteProviderRefreshResponse, DeleteProviderRequest, DeleteProviderResponse, DeleteSandboxRequest, DeleteSandboxResponse, - DetachSandboxProviderRequest, DetachSandboxProviderResponse, - ExchangeProviderSubjectTokenRequest, ExchangeProviderSubjectTokenResponse, ExecSandboxEvent, - ExecSandboxInput, ExecSandboxRequest, GatewayMessage, GetGatewayConfigRequest, - GetGatewayConfigResponse, GetProviderRefreshStatusRequest, GetProviderRefreshStatusResponse, - GetProviderRequest, GetSandboxConfigRequest, GetSandboxConfigResponse, - GetSandboxProviderEnvironmentRequest, GetSandboxProviderEnvironmentResponse, - GetSandboxProviderStatusRequest, GetSandboxProviderStatusResponse, GetSandboxRequest, - HealthRequest, HealthResponse, ListProvidersRequest, ListProvidersResponse, - ListSandboxProvidersRequest, ListSandboxProvidersResponse, ListSandboxesRequest, - ListSandboxesResponse, Provider, ProviderCredentialRefresh, ProviderCredentialRefreshStatus, - ProviderCredentialRefreshStrategy, ProviderCredentialTokenGrant, - ProviderCredentialTokenGrantSubjectToken, ProviderCredentialTokenGrantType, - ProviderDesiredIdentity, ProviderMutationKind, ProviderMutationReceipt, ProviderProfile, - ProviderProfileCredential, ProviderProfileDiscovery, ProviderReadinessObservation, - ProviderReadinessReason, ProviderReadinessState, ProviderReadinessStatus, ProviderResponse, - RevokeSshSessionRequest, RevokeSshSessionResponse, RotateProviderCredentialRequest, - RotateProviderCredentialResponse, Sandbox, SandboxResponse, SandboxStreamEvent, ServiceStatus, - SettingValue, SupervisorMessage, UpdateProviderRequest, WatchSandboxRequest, WorkspaceSelector, + DetachSandboxProviderRequest, DetachSandboxProviderResponse, ExecSandboxEvent, + ExecSandboxRequest, GetGatewayConfigRequest, GetGatewayConfigResponse, + GetProviderRefreshStatusRequest, GetProviderRefreshStatusResponse, GetProviderRequest, + GetSandboxConfigRequest, GetSandboxConfigResponse, GetSandboxProviderEnvironmentRequest, + GetSandboxProviderEnvironmentResponse, GetSandboxProviderStatusRequest, + GetSandboxProviderStatusResponse, GetSandboxRequest, HealthRequest, HealthResponse, + ListProvidersRequest, ListProvidersResponse, ListSandboxProvidersRequest, + ListSandboxProvidersResponse, ListSandboxesRequest, ListSandboxesResponse, Provider, + ProviderCredentialRefresh, ProviderCredentialRefreshStatus, ProviderCredentialRefreshStrategy, + ProviderCredentialTokenGrant, ProviderCredentialTokenGrantSubjectToken, + ProviderCredentialTokenGrantType, ProviderDesiredIdentity, ProviderMutationKind, + ProviderMutationReceipt, ProviderProfile, ProviderProfileCredential, ProviderProfileDiscovery, + ProviderReadinessObservation, ProviderReadinessReason, ProviderReadinessState, + ProviderReadinessStatus, ProviderResponse, RevokeSshSessionRequest, RevokeSshSessionResponse, + RotateProviderCredentialRequest, RotateProviderCredentialResponse, Sandbox, SandboxResponse, + SandboxStreamEvent, ServiceStatus, SettingValue, UpdateProviderRequest, WatchSandboxRequest, + WorkspaceSelector, }; use openshell_core::rpc_error::{ERROR_DOMAIN, ErrorDetails, StatusExt}; use openshell_core::{ObjectId, ObjectName}; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; use std::collections::{HashMap, VecDeque}; use std::sync::Arc; use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; @@ -235,42 +234,6 @@ impl TestOpenShell { #[tonic::async_trait] impl OpenShell for TestOpenShell { - async fn get_sandbox_provider_access_token( - &self, - _request: tonic::Request, - ) -> Result, Status> - { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_notify_config_update( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_endpoint_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn report_endpoint_status( &self, _request: tonic::Request, @@ -280,34 +243,6 @@ impl OpenShell for TestOpenShell { )) } - async fn begin_rootfs_tar_staging( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn report_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn finalize_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn get_current_user( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn health( &self, _request: tonic::Request, @@ -318,13 +253,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_gateway_info( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_sandbox( &self, _request: tonic::Request, @@ -332,34 +260,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(SandboxResponse::default())) } - async fn stop_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn start_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn suspend_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn resume_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn get_sandbox( &self, request: tonic::Request, @@ -397,8 +297,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(ListSandboxesResponse::default())) } - unimplemented_sandbox_template_rpcs!(); - async fn list_sandbox_providers( &self, request: tonic::Request, @@ -695,15 +593,6 @@ impl OpenShell for TestOpenShell { })) } - async fn report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider installation reports are not exercised by this mock", - )) - } - async fn create_ssh_session( &self, _request: tonic::Request, @@ -720,27 +609,6 @@ impl OpenShell for TestOpenShell { )) } - async fn get_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn list_services( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn revoke_ssh_session( &self, _request: tonic::Request, @@ -748,13 +616,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(RevokeSshSessionResponse::default())) } - async fn exchange_provider_subject_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_provider( &self, request: tonic::Request, @@ -807,13 +668,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_provider_credentials( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this mock")) - } - async fn get_provider( &self, request: tonic::Request, @@ -1425,255 +1279,25 @@ impl OpenShell for TestOpenShell { )) } - type WatchSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ExecSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ConnectSupervisorStream = - tokio_stream::wrappers::ReceiverStream>; - async fn watch_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } async fn exec_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } - - type ExecSandboxInteractiveStream = - tokio_stream::wrappers::ReceiverStream>; - async fn exec_sandbox_interactive( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_config( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_sandbox_policies( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_sandbox_configuration( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_logs( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn push_sandbox_logs( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn submit_policy_analysis( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_policy( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn reject_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_all_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn edit_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn undo_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn clear_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_history( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn issue_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn refresh_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn connect_supervisor( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type RelayStreamStream = - tokio_stream::wrappers::ReceiverStream>; - - async fn relay_stream( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type PeerRelayStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn peer_relay( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type ForwardTcpStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn forward_tcp( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn create_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspaces( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn add_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn remove_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspace_members( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } } /// Test fixture: TLS-enabled server with matching client certs. diff --git a/crates/openshell-cli/tests/sandbox_create_lifecycle_integration.rs b/crates/openshell-cli/tests/sandbox_create_lifecycle_integration.rs index 39414f1f7f..4876915397 100644 --- a/crates/openshell-cli/tests/sandbox_create_lifecycle_integration.rs +++ b/crates/openshell-cli/tests/sandbox_create_lifecycle_integration.rs @@ -10,28 +10,26 @@ use helpers::{Environment, build_ca, build_client_cert, build_server_cert}; use openshell_bootstrap::load_last_sandbox; use openshell_cli::run; use openshell_cli::tls::TlsOptions; -use openshell_core::proto::open_shell_server::{OpenShell, OpenShellServer}; use openshell_core::proto::{ AttachSandboxProviderRequest, AttachSandboxProviderResponse, CreateProviderRequest, CreateSandboxRequest, CreateSandboxTemplateRequest, CreateSshSessionRequest, CreateSshSessionResponse, DeleteProviderRequest, DeleteProviderResponse, DeleteSandboxRequest, DeleteSandboxResponse, DeleteSandboxTemplateRequest, DetachSandboxProviderRequest, - DetachSandboxProviderResponse, ExchangeProviderSubjectTokenRequest, - ExchangeProviderSubjectTokenResponse, ExecSandboxEvent, ExecSandboxInput, ExecSandboxRequest, - GatewayMessage, GetGatewayConfigRequest, GetGatewayConfigResponse, GetProviderRequest, - GetSandboxConfigRequest, GetSandboxConfigResponse, GetSandboxProviderEnvironmentRequest, + DetachSandboxProviderResponse, ExecSandboxEvent, ExecSandboxRequest, GetGatewayConfigRequest, + GetGatewayConfigResponse, GetProviderRequest, GetSandboxConfigRequest, + GetSandboxConfigResponse, GetSandboxProviderEnvironmentRequest, GetSandboxProviderEnvironmentResponse, GetSandboxRequest, GetSandboxTemplateRequest, GpuResourceRequirements, HealthRequest, HealthResponse, ListProvidersRequest, ListProvidersResponse, ListSandboxProvidersRequest, ListSandboxProvidersResponse, ListSandboxTemplatesRequest, ListSandboxTemplatesResponse, ListSandboxesRequest, - ListSandboxesResponse, PlatformEvent, Provider, ProviderResponse, ReportEndpointStatusRequest, - ReportEndpointStatusResponse, RevokeSshSessionRequest, RevokeSshSessionResponse, Sandbox, - SandboxCondition, SandboxLogLine, SandboxPhase, SandboxResponse, SandboxStatus, - SandboxStreamEvent, SandboxTemplateResponse, SandboxWorkloadTemplate, ServiceStatus, - SettingValue, SupervisorMessage, TcpForwardFrame, TcpForwardInit, TcpRelayTarget, - UpdateProviderRequest, WatchSandboxRequest, sandbox_stream_event, tcp_forward_frame, - tcp_forward_init, + ListSandboxesResponse, PlatformEvent, Provider, ProviderResponse, RevokeSshSessionRequest, + RevokeSshSessionResponse, Sandbox, SandboxCondition, SandboxLogLine, SandboxPhase, + SandboxResponse, SandboxStatus, SandboxStreamEvent, SandboxTemplateResponse, + SandboxWorkloadTemplate, ServiceStatus, SettingValue, TcpForwardFrame, TcpForwardInit, + TcpRelayTarget, UpdateProviderRequest, WatchSandboxRequest, sandbox_stream_event, + tcp_forward_frame, tcp_forward_init, }; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; use std::collections::HashMap; use std::fs; use std::os::unix::fs::PermissionsExt; @@ -102,68 +100,12 @@ struct TestOpenShell { #[tonic::async_trait] impl OpenShell for TestOpenShell { - async fn get_sandbox_provider_access_token( - &self, - _request: tonic::Request, - ) -> Result, Status> - { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_notify_config_update( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_endpoint_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn begin_rootfs_tar_staging( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn report_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn finalize_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn get_current_user( + // The rejected-suspend test checks that this error preserves active forwards. + async fn suspend_sandbox( &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) + _request: tonic::Request, + ) -> Result, Status> { + Err(Status::unimplemented("unused")) } async fn health( @@ -176,13 +118,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_gateway_info( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_sandbox( &self, request: tonic::Request, @@ -253,27 +188,6 @@ impl OpenShell for TestOpenShell { })) } - async fn start_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn suspend_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn resume_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn get_sandbox( &self, request: tonic::Request, @@ -464,24 +378,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider readiness is not exercised by this mock", - )) - } - - async fn report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider installation reports are not exercised by this mock", - )) - } - async fn get_sandbox_provider_environment( &self, _request: tonic::Request, @@ -549,20 +445,6 @@ impl OpenShell for TestOpenShell { )) } - async fn list_services( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn revoke_ssh_session( &self, _request: tonic::Request, @@ -573,13 +455,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(RevokeSshSessionResponse::default())) } - async fn exchange_provider_subject_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_provider( &self, _request: tonic::Request, @@ -587,13 +462,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(ProviderResponse::default())) } - async fn get_provider_credentials( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this mock")) - } - async fn get_provider( &self, _request: tonic::Request, @@ -651,67 +519,12 @@ impl OpenShell for TestOpenShell { )) } - async fn import_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn lint_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_provider_profile( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - async fn update_provider( &self, _request: tonic::Request, ) -> Result, Status> { Ok(Response::new(ProviderResponse::default())) } - async fn get_provider_refresh_status( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn configure_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn rotate_provider_credential( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } async fn delete_provider( &self, @@ -722,17 +535,10 @@ impl OpenShell for TestOpenShell { })) } - type WatchSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ExecSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ConnectSupervisorStream = - tokio_stream::wrappers::ReceiverStream>; - async fn watch_sandbox( &self, request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let request = request.into_inner(); let sandbox_id = format!("id-{}", request.sandbox); let (tx, rx) = mpsc::channel(4); @@ -964,199 +770,27 @@ impl OpenShell for TestOpenShell { .await; }); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } async fn exec_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } - type ExecSandboxInteractiveStream = - tokio_stream::wrappers::ReceiverStream>; - async fn exec_sandbox_interactive( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_config( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_sandbox_policies( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_sandbox_configuration( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_endpoint_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_logs( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn push_sandbox_logs( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn submit_policy_analysis( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_policy( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn reject_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_all_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn edit_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn undo_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn clear_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_history( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn issue_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn refresh_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn connect_supervisor( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type RelayStreamStream = - tokio_stream::wrappers::ReceiverStream>; - - async fn relay_stream( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type PeerRelayStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn peer_relay( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type ForwardTcpStream = tokio_stream::wrappers::ReceiverStream>; - /// Echo relay: validates the init frame like the gateway does, then sends /// every `Data` frame straight back. async fn forward_tcp( &self, request: tonic::Request>, - ) -> Result, Status> { + ) -> Result>, Status> { let mut inbound = request.into_inner(); let Some(TcpForwardFrame { payload: Some(tcp_forward_frame::Payload::Init(init)), @@ -1200,59 +834,10 @@ impl OpenShell for TestOpenShell { } } }); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } - - async fn create_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspaces( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn add_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn remove_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspace_members( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } } struct TestServer { diff --git a/crates/openshell-cli/tests/sandbox_name_fallback_integration.rs b/crates/openshell-cli/tests/sandbox_name_fallback_integration.rs index 7f31b1c4aa..d3e07008d4 100644 --- a/crates/openshell-cli/tests/sandbox_name_fallback_integration.rs +++ b/crates/openshell-cli/tests/sandbox_name_fallback_integration.rs @@ -8,23 +8,22 @@ use helpers::{Environment, build_ca, build_client_cert, build_server_cert}; use openshell_bootstrap::{load_last_sandbox, save_last_sandbox}; use openshell_cli::run; use openshell_cli::tls::TlsOptions; -use openshell_core::proto::open_shell_server::{OpenShell, OpenShellServer}; use openshell_core::proto::{ AttachSandboxProviderRequest, AttachSandboxProviderResponse, CreateProviderRequest, CreateSandboxRequest, CreateSshSessionRequest, CreateSshSessionResponse, DeleteProviderRequest, DeleteProviderResponse, DeleteSandboxRequest, DeleteSandboxResponse, - DetachSandboxProviderRequest, DetachSandboxProviderResponse, - ExchangeProviderSubjectTokenRequest, ExchangeProviderSubjectTokenResponse, ExecSandboxEvent, - ExecSandboxInput, ExecSandboxRequest, GatewayMessage, GetGatewayConfigRequest, - GetGatewayConfigResponse, GetProviderRequest, GetSandboxConfigRequest, - GetSandboxConfigResponse, GetSandboxPolicyStatusRequest, GetSandboxPolicyStatusResponse, - GetSandboxProviderEnvironmentRequest, GetSandboxProviderEnvironmentResponse, GetSandboxRequest, - HealthRequest, HealthResponse, ListProvidersRequest, ListProvidersResponse, - ListSandboxProvidersRequest, ListSandboxProvidersResponse, ListSandboxesRequest, - ListSandboxesResponse, NetworkEndpoint, NetworkPolicyRule, PolicyStatus, ProviderResponse, - Sandbox, SandboxPolicy, SandboxPolicyRevision, SandboxResponse, SandboxStreamEvent, - ServiceStatus, SupervisorMessage, UpdateProviderRequest, WatchSandboxRequest, + DetachSandboxProviderRequest, DetachSandboxProviderResponse, ExecSandboxEvent, + ExecSandboxRequest, GetGatewayConfigRequest, GetGatewayConfigResponse, GetProviderRequest, + GetSandboxConfigRequest, GetSandboxConfigResponse, GetSandboxPolicyStatusRequest, + GetSandboxPolicyStatusResponse, GetSandboxProviderEnvironmentRequest, + GetSandboxProviderEnvironmentResponse, GetSandboxRequest, HealthRequest, HealthResponse, + ListProvidersRequest, ListProvidersResponse, ListSandboxProvidersRequest, + ListSandboxProvidersResponse, ListSandboxesRequest, ListSandboxesResponse, NetworkEndpoint, + NetworkPolicyRule, PolicyStatus, ProviderResponse, Sandbox, SandboxPolicy, + SandboxPolicyRevision, SandboxResponse, SandboxStreamEvent, ServiceStatus, + UpdateProviderRequest, WatchSandboxRequest, }; +use openshell_server::test_support::grpc::open_shell_server::{OpenShell, OpenShellServer}; use std::sync::Arc; use tokio::net::TcpListener; use tokio::sync::{Mutex, mpsc}; @@ -47,42 +46,6 @@ struct TestOpenShell { #[tonic::async_trait] impl OpenShell for TestOpenShell { - async fn get_sandbox_provider_access_token( - &self, - _request: tonic::Request, - ) -> Result, Status> - { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_notify_config_update( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_report_endpoint_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn peer_get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn report_endpoint_status( &self, _request: tonic::Request, @@ -92,34 +55,6 @@ impl OpenShell for TestOpenShell { )) } - async fn begin_rootfs_tar_staging( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn report_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn finalize_main_process_exit( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - - async fn get_current_user( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this test server")) - } - async fn health( &self, _request: tonic::Request, @@ -130,13 +65,6 @@ impl OpenShell for TestOpenShell { })) } - async fn get_gateway_info( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_sandbox( &self, _request: tonic::Request, @@ -144,34 +72,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(SandboxResponse::default())) } - async fn stop_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn start_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn suspend_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn resume_sandbox( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn get_sandbox( &self, request: tonic::Request, @@ -204,8 +104,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(ListSandboxesResponse::default())) } - unimplemented_sandbox_template_rpcs!(); - async fn list_sandbox_providers( &self, _request: tonic::Request, @@ -299,24 +197,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(GetGatewayConfigResponse::default())) } - async fn get_sandbox_provider_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider readiness is not exercised by this mock", - )) - } - - async fn report_provider_readiness( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented( - "provider installation reports are not exercised by this mock", - )) - } - async fn get_sandbox_provider_environment( &self, _request: tonic::Request, @@ -342,27 +222,6 @@ impl OpenShell for TestOpenShell { )) } - async fn get_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn list_services( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_service( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn revoke_ssh_session( &self, _request: tonic::Request, @@ -372,13 +231,6 @@ impl OpenShell for TestOpenShell { )) } - async fn exchange_provider_subject_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - async fn create_provider( &self, _request: tonic::Request, @@ -386,13 +238,6 @@ impl OpenShell for TestOpenShell { Ok(Response::new(ProviderResponse::default())) } - async fn get_provider_credentials( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not used by this mock")) - } - async fn get_provider( &self, _request: tonic::Request, @@ -407,81 +252,12 @@ impl OpenShell for TestOpenShell { Ok(Response::new(ListProvidersResponse::default())) } - async fn list_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_provider_profile( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn import_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn lint_provider_profiles( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_provider_profile( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - async fn update_provider( &self, _request: tonic::Request, ) -> Result, Status> { Ok(Response::new(ProviderResponse::default())) } - async fn get_provider_refresh_status( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn configure_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn rotate_provider_credential( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } - - async fn delete_provider_refresh( - &self, - _: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("unused")) - } async fn delete_provider( &self, @@ -492,49 +268,26 @@ impl OpenShell for TestOpenShell { })) } - type WatchSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ExecSandboxStream = - tokio_stream::wrappers::ReceiverStream>; - type ConnectSupervisorStream = - tokio_stream::wrappers::ReceiverStream>; - async fn watch_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } async fn exec_sandbox( &self, _request: tonic::Request, - ) -> Result, Status> { + ) -> Result>, Status> { let (_tx, rx) = mpsc::channel(1); - Ok(Response::new(tokio_stream::wrappers::ReceiverStream::new( - rx, + Ok(Response::new(Box::pin( + tokio_stream::wrappers::ReceiverStream::new(rx), ))) } - type ExecSandboxInteractiveStream = - tokio_stream::wrappers::ReceiverStream>; - async fn exec_sandbox_interactive( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn update_config( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - async fn get_sandbox_policy_status( &self, request: tonic::Request, @@ -578,206 +331,6 @@ impl OpenShell for TestOpenShell { active_version: 7, })) } - - async fn list_sandbox_policies( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_sandbox_configuration( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn report_policy_status( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_sandbox_logs( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn push_sandbox_logs( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn submit_policy_analysis( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_policy( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn reject_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn approve_all_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn edit_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn undo_draft_chunk( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn clear_draft_chunks( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_draft_history( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn issue_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn refresh_sandbox_token( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn connect_supervisor( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type RelayStreamStream = - tokio_stream::wrappers::ReceiverStream>; - - async fn relay_stream( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type PeerRelayStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn peer_relay( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - type ForwardTcpStream = tokio_stream::wrappers::ReceiverStream< - Result, - >; - - async fn forward_tcp( - &self, - _request: tonic::Request>, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn create_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn get_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspaces( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn delete_workspace( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn add_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn remove_workspace_member( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } - - async fn list_workspace_members( - &self, - _request: tonic::Request, - ) -> Result, Status> { - Err(Status::unimplemented("not implemented in test")) - } } struct TestServer {