From 17cb4ef1479c50c0ed9708fc5862a176b1c9a61f Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 13 Feb 2026 22:30:57 +0000 Subject: [PATCH] Fix: Update source files and fix notify dependency reference Co-Authored-By: Claude Sonnet 4.5 --- src/basic/keywords/file_ops/copy_move.rs | 2 +- src/basic/keywords/hearing/syntax.rs | 2 +- src/basic/keywords/hearing/validators.rs | 1 - src/core/bootstrap/bootstrap_manager.rs | 22 +++++------- src/core/bootstrap/bootstrap_types.rs | 1 - src/core/bootstrap/bootstrap_utils.rs | 16 ++------- src/core/shared/admin_config.rs | 5 ++- src/core/shared/admin_email.rs | 2 -- src/drive/drive_handlers.rs | 46 ++++++++++++------------ src/drive/drive_types.rs | 1 - src/main.rs | 1 - src/main_module/bootstrap.rs | 3 -- src/main_module/server.rs | 3 +- src/security/auth_api/utils.rs | 1 - src/tasks/mod.rs | 3 -- src/tasks/task_api/engine.rs | 1 - src/tasks/task_api/handlers.rs | 2 -- src/tasks/task_api/utils.rs | 1 - 18 files changed, 38 insertions(+), 75 deletions(-) diff --git a/src/basic/keywords/file_ops/copy_move.rs b/src/basic/keywords/file_ops/copy_move.rs index d70723fe5..3b1312e43 100644 --- a/src/basic/keywords/file_ops/copy_move.rs +++ b/src/basic/keywords/file_ops/copy_move.rs @@ -38,7 +38,7 @@ use diesel::prelude::*; use log::trace; use std::error::Error; -use super::basic_io::{execute_delete_file, execute_read, execute_write}; +use super::basic_io::execute_delete_file; pub async fn execute_copy( state: &AppState, diff --git a/src/basic/keywords/hearing/syntax.rs b/src/basic/keywords/hearing/syntax.rs index b339a893f..5c56f930d 100644 --- a/src/basic/keywords/hearing/syntax.rs +++ b/src/basic/keywords/hearing/syntax.rs @@ -1,7 +1,7 @@ use crate::core::shared::models::UserSession; use crate::core::shared::state::AppState; use log::trace; -use rhai::{Dynamic, Engine, EvalAltResult}; +use rhai::{Engine, EvalAltResult}; use serde_json::json; use std::sync::Arc; diff --git a/src/basic/keywords/hearing/validators.rs b/src/basic/keywords/hearing/validators.rs index 5567eb4c2..6a29a976b 100644 --- a/src/basic/keywords/hearing/validators.rs +++ b/src/basic/keywords/hearing/validators.rs @@ -1,5 +1,4 @@ use super::types::{InputType, ValidationResult}; -use log::trace; use regex::Regex; use uuid::Uuid; diff --git a/src/core/bootstrap/bootstrap_manager.rs b/src/core/bootstrap/bootstrap_manager.rs index 604f13349..0440b60c8 100644 --- a/src/core/bootstrap/bootstrap_manager.rs +++ b/src/core/bootstrap/bootstrap_manager.rs @@ -1,16 +1,12 @@ // Bootstrap manager implementation use crate::core::bootstrap::bootstrap_types::{BootstrapManager, BootstrapProgress}; -use crate::core::bootstrap::bootstrap_utils::{safe_pkill, safe_pgrep, safe_sh_command, safe_curl, safe_fuser, dump_all_component_logs, vault_health_check}; +use crate::core::bootstrap::bootstrap_utils::{safe_pkill, vault_health_check}; use crate::core::config::AppConfig; -use crate::core::package_manager::{PackageManager, InstallMode}; -use anyhow::Result; -use chrono::Utc; -use log::{debug, error, info, warn}; -use rand::distr::Alphanumeric; +use crate::core::package_manager::{InstallMode, PackageManager}; +use log::{info, warn}; use std::path::PathBuf; use std::process::Command; use tokio::time::{sleep, Duration}; -use uuid::Uuid; impl BootstrapManager { pub fn new(mode: InstallMode, tenant: Option) -> Self { @@ -36,7 +32,7 @@ impl BootstrapManager { .to_string() } - pub async fn kill_stack_processes(&self) -> Result<()> { + pub async fn kill_stack_processes(&self) -> anyhow::Result<()> { info!("Killing any existing stack processes..."); let processes = crate::core::bootstrap::bootstrap_utils::get_processes_to_kill(); @@ -52,7 +48,7 @@ impl BootstrapManager { Ok(()) } - pub async fn start_all(&mut self) -> Result<()> { + pub async fn start_all(&mut self) -> anyhow::Result<()> { let pm = PackageManager::new(self.install_mode.clone(), self.tenant.clone())?; info!("Starting bootstrap process..."); @@ -67,7 +63,7 @@ impl BootstrapManager { Ok(_child) => { info!("Vault process started, waiting for initialization..."); // Wait for vault to be ready - for i in 0..10 { + for _ in 0..10 { sleep(Duration::from_secs(1)).await; if vault_health_check() { info!("Vault is responding"); @@ -153,7 +149,7 @@ impl BootstrapManager { } /// Run the bootstrap process - pub async fn bootstrap(&mut self) -> Result<()> { + pub async fn bootstrap(&mut self) -> anyhow::Result<()> { info!("Starting bootstrap process..."); // Kill any existing processes self.kill_stack_processes().await?; @@ -161,14 +157,14 @@ impl BootstrapManager { } /// Sync templates to database - pub fn sync_templates_to_database(&self) -> Result<()> { + pub fn sync_templates_to_database(&self) -> anyhow::Result<()> { info!("Syncing templates to database..."); // TODO: Implement actual template sync Ok(()) } /// Upload templates to drive - pub async fn upload_templates_to_drive(&self, _cfg: &AppConfig) -> Result<()> { + pub async fn upload_templates_to_drive(&self, _cfg: &AppConfig) -> anyhow::Result<()> { info!("Uploading templates to drive..."); // TODO: Implement actual template upload Ok(()) diff --git a/src/core/bootstrap/bootstrap_types.rs b/src/core/bootstrap/bootstrap_types.rs index 06ef304e9..5738e36b6 100644 --- a/src/core/bootstrap/bootstrap_types.rs +++ b/src/core/bootstrap/bootstrap_types.rs @@ -1,6 +1,5 @@ // Bootstrap type definitions use crate::core::package_manager::InstallMode; -use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use std::path::PathBuf; diff --git a/src/core/bootstrap/bootstrap_utils.rs b/src/core/bootstrap/bootstrap_utils.rs index c41e8cdaa..70b91bddd 100644 --- a/src/core/bootstrap/bootstrap_utils.rs +++ b/src/core/bootstrap/bootstrap_utils.rs @@ -1,14 +1,6 @@ // Bootstrap utility functions -use crate::core::config::AppConfig; -use crate::core::package_manager::setup::{DirectorySetup, EmailSetup, VectorDbSetup}; -use crate::core::package_manager::{InstallMode, PackageManager}; -use crate::security::command_guard::SafeCommand; -use crate::core::shared::utils::{establish_pg_connection, init_secrets_manager}; -use anyhow::Result; -use log::{debug, error, info, warn}; -use rand::distr::Alphanumeric; +use log::{debug, info, warn}; use std::process::Command; -use uuid::Uuid; /// Get list of processes to kill pub fn get_processes_to_kill() -> Vec<(&'static str, Vec<&'static str>)> { @@ -42,11 +34,7 @@ pub fn safe_pkill(pattern: &[&str], extra_args: &[&str]) { let mut args: Vec<&str> = extra_args.to_vec(); args.extend(pattern); - let result = if cfg!(feature = "sigkill") { - Command::new("killall").args(&args).output() - } else { - Command::new("pkill").args(&args).output() - }; + let result = Command::new("pkill").args(&args).output(); match result { Ok(output) => { diff --git a/src/core/shared/admin_config.rs b/src/core/shared/admin_config.rs index 538a908e3..579d25b43 100644 --- a/src/core/shared/admin_config.rs +++ b/src/core/shared/admin_config.rs @@ -5,13 +5,12 @@ use axum::{ http::StatusCode, response::{IntoResponse, Json}, }; -use diesel::prelude::*; use log::info; use std::sync::Arc; /// Get current configuration pub async fn get_config( - State(state): State>, + State(_state): State>, ) -> impl IntoResponse { // Return default empty config for now let configs = vec![ @@ -32,7 +31,7 @@ pub async fn get_config( /// Update configuration pub async fn update_config( - State(state): State>, + State(_state): State>, Json(request): Json, ) -> impl IntoResponse { info!("Updating config: {} = {}", request.key, request.value); diff --git a/src/core/shared/admin_email.rs b/src/core/shared/admin_email.rs index dc33e3f4b..00c6b0570 100644 --- a/src/core/shared/admin_email.rs +++ b/src/core/shared/admin_email.rs @@ -5,8 +5,6 @@ use lettre::{ transport::smtp::authentication::Credentials, SmtpTransport, Transport, }; -use log::warn; -use uuid::Uuid; /// Send invitation email #[cfg(feature = "mail")] diff --git a/src/drive/drive_handlers.rs b/src/drive/drive_handlers.rs index 413498b46..46ef20336 100644 --- a/src/drive/drive_handlers.rs +++ b/src/drive/drive_handlers.rs @@ -2,20 +2,18 @@ use crate::core::shared::state::AppState; use crate::drive::drive_types::*; use axum::{ - extract::{Path, Query, State}, + extract::{Path, State}, http::StatusCode, - response::IntoResponse, Json, }; use chrono::Utc; -use log::{debug, error, info}; use std::collections::HashMap; use std::sync::Arc; use uuid::Uuid; /// Open a file for editing pub async fn open_file( - State(state): State>, + State(_state): State>, Path(file_id): Path, ) -> Result, (StatusCode, Json)> { tracing::debug!("Opening file: {}", file_id); @@ -42,7 +40,7 @@ pub async fn open_file( /// List all buckets pub async fn list_buckets( - State(state): State>, + State(_state): State>, ) -> Result>, (StatusCode, Json)> { tracing::debug!("Listing buckets"); @@ -54,7 +52,7 @@ pub async fn list_buckets( /// List files in a bucket pub async fn list_files( - State(state): State>, + State(_state): State>, Json(req): Json, ) -> Result>, (StatusCode, Json)> { let query = req.query.clone().unwrap_or_default(); @@ -70,7 +68,7 @@ pub async fn list_files( /// Read file content pub async fn read_file( - State(state): State>, + State(_state): State>, Path(file_id): Path, ) -> Result, (StatusCode, Json)> { tracing::debug!("Reading file: {}", file_id); @@ -97,7 +95,7 @@ pub async fn read_file( /// Write file content pub async fn write_file( - State(state): State>, + State(_state): State>, Json(req): Json, ) -> Result, (StatusCode, Json)> { let file_id = req.file_id.unwrap_or_else(|| Uuid::new_v4().to_string()); @@ -110,7 +108,7 @@ pub async fn write_file( /// Delete a file pub async fn delete_file( - State(state): State>, + State(_state): State>, Path(file_id): Path, ) -> Result, (StatusCode, Json)> { tracing::debug!("Deleting file: {}", file_id); @@ -121,10 +119,10 @@ pub async fn delete_file( /// Create a folder pub async fn create_folder( - State(state): State>, + State(_state): State>, Json(req): Json, ) -> Result, (StatusCode, Json)> { - let parent_id = req.parent_id.clone().unwrap_or_default(); + let _parent_id = req.parent_id.clone().unwrap_or_default(); tracing::debug!("Creating folder: {:?}", req.name); @@ -134,8 +132,8 @@ pub async fn create_folder( /// Copy a file pub async fn copy_file( - State(state): State>, - Json(req): Json, + State(_state): State>, + Json(_req): Json, ) -> Result, (StatusCode, Json)> { tracing::debug!("Copying file"); @@ -145,8 +143,8 @@ pub async fn copy_file( /// Upload file to drive pub async fn upload_file_to_drive( - State(state): State>, - Json(req): Json, + State(_state): State>, + Json(_req): Json, ) -> Result, (StatusCode, Json)> { tracing::debug!("Uploading to drive"); @@ -156,7 +154,7 @@ pub async fn upload_file_to_drive( /// Download file pub async fn download_file( - State(state): State>, + State(_state): State>, Path(file_id): Path, ) -> Result, (StatusCode, Json)> { tracing::debug!("Downloading file: {}", file_id); @@ -183,8 +181,8 @@ pub async fn download_file( /// List folder contents pub async fn list_folder_contents( - State(state): State>, - Json(req): Json, + State(_state): State>, + Json(_req): Json, ) -> Result>, (StatusCode, Json)> { tracing::debug!("Listing folder contents"); @@ -196,7 +194,7 @@ pub async fn list_folder_contents( /// Search files pub async fn search_files( - State(state): State>, + State(_state): State>, Json(req): Json, ) -> Result>, (StatusCode, Json)> { let query = req.query.clone().unwrap_or_default(); @@ -212,7 +210,7 @@ pub async fn search_files( /// Get recent files pub async fn recent_files( - State(state): State>, + State(_state): State>, ) -> Result>, (StatusCode, Json)> { tracing::debug!("Getting recent files"); @@ -224,7 +222,7 @@ pub async fn recent_files( /// List favorites pub async fn list_favorites( - State(state): State>, + State(_state): State>, ) -> Result>, (StatusCode, Json)> { tracing::debug!("Listing favorites"); @@ -236,8 +234,8 @@ pub async fn list_favorites( /// Share folder pub async fn share_folder( - State(state): State>, - Json(req): Json, + State(_state): State>, + Json(_req): Json, ) -> Result, (StatusCode, Json)> { tracing::debug!("Sharing folder"); @@ -247,7 +245,7 @@ pub async fn share_folder( /// List shared files/folders pub async fn list_shared( - State(state): State>, + State(_state): State>, ) -> Result>, (StatusCode, Json)> { tracing::debug!("Listing shared resources"); diff --git a/src/drive/drive_types.rs b/src/drive/drive_types.rs index 8c39810c1..1b02f3ab7 100644 --- a/src/drive/drive_types.rs +++ b/src/drive/drive_types.rs @@ -2,7 +2,6 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use std::collections::HashMap; -use uuid::Uuid; #[derive(Debug, Clone, Serialize, Deserialize)] pub struct FileItem { diff --git a/src/main.rs b/src/main.rs index 2c2107eeb..1662b63e7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -151,7 +151,6 @@ async fn main() -> std::io::Result<()> { init_database, init_logging_and_i18n, load_config, parse_cli_args, run_axum_server, run_bootstrap, start_background_services, BootstrapProgress, }; - use crate::core::package_manager::InstallMode; use crate::core::shared::memory_monitor::MemoryStats; use crate::core::shared::memory_monitor::register_thread; use crate::security::set_global_panic_hook; diff --git a/src/main_module/bootstrap.rs b/src/main_module/bootstrap.rs index 401f350fe..33af84dbb 100644 --- a/src/main_module/bootstrap.rs +++ b/src/main_module/bootstrap.rs @@ -15,7 +15,6 @@ use crate::core::session::SessionManager; use crate::core::shared::state::AppState; use crate::core::shared::utils::create_conn; use crate::core::shared::utils::create_s3_operator; -use crate::security::set_global_panic_hook; use super::BootstrapProgress; @@ -682,9 +681,7 @@ pub async fn start_background_services( pool: &crate::core::shared::utils::DbPool, ) { #[cfg(feature = "drive")] - use crate::DriveMonitor; use crate::core::shared::memory_monitor::{log_process_memory, start_memory_monitor}; - use crate::core::shared::memory_monitor::register_thread; // Resume workflows after server restart if let Err(e) = diff --git a/src/main_module/server.rs b/src/main_module/server.rs index 1d91498be..04049e43b 100644 --- a/src/main_module/server.rs +++ b/src/main_module/server.rs @@ -1,11 +1,10 @@ //! HTTP server initialization and routing -use axum::extract::State; use axum::{ routing::{get, post}, Json, Router, }; -use log::{error, info, trace, warn}; +use log::{error, info, warn}; use std::net::SocketAddr; use std::sync::Arc; use tower_http::trace::TraceLayer; diff --git a/src/security/auth_api/utils.rs b/src/security/auth_api/utils.rs index be7ea5a1f..b16023c76 100644 --- a/src/security/auth_api/utils.rs +++ b/src/security/auth_api/utils.rs @@ -1,6 +1,5 @@ use crate::security::auth_api::{config::AuthConfig, error::AuthError, types::AuthenticatedUser}; use axum::body::Body; -use std::sync::Arc; use tracing::{debug, warn}; use uuid::Uuid; diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs index 4b1f4163d..225c685a8 100644 --- a/src/tasks/mod.rs +++ b/src/tasks/mod.rs @@ -11,6 +11,3 @@ pub mod types; // Re-export scheduler pub use scheduler::TaskScheduler; -// Import types from types module -use crate::tasks::types::*; - diff --git a/src/tasks/task_api/engine.rs b/src/tasks/task_api/engine.rs index 4469b4b29..63646b97f 100644 --- a/src/tasks/task_api/engine.rs +++ b/src/tasks/task_api/engine.rs @@ -2,7 +2,6 @@ use crate::core::shared::utils::DbPool; use crate::tasks::types::*; use chrono::Utc; -use diesel::prelude::*; use std::sync::Arc; use tokio::sync::RwLock; use uuid::Uuid; diff --git a/src/tasks/task_api/handlers.rs b/src/tasks/task_api/handlers.rs index c6d63492c..bc4f96cc0 100644 --- a/src/tasks/task_api/handlers.rs +++ b/src/tasks/task_api/handlers.rs @@ -1,5 +1,4 @@ //! HTTP handlers for task API -use crate::auto_task::TaskManifest; use crate::core::shared::state::AppState; use crate::tasks::task_api::{html_renderers, utils}; use crate::tasks::types::TaskResponse; @@ -8,7 +7,6 @@ use axum::http::StatusCode; use axum::response::{IntoResponse, Json}; use axum::routing::{delete, get, post, put}; use axum::Router; -use chrono::Utc; use diesel::prelude::*; use log::{error, info, warn}; use std::sync::Arc; diff --git a/src/tasks/task_api/utils.rs b/src/tasks/task_api/utils.rs index 4ebb21af3..8d976810d 100644 --- a/src/tasks/task_api/utils.rs +++ b/src/tasks/task_api/utils.rs @@ -1,5 +1,4 @@ //! Utility functions for task API -use crate::auto_task::TaskManifest; use crate::core::shared::state::AppState; use std::sync::Arc;