Fix formatting issues

Signed-off-by: Guvenc Gulce <guevenc.guelce@sap.com>

Author: guvenc

cli/src/host_commands.rs

@@ -2,8 +2,7 @@ use anyhow::{Context, Result};
 use clap::{Args, Subcommand};
 use digest::Digest;
 use proto_definitions::host_service::{
-    host_service_client::HostServiceClient, upgrade_request, Empty, UpgradeMetadata,
-    UpgradeRequest,
+    host_service_client::HostServiceClient, upgrade_request, Empty, UpgradeMetadata, UpgradeRequest,
 };
 use sha2::Sha256;
 use std::path::PathBuf;
@@ -79,7 +78,9 @@ async fn upgrade_feos(client: &mut HostServiceClient<Channel>, binary_path: Path
     let request_stream = ReceiverStream::new(rx);
 
     let upload_task = tokio::spawn(async move {
-        let metadata = UpgradeMetadata { sha256_sum: checksum };
+        let metadata = UpgradeMetadata {
+            sha256_sum: checksum,
+        };
         let metadata_req = UpgradeRequest {
             payload: Some(upgrade_request::Payload::Metadata(metadata)),
         };
@@ -127,4 +128,4 @@ async fn upgrade_feos(client: &mut HostServiceClient<Channel>, binary_path: Path
     upload_task.await?;
 
     Ok(())
-}
+}

cli/src/image_commands.rs

@@ -138,4 +138,4 @@ async fn delete_image(client: &mut ImageServiceClient<Channel>, image_uuid: Stri
     client.delete_image(request).await?;
     println!("Successfully deleted image: {image_uuid}");
     Ok(())
-}
+}

cli/src/main.rs

@@ -35,4 +35,4 @@ async fn main() -> Result<()> {
     }
 
     Ok(())
-}
+}

cli/src/vm_commands.rs

@@ -5,10 +5,10 @@ use crossterm::tty::IsTty;
 use prost::Message;
 use proto_definitions::vm_service::{
     stream_vm_console_request as console_input, vm_service_client::VmServiceClient,
-    AttachConsoleMessage, AttachDiskRequest, ConsoleData, CreateVmRequest, DeleteVmRequest,
-    DiskConfig, GetVmRequest, ListVmsRequest, MemoryConfig, PauseVmRequest, PingVmRequest,
-    RemoveDiskRequest, ResumeVmRequest, ShutdownVmRequest, StartVmRequest, StreamVmConsoleRequest,
-    StreamVmEventsRequest, VmConfig, VmState, VmStateChangedEvent, CpuConfig,
+    AttachConsoleMessage, AttachDiskRequest, ConsoleData, CpuConfig, CreateVmRequest,
+    DeleteVmRequest, DiskConfig, GetVmRequest, ListVmsRequest, MemoryConfig, PauseVmRequest,
+    PingVmRequest, RemoveDiskRequest, ResumeVmRequest, ShutdownVmRequest, StartVmRequest,
+    StreamVmConsoleRequest, StreamVmEventsRequest, VmConfig, VmState, VmStateChangedEvent,
 };
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::sync::mpsc;
@@ -149,10 +149,7 @@ async fn create_vm(
         "Use 'feos-cli vm events {}' to watch its progress.",
         response.vm_id
     );
-    println!(
-        "Then 'feos-cli vm start {}' to start it.",
-        response.vm_id
-    );
+    println!("Then 'feos-cli vm start {}' to start it.", response.vm_id);
 
     Ok(())
 }
@@ -429,8 +426,6 @@ async fn remove_disk(
         device_id: device_id.clone(),
     };
     client.remove_disk(request).await?;
-    println!(
-        "Disk remove request sent for device {device_id} on VM {vm_id}"
-    );
+    println!("Disk remove request sent for device {device_id} on VM {vm_id}");
     Ok(())
-}
+}

feos/src/lib.rs

@@ -11,24 +11,25 @@ use vm_service::VM_CONSOLE_DIR;
 
 use log::{error, info, warn};
 use network::configure_network_devices;
+use nix::libc;
 use nix::unistd::Uid;
 use proto_definitions::{
     host_service::host_service_server::HostServiceServer,
     image_service::image_service_server::ImageServiceServer,
     vm_service::vm_service_server::VmServiceServer,
 };
-use std::path::Path;
-use tokio::fs::{self, File};
 use std::env;
-use nix::libc;
 use std::ffi::CString;
 use std::os::unix::ffi::OsStringExt;
 use std::os::unix::fs::PermissionsExt;
+use std::path::Path;
+use tokio::fs::{self, File};
 use tokio::{net::UnixListener, sync::mpsc};
 use tokio_stream::wrappers::UnixListenerStream;
 use tonic::transport::Server;
 use vm_service::{
-    api::VmApiHandler, dispatcher::VmServiceDispatcher, Command as VmCommand, VM_API_SOCKET_DIR, DEFAULT_VM_DB_URL
+    api::VmApiHandler, dispatcher::VmServiceDispatcher, Command as VmCommand, DEFAULT_VM_DB_URL,
+    VM_API_SOCKET_DIR,
 };
 
 pub async fn run_server(restarted_after_upgrade: bool) -> Result<()> {
@@ -76,11 +77,17 @@ pub async fn run_server(restarted_after_upgrade: bool) -> Result<()> {
     if let Some(db_path_str) = db_url.strip_prefix("sqlite:") {
         let db_path = Path::new(db_path_str);
         if let Some(db_dir) = db_path.parent() {
-            info!("MAIN: Ensuring database directory '{}' exists...", db_dir.display());
+            info!(
+                "MAIN: Ensuring database directory '{}' exists...",
+                db_dir.display()
+            );
             fs::create_dir_all(db_dir).await?;
         }
         if !db_path.exists() {
-            info!("MAIN: Database file does not exist, creating at '{}'...", db_path.display());
+            info!(
+                "MAIN: Database file does not exist, creating at '{}'...",
+                db_path.display()
+            );
             File::create(db_path).await?;
         }
     }
@@ -226,4 +233,4 @@ pub async fn run_server(restarted_after_upgrade: bool) -> Result<()> {
     };
 
     Ok(())
-}
+}

feos/src/main.rs

@@ -41,4 +41,4 @@ async fn main() -> Result<()> {
         .init();
 
     run_server(args.restarted_after_upgrade).await
-}
+}

feos/tests/integration_tests.rs

@@ -3,19 +3,19 @@ use image_service::{IMAGE_DIR, IMAGE_SERVICE_SOCKET};
 use log::{error, info, warn};
 use nix::sys::signal::{kill, Signal};
 use nix::unistd::{self, Pid};
+use prost::Message;
 use proto_definitions::{
     host_service::{host_service_client::HostServiceClient, Empty},
     image_service::{
         image_service_client::ImageServiceClient, DeleteImageRequest, ImageState,
         ListImagesRequest, PullImageRequest, WatchImageStatusRequest,
     },
     vm_service::{
-        vm_service_client::VmServiceClient, CreateVmRequest, DeleteVmRequest, GetVmRequest,
-        PingVmRequest, StartVmRequest, StreamVmEventsRequest, CpuConfig, MemoryConfig, VmConfig,
+        vm_service_client::VmServiceClient, CpuConfig, CreateVmRequest, DeleteVmRequest,
+        GetVmRequest, MemoryConfig, PingVmRequest, StartVmRequest, StreamVmEventsRequest, VmConfig,
         VmEvent, VmState, VmStateChangedEvent,
     },
 };
-use prost::Message;
 use std::path::Path;
 use std::process::Command;
 use std::sync::Arc;
@@ -24,8 +24,8 @@ use tokio::net::UnixStream;
 use tokio::sync::OnceCell;
 use tokio::time::timeout;
 use tokio_stream::StreamExt;
-use tower::service_fn;
 use tonic::transport::{Channel, Endpoint, Uri};
+use tower::service_fn;
 use vm_service::{VM_API_SOCKET_DIR, VM_CH_BIN};
 
 const PUBLIC_SERVER_ADDRESS: &str = "http://[::1]:1337";
@@ -73,7 +73,9 @@ 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| UnixStream::connect(IMAGE_SERVICE_SOCKET)))
+        .connect_with_connector(service_fn(|_: Uri| {
+            UnixStream::connect(IMAGE_SERVICE_SOCKET)
+        }))
         .await?;
     Ok(ImageServiceClient::new(channel))
 }
@@ -146,10 +148,7 @@ async fn wait_for_vm_state(
             }
 
             if new_state == VmState::Crashed {
-                let err_msg = format!(
-                    "VM entered Crashed state. Reason: {}",
-                    state_change.reason
-                );
+                let err_msg = format!("VM entered Crashed state. Reason: {}", state_change.reason);
                 error!("{}", &err_msg);
                 return Err(anyhow::anyhow!(err_msg));
             }
@@ -197,10 +196,7 @@ async fn test_create_and_start_vm() -> Result<()> {
         cleanup_disabled: false,
     };
 
-    info!(
-        "Connecting to StreamVmEvents stream for vm_id: {}",
-        &vm_id
-    );
+    info!("Connecting to StreamVmEvents stream for vm_id: {}", &vm_id);
     let events_req = StreamVmEventsRequest {
         vm_id: vm_id.clone(),
         ..Default::default()
@@ -386,4 +382,4 @@ where
         }
     }
     anyhow::bail!("Stream ended before image became ready");
-}
+}

filesystem/src/fsmount.rs

@@ -45,4 +45,4 @@ pub const FSCONFIG_CMD_CREATE: u32 = 6;
 pub fn fsmount(fd: BorrowedFd, flags: u32, mount_attr: u32) -> Result<RawFd> {
     let ret = unsafe { syscall(SYS_fsmount, fd.as_raw_fd(), flags, mount_attr) };
     Errno::result(ret.try_into().unwrap())
-}
+}

filesystem/src/lib.rs

@@ -4,4 +4,4 @@ mod r#move; // Use r# to allow 'move' as a module name
 
 // Re-export public functions
 pub use mount::mount_virtual_filesystems;
-pub use r#move::{get_root_fstype, move_root};
+pub use r#move::{get_root_fstype, move_root};

filesystem/src/mount.rs

@@ -53,4 +53,4 @@ pub fn mount_virtual_filesystems() {
         NONE,
     )
     .unwrap_or_else(|e| panic!("/sys/fs/cgroup mount failed: {e}"));
-}
+}