Skip to content

Update review-protocol dependency and tests (Closes #666) #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
octoaide wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −43
Open

Update review-protocol dependency and tests (Closes #666) #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Changed

- Update `review-protocol` to revision `b0eae25` and adapt tests to its renamed
agent metadata field and public request APIs.
- Simplified `list_files` to return only file names instead of unused size and
modified-time data.

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nix = { version = "0.31", features = ["reboot", "fs"] }
pnet = { version = "0.35", features = ["pnet_datalink", "std"] }
quinn = { version = "0.11", default-features = false }
regex = "1.11"
review-protocol = { git = "https://github.com/petabi/review-protocol.git", tag = "0.19.0", features = [
review-protocol = { git = "https://github.com/petabi/review-protocol.git", rev = "b0eae25", features = [
"client",
] }
serde = { version = "1", features = ["derive"] }
Expand All @@ -37,7 +37,7 @@ uptime_lib = "0.3"
[dev-dependencies]
quinn = { version = "0.11", features = ["ring", "runtime-tokio"] }
rcgen = "0.14"
review-protocol = { git = "https://github.com/petabi/review-protocol.git", tag = "0.19.0", features = [
review-protocol = { git = "https://github.com/petabi/review-protocol.git", rev = "b0eae25", features = [
"server",
] }
rustls = { version = "0.23", features = ["ring"] }
Expand Down
52 changes: 12 additions & 40 deletions src/bin/roxyd/control.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ mod tests {
conn.connect()
);

assert_eq!(agent_info.app_name, env!("CARGO_PKG_NAME"));
assert_eq!(agent_info.agent_name, env!("CARGO_PKG_NAME"));
let inner = conn_result.expect("client connection");
assert_eq!(inner.remote_addr(), server_addr);
}
Expand Down Expand Up @@ -768,7 +768,7 @@ mod tests {
conn.connect()
);

assert_eq!(agent_info.app_name, env!("CARGO_PKG_NAME"));
assert_eq!(agent_info.agent_name, env!("CARGO_PKG_NAME"));
let inner = conn_result.expect("client connection");
assert_eq!(inner.remote_addr(), server_addr);
}
Expand Down Expand Up @@ -959,60 +959,32 @@ mod tests {
})
}

/// Legacy flat request codes from review-protocol 0.19.0 (`client::RequestCode`).
#[cfg(target_os = "linux")]
const FLAT_REQUEST_REBOOT: u32 = 4;
#[cfg(target_os = "linux")]
const FLAT_REQUEST_SHUTDOWN: u32 = 21;

/// Sends a legacy flat request (review-protocol 0.19.0 wire framing).
#[cfg(target_os = "linux")]
async fn send_legacy_flat_request(
conn: &review_protocol::server::Connection,
request_code: u32,
) -> anyhow::Result<()> {
let (mut send, mut recv) = conn.open_bi().await?;
let resp: Result<(), String> =
review_protocol::unary_request(&mut send, &mut recv, request_code, ())
.await
.map_err(|e| anyhow::anyhow!("flat request transport failed: {e}"))?;
resp.map_err(|e| anyhow::anyhow!(e))
}

#[cfg(target_os = "linux")]
#[tokio::test]
async fn dispatch_flat_reboot_request_code_over_live_connection() {
let (inner, server, _endpoint) = setup_test_connection().await;
async fn legacy_reboot_delegates_to_node_power() {
let mock = Arc::new(handlers::power::MockPowerBackend::default());
let task = spawn_dispatch_loop_with_mock(inner, mock.clone());
let backend: Arc<dyn PowerBackend> = mock.clone();
let mut handler = super::RequestHandler::with_power_backend(backend);

send_legacy_flat_request(&server, FLAT_REQUEST_REBOOT)
review_protocol::request::Handler::reboot(&mut handler)
.await
.expect("flat reboot should return legacy ()");
.expect("legacy reboot should succeed");

handlers::power::wait_for_mock_count(&mock.reboot_count, 1).await;

drop(server);
let task_result = task.await.expect("dispatch task should not panic");
assert!(task_result.is_ok());
}

#[cfg(target_os = "linux")]
#[tokio::test]
async fn dispatch_flat_shutdown_request_code_over_live_connection() {
let (inner, server, _endpoint) = setup_test_connection().await;
async fn legacy_shutdown_delegates_to_node_power() {
let mock = Arc::new(handlers::power::MockPowerBackend::default());
let task = spawn_dispatch_loop_with_mock(inner, mock.clone());
let backend: Arc<dyn PowerBackend> = mock.clone();
let mut handler = super::RequestHandler::with_power_backend(backend);

send_legacy_flat_request(&server, FLAT_REQUEST_SHUTDOWN)
review_protocol::request::Handler::shutdown(&mut handler)
.await
.expect("flat shutdown should return legacy ()");
.expect("legacy shutdown should succeed");

handlers::power::wait_for_mock_count(&mock.power_off_count, 1).await;

drop(server);
let task_result = task.await.expect("dispatch task should not panic");
assert!(task_result.is_ok());
}

#[cfg(target_os = "linux")]
Expand Down