Fix too many argument clippy warning

crates/meilisearch/src/lib.rs

@@ -130,13 +130,8 @@ pub type LogStderrType = tracing_subscriber::filter::Filtered<
 >;
 
 pub fn create_app(
-    index_scheduler: Data<IndexScheduler>,
-    auth_controller: Data<AuthController>,
-    search_queue: Data<SearchQueue>,
-    personalization_service: Data<PersonalizationService>,
+    services: ServicesData,
     opt: Opt,
-    logs: (LogRouteHandle, LogStderrHandle),
-    analytics: Data<Analytics>,
     enable_dashboard: bool,
 ) -> actix_web::App<
     impl ServiceFactory<
@@ -148,18 +143,7 @@ pub fn create_app(
     >,
 > {
     let app = actix_web::App::new()
-        .configure(|s| {
-            configure_data(
-                s,
-                index_scheduler,
-                auth_controller,
-                search_queue,
-                personalization_service,
-                &opt,
-                logs,
-                analytics,
-            )
-        })
+        .configure(|s| configure_data(s, services, &opt))
         .configure(routes::configure)
         .configure(|s| dashboard(s, enable_dashboard));
 
@@ -694,16 +678,17 @@ fn import_dump(
     Ok(index_scheduler_dump.finish()?)
 }
 
-pub fn configure_data(
-    config: &mut web::ServiceConfig,
-    index_scheduler: Data<IndexScheduler>,
-    auth: Data<AuthController>,
-    search_queue: Data<SearchQueue>,
-    personalization_service: Data<PersonalizationService>,
-    opt: &Opt,
-    (logs_route, logs_stderr): (LogRouteHandle, LogStderrHandle),
-    analytics: Data<Analytics>,
-) {
+pub fn configure_data(config: &mut web::ServiceConfig, services: ServicesData, opt: &Opt) {
+    let ServicesData {
+        index_scheduler,
+        auth,
+        search_queue,
+        personalization_service,
+        logs_route_handle,
+        logs_stderr_handle,
+        analytics,
+    } = services;
+
     let http_payload_size_limit = opt.http_payload_size_limit.as_u64() as usize;
     config
         .app_data(index_scheduler)
@@ -711,8 +696,8 @@ pub fn configure_data(
         .app_data(search_queue)
         .app_data(analytics)
         .app_data(personalization_service)
-        .app_data(web::Data::new(logs_route))
-        .app_data(web::Data::new(logs_stderr))
+        .app_data(logs_route_handle)
+        .app_data(logs_stderr_handle)
         .app_data(web::Data::new(opt.clone()))
         .app_data(
             web::JsonConfig::default()
@@ -773,3 +758,14 @@ pub fn dashboard(config: &mut web::ServiceConfig, enable_frontend: bool) {
 pub fn dashboard(config: &mut web::ServiceConfig, _enable_frontend: bool) {
     config.service(web::resource("/").route(web::get().to(routes::running)));
 }
+
+#[derive(Clone)]
+pub struct ServicesData {
+    pub index_scheduler: Data<IndexScheduler>,
+    pub auth: Data<AuthController>,
+    pub search_queue: Data<SearchQueue>,
+    pub personalization_service: Data<PersonalizationService>,
+    pub logs_route_handle: Data<LogRouteHandle>,
+    pub logs_stderr_handle: Data<LogStderrHandle>,
+    pub analytics: Data<Analytics>,
+}

crates/meilisearch/src/main.rs

@@ -18,7 +18,7 @@ use meilisearch::personalization::PersonalizationService;
 use meilisearch::search_queue::SearchQueue;
 use meilisearch::{
     analytics, create_app, setup_meilisearch, LogRouteHandle, LogRouteType, LogStderrHandle,
-    LogStderrType, Opt, SubscriberForSecondLayer,
+    LogStderrType, Opt, ServicesData, SubscriberForSecondLayer,
 };
 use meilisearch_auth::{generate_master_key, AuthController, MASTER_KEY_MIN_SIZE};
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
@@ -153,7 +153,7 @@ async fn run_http(
     let enable_dashboard = &opt.env == "development";
     let opt_clone = opt.clone();
     let index_scheduler = Data::from(index_scheduler);
-    let auth_controller = Data::from(auth_controller);
+    let auth = Data::from(auth_controller);
     let analytics = Data::from(analytics);
     // Create personalization service with API key from options
     let personalization_service = Data::new(
@@ -173,22 +173,25 @@ async fn run_http(
         usize::from(opt.experimental_drop_search_after) as u64
     ));
     let search_queue = Data::new(search_queue);
+    let (logs_route_handle, logs_stderr_handle) = logs;
+    let logs_route_handle = Data::new(logs_route_handle);
+    let logs_stderr_handle = Data::new(logs_stderr_handle);
 
-    let http_server = HttpServer::new(move || {
-        create_app(
-            index_scheduler.clone(),
-            auth_controller.clone(),
-            search_queue.clone(),
-            personalization_service.clone(),
-            opt.clone(),
-            logs.clone(),
-            analytics.clone(),
-            enable_dashboard,
-        )
-    })
-    // Disable signals allows the server to terminate immediately when a user enter CTRL-C
-    .disable_signals()
-    .keep_alive(KeepAlive::Os);
+    let services = ServicesData {
+        index_scheduler,
+        auth,
+        search_queue,
+        personalization_service,
+        logs_route_handle,
+        logs_stderr_handle,
+        analytics,
+    };
+
+    let http_server =
+        HttpServer::new(move || create_app(services.clone(), opt.clone(), enable_dashboard))
+            // Disable signals allows the server to terminate immediately when a user enter CTRL-C
+            .disable_signals()
+            .keep_alive(KeepAlive::Os);
 
     if let Some(config) = opt_clone.get_ssl_config()? {
         http_server.bind_rustls_0_23(opt_clone.http_addr, config)?.run().await?;

crates/meilisearch/tests/common/service.rs

@@ -12,7 +12,7 @@ use index_scheduler::IndexScheduler;
 use meilisearch::analytics::Analytics;
 use meilisearch::personalization::PersonalizationService;
 use meilisearch::search_queue::SearchQueue;
-use meilisearch::{create_app, Opt, SubscriberForSecondLayer};
+use meilisearch::{create_app, Opt, ServicesData, SubscriberForSecondLayer};
 use meilisearch_auth::AuthController;
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::Layer;
@@ -144,13 +144,16 @@ impl Service {
             .unwrap_or_else(PersonalizationService::disabled);
 
         actix_web::test::init_service(create_app(
-            self.index_scheduler.clone().into(),
-            self.auth.clone().into(),
-            Data::new(search_queue),
-            Data::new(personalization_service),
+            ServicesData {
+                index_scheduler: self.index_scheduler.clone().into(),
+                auth: self.auth.clone().into(),
+                search_queue: Data::new(search_queue),
+                personalization_service: Data::new(personalization_service),
+                logs_route_handle: Data::new(route_layer_handle),
+                logs_stderr_handle: Data::new(stderr_layer_handle),
+                analytics: Data::new(Analytics::no_analytics()),
+            },
             self.options.clone(),
-            (route_layer_handle, stderr_layer_handle),
-            Data::new(Analytics::no_analytics()),
             true,
         ))
         .await

crates/meilisearch/tests/logs/mod.rs

@@ -10,7 +10,7 @@ use meili_snap::snapshot;
 use meilisearch::analytics::Analytics;
 use meilisearch::personalization::PersonalizationService;
 use meilisearch::search_queue::SearchQueue;
-use meilisearch::{create_app, Opt, SubscriberForSecondLayer};
+use meilisearch::{create_app, Opt, ServicesData, SubscriberForSecondLayer};
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::Layer;
@@ -51,13 +51,16 @@ async fn basic_test_log_stream_route() {
     );
 
     let app = actix_web::test::init_service(create_app(
-        server.service.index_scheduler.clone().into(),
-        server.service.auth.clone().into(),
-        Data::new(search_queue),
-        Data::new(PersonalizationService::disabled()),
+        ServicesData {
+            index_scheduler: server.service.index_scheduler.clone().into(),
+            auth: server.service.auth.clone().into(),
+            search_queue: Data::new(search_queue),
+            personalization_service: Data::new(PersonalizationService::disabled()),
+            logs_route_handle: Data::new(route_layer_handle),
+            logs_stderr_handle: Data::new(stderr_layer_handle),
+            analytics: Data::new(Analytics::no_analytics()),
+        },
         server.service.options.clone(),
-        (route_layer_handle, stderr_layer_handle),
-        Data::new(Analytics::no_analytics()),
         true,
     ))
     .await;