Bump several crate versions (#80)

guvenc · web-flow · commit 3f90cdacff34 · 2025-09-23T09:58:03.000+02:00
* Bump versions anyhow, clap crossterm crates

Signed-off-by: Guvenc Gulce &lt;guevenc.guelce@sap.com&gt;

* Bump tonic and prost crates to latest version

Signed-off-by: Guvenc Gulce &lt;guevenc.guelce@sap.com&gt;

* Fix clippy warning

Signed-off-by: Guvenc Gulce &lt;guevenc.guelce@sap.com&gt;

* Bump rtnetlink version to the latest

Signed-off-by: Guvenc Gulce &lt;guevenc.guelce@sap.com&gt;

---------

Signed-off-by: Guvenc Gulce &lt;guevenc.guelce@sap.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,15 +17,15 @@ edition = "2021"
 [workspace.dependencies]
 tokio = { version = "1.47.1", features = ["full"] }
 tokio-stream = { version = "0.1.15", features = ["net"] }
-tonic = "0.11.0"
-prost = "0.12.3"
-prost-types = "0.12.3"
-anyhow = "1.0.80"
+tonic = "0.13.0"
+prost = "0.13.5"
+prost-types = "0.13.5"
+anyhow = "1.0.100"
 nix = { version = "0.29.0", features = ["mount", "user", "reboot", "feature", "net", "aio", "signal", "process", "fs", "hostname"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.132"
 uuid = { version = "1.18.1", features = ["v4"] }
-tonic-build = "0.11.0"
+tonic-build = "0.13.0"
 log = "0.4.28"
 env_logger = "0.11"
 openssl = { version = "0.10.72", features = ["vendored"] }
@@ -35,14 +35,15 @@ tower = { version = "0.4", features = ["full"] }
 sha2 = "0.10"
 hex = "0.4"
 digest = "0.10"
-clap = { version = "4.5.47", features = ["derive", "env"] }
+clap = { version = "4.5.48", features = ["derive", "env"] }
 dotenvy = { version = "0.15"}
 libc = "0.2"
-rtnetlink = "0.14.1"
-netlink-packet-route = "~0.19.0"
+rtnetlink = "0.18.1"
+netlink-packet-route = "~0.25.0"
 pnet = "0.35.0"
 dhcproto = "0.13.0"
 socket2 = "0.6.0"
 futures = "0.3.31"
 chrono = "0.4.42"
+hyper-util = { version = "0.1.14", features = ["tokio"] }
 feos-proto = { path = "feos/proto" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -16,11 +16,12 @@ tonic = { workspace = true }
 anyhow = { workspace = true }
 log = { workspace = true }
 tokio-stream = { workspace = true }
+hyper-util = { workspace = true }
 prost = { workspace = true }
 tower = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
 
 # CLI specific dependencies
 env_logger = { workspace = true }
-crossterm = "0.27"
+crossterm = "0.29"
 chrono = { workspace = true }
diff --git a/cli/src/image_commands.rs b/cli/src/image_commands.rs
@@ -7,6 +7,7 @@ use feos_proto::image_service::{
     image_service_client::ImageServiceClient, DeleteImageRequest, ImageState, ListImagesRequest,
     PullImageRequest, WatchImageStatusRequest,
 };
+use hyper_util::rt::TokioIo;
 use std::path::PathBuf;
 use tokio::net::UnixStream;
 use tokio_stream::StreamExt;
@@ -55,7 +56,8 @@ pub enum ImageCommand {
 async fn get_image_client(socket: PathBuf) -> Result<ImageServiceClient<Channel>> {
     let channel = Endpoint::try_from("http://[::1]:50051")?
         .connect_with_connector(service_fn(move |_: Uri| {
-            UnixStream::connect(socket.clone())
+            let socket = socket.clone();
+            async move { UnixStream::connect(socket).await.map(TokioIo::new) }
         }))
         .await
         .context("Failed to connect to ImageService via Unix socket")?;
diff --git a/cli/src/vm_commands.rs b/cli/src/vm_commands.rs
@@ -349,15 +349,12 @@ async fn wait_for_vm_state(
                 }
             }
             Err(status) => {
-                anyhow::bail!("Error in event stream: {}", status);
+                anyhow::bail!("Error in event stream: {status}");
             }
         }
     }
 
-    anyhow::bail!(
-        "Event stream ended before reaching target state: {:?}",
-        target_state
-    )
+    anyhow::bail!("Event stream ended before reaching target state: {target_state:?}")
 }
 
 async fn create_vm(
diff --git a/feos/Cargo.toml b/feos/Cargo.toml
@@ -53,6 +53,7 @@ log = { workspace = true }
 env_logger = { workspace = true }
 tokio-stream = { workspace = true }
 prost = { workspace = true }
+hyper-util = { workspace = true }
 once_cell = "1.19"
 regex = "1.10"
 tower = { workspace = true }
diff --git a/feos/proto/build.rs b/feos/proto/build.rs
@@ -6,7 +6,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     tonic_build::configure()
         .protoc_arg("--experimental_allow_proto3_optional")
-        .compile(
+        .compile_protos(
             &[
                 format!("{proto_dir}/vm.proto"),
                 format!("{proto_dir}/host.proto"),
diff --git a/feos/services/vm-service/src/api.rs b/feos/services/vm-service/src/api.rs
@@ -131,7 +131,7 @@ impl VmService for VmApiHandler {
         info!("VmApi: Received StreamVmConsole stream request.");
         let grpc_input_stream = request.into_inner();
         let (grpc_output_tx, grpc_output_rx) = mpsc::channel(32);
-        let cmd = Command::StreamVmConsole(grpc_input_stream, grpc_output_tx);
+        let cmd = Command::StreamVmConsole(Box::new(grpc_input_stream), grpc_output_tx);
         self.dispatcher_tx
             .send(cmd)
             .await
diff --git a/feos/services/vm-service/src/dispatcher.rs b/feos/services/vm-service/src/dispatcher.rs
@@ -85,7 +85,7 @@ impl VmServiceDispatcher {
                             handle_delete_vm_command(&self.repository, &self.healthcheck_cancel_bus, req, responder, hypervisor, event_bus_tx).await;
                         }
                         Command::StreamVmConsole(input_stream, output_tx) => {
-                            tokio::spawn(worker::handle_stream_vm_console(input_stream, output_tx, hypervisor));
+                            tokio::spawn(worker::handle_stream_vm_console(*input_stream, output_tx, hypervisor));
                         }
                         Command::ListVms(req, responder) => {
                             handle_list_vms_command(&self.repository, req, responder).await;
diff --git a/feos/services/vm-service/src/dispatcher_handlers.rs b/feos/services/vm-service/src/dispatcher_handlers.rs
@@ -14,6 +14,7 @@ use feos_proto::{
         VmStateChangedEvent,
     },
 };
+use hyper_util::rt::TokioIo;
 use image_service::IMAGE_SERVICE_SOCKET;
 use log::{error, info, warn};
 use nix::unistd::Pid;
@@ -34,7 +35,12 @@ pub(crate) async fn get_image_service_client(
     Endpoint::try_from("http://[::1]:50051")
         .unwrap()
         .connect_with_connector(service_fn(move |_: Uri| {
-            tokio::net::UnixStream::connect(socket_path.clone())
+            let socket_path = socket_path.clone();
+            async move {
+                tokio::net::UnixStream::connect(socket_path)
+                    .await
+                    .map(TokioIo::new)
+            }
         }))
         .await
         .map(ImageServiceClient::new)
diff --git a/feos/services/vm-service/src/lib.rs b/feos/services/vm-service/src/lib.rs
@@ -47,7 +47,7 @@ pub enum Command {
         oneshot::Sender<Result<DeleteVmResponse, Status>>,
     ),
     StreamVmConsole(
-        Streaming<StreamVmConsoleRequest>,
+        Box<Streaming<StreamVmConsoleRequest>>,
         mpsc::Sender<Result<StreamVmConsoleResponse, Status>>,
     ),
     ListVms(
diff --git a/feos/services/vm-service/src/persistence/repository.rs b/feos/services/vm-service/src/persistence/repository.rs
@@ -33,7 +33,7 @@ fn string_to_vm_state(s: &str) -> Result<VmState, anyhow::Error> {
         "VM_STATE_STOPPED" => Ok(VmState::Stopped),
         "VM_STATE_CRASHED" => Ok(VmState::Crashed),
         "VM_STATE_UNSPECIFIED" => Ok(VmState::Unspecified),
-        _ => Err(anyhow!("Invalid state string '{}' in database", s)),
+        _ => Err(anyhow!("Invalid state string '{s}' in database")),
     }
 }
 
@@ -61,7 +61,7 @@ impl VmRepository {
 
         if let Some(row) = row_opt {
             let config = VmConfig::decode(&*row.config_blob)
-                .map_err(|e| anyhow!("Failed to decode VmConfig blob: {}", e))?;
+                .map_err(|e| anyhow!("Failed to decode VmConfig blob: {e}"))?;
 
             let state = string_to_vm_state(&row.state)?;
 
diff --git a/feos/src/main.rs b/feos/src/main.rs
@@ -27,13 +27,13 @@ async fn main() -> Result<()> {
         });
 
         if root_fstype == "rootfs" {
-            move_root().map_err(|e| anyhow::anyhow!("[feos] move_root failed: {}", e))?;
+            move_root().map_err(|e| anyhow::anyhow!("[feos] move_root failed: {e}"))?;
 
             let argv: Vec<CString> = env::args()
                 .map(|arg| CString::new(arg).unwrap_or_default())
                 .collect();
-            let _ = execv(&argv[0], &argv)
-                .map_err(|e| anyhow::anyhow!("[feos] execv failed: {}", e))?;
+            let _ =
+                execv(&argv[0], &argv).map_err(|e| anyhow::anyhow!("[feos] execv failed: {e}"))?;
 
             return Err(anyhow::anyhow!("execv failed to replace process"));
         }
diff --git a/feos/tests/integration_tests.rs b/feos/tests/integration_tests.rs
@@ -17,6 +17,7 @@ use feos_proto::{
         VmEvent, VmState, VmStateChangedEvent,
     },
 };
+use hyper_util::rt::TokioIo;
 use image_service::{IMAGE_DIR, IMAGE_SERVICE_SOCKET};
 use log::{error, info, warn};
 use nix::sys::signal::{kill, Signal};
@@ -102,8 +103,10 @@ async fn get_public_clients() -> Result<(VmServiceClient<Channel>, HostServiceCl
 async fn get_image_service_client() -> Result<ImageServiceClient<Channel>> {
     let endpoint = Endpoint::from_static("http://[::1]:50051");
     let channel = endpoint
-        .connect_with_connector(service_fn(|_: Uri| {
+        .connect_with_connector(service_fn(|_: Uri| async {
             UnixStream::connect(IMAGE_SERVICE_SOCKET)
+                .await
+                .map(TokioIo::new)
         }))
         .await?;
     Ok(ImageServiceClient::new(channel))
diff --git a/feos/utils/src/network/dhcpv6.rs b/feos/utils/src/network/dhcpv6.rs
@@ -5,7 +5,7 @@ use dhcproto::v6::*;
 use futures::stream::TryStreamExt;
 use log::{error, info, warn};
 use netlink_packet_route::route::{
-    RouteAddress, RouteAttribute, RouteProtocol, RouteScope, RouteType,
+    RouteAddress, RouteAttribute, RouteMessage, RouteProtocol, RouteScope, RouteType,
 };
 use netlink_packet_route::AddressFamily;
 use nix::net::if_::if_nametoindex;
@@ -498,8 +498,8 @@ pub async fn add_ipv6_route(
         .try_next()
         .await?
         .ok_or(Error::RequestFailed)?;
-    let mut req = handle.route().add();
-    let msg = req.message_mut();
+
+    let mut msg = RouteMessage::default();
     msg.header.address_family = AddressFamily::Inet6;
     msg.header.scope = RouteScope::Universe;
     msg.header.protocol = RouteProtocol::Static;
@@ -515,7 +515,8 @@ pub async fn add_ipv6_route(
     }
     msg.attributes.push(RouteAttribute::Oif(link.header.index));
     msg.attributes.push(RouteAttribute::Priority(metric));
-    req.execute().await
+
+    handle.route().add(msg).execute().await
 }
 
 pub async fn set_ipv6_gateway(
@@ -531,8 +532,8 @@ pub async fn set_ipv6_gateway(
         .try_next()
         .await?
         .ok_or(Error::RequestFailed)?;
-    let mut req = handle.route().add();
-    let msg = req.message_mut();
+
+    let mut msg = RouteMessage::default();
     msg.header.address_family = AddressFamily::Inet6;
     msg.header.scope = RouteScope::Universe;
     msg.header.protocol = RouteProtocol::Static;
@@ -541,5 +542,6 @@ pub async fn set_ipv6_gateway(
     msg.attributes
         .push(RouteAttribute::Gateway(RouteAddress::Inet6(ipv6_gateway)));
     msg.attributes.push(RouteAttribute::Oif(link.header.index));
-    req.execute().await
+
+    handle.route().add(msg).execute().await
 }
diff --git a/feos/utils/src/network/utils.rs b/feos/utils/src/network/utils.rs
@@ -4,6 +4,7 @@
 use super::dhcpv6::*;
 use futures::stream::TryStreamExt;
 use log::{error, info, warn};
+use netlink_packet_route::link::{LinkAttribute, LinkFlags, LinkMessage};
 use netlink_packet_route::route::RouteType;
 use rtnetlink::new_connection;
 use std::fs::File;
@@ -162,24 +163,28 @@ pub async fn configure_network_devices() -> Result<Option<(Ipv6Addr, u8)>, Strin
         .map_err(|e| format!("{interface_name} not found: {e}"))?
         .ok_or("Link not found".to_string())?;
 
+    let mut link_msg = LinkMessage::default();
+    link_msg.header.index = link.header.index;
+    link_msg.header.flags = link.header.flags | LinkFlags::Up;
+    link_msg.header.change_mask = LinkFlags::Up;
+
     handle
         .link()
-        .set(link.header.index)
-        .up()
+        .set(link_msg)
         .execute()
         .await
         .map_err(|e| format!("{interface_name} can not be set up: {e}"))?;
 
     info!("{interface_name}:");
     for attr in link.attributes {
         match attr {
-            netlink_packet_route::link::LinkAttribute::Address(mac_bytes) => {
+            LinkAttribute::Address(mac_bytes) => {
                 info!("  mac: {}", format_mac(mac_bytes.clone()));
             }
-            netlink_packet_route::link::LinkAttribute::Carrier(carrier) => {
+            LinkAttribute::Carrier(carrier) => {
                 info!("  carrier: {carrier}");
             }
-            netlink_packet_route::link::LinkAttribute::Mtu(mtu) => {
+            LinkAttribute::Mtu(mtu) => {
                 info!("  mtu: {mtu}");
             }
             _ => (),

Original file line number	Diff line number	Diff line change
`@@ -349,15 +349,12 @@ async fn wait_for_vm_state(`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`	`Err(status) => {`
`352`		`- anyhow::bail!("Error in event stream: {}", status);`
	`352`	`+ anyhow::bail!("Error in event stream: {status}");`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`
`357`		`- anyhow::bail!(`
`358`		`- "Event stream ended before reaching target state: {:?}",`
`359`		`- target_state`
`360`		`- )`
	`357`	`+ anyhow::bail!("Event stream ended before reaching target state: {target_state:?}")`
`361`	`358`	`}`
`362`	`359`
`363`	`360`	`async fn create_vm(`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ impl VmServiceDispatcher {`
`85`	`85`	`handle_delete_vm_command(&self.repository, &self.healthcheck_cancel_bus, req, responder, hypervisor, event_bus_tx).await;`
`86`	`86`	`}`
`87`	`87`	`Command::StreamVmConsole(input_stream, output_tx) => {`
`88`		`- tokio::spawn(worker::handle_stream_vm_console(input_stream, output_tx, hypervisor));`
	`88`	`+ tokio::spawn(worker::handle_stream_vm_console(*input_stream, output_tx, hypervisor));`
`89`	`89`	`}`
`90`	`90`	`Command::ListVms(req, responder) => {`
`91`	`91`	`handle_list_vms_command(&self.repository, req, responder).await;`