Fix default service startup in tests

Author: shuheiktgw

quickwit/quickwit-cli/src/service.rs

@@ -34,10 +34,10 @@ use crate::{config_cli_arg, get_resolvers, load_node_config, start_actor_runtime
 pub fn build_run_command() -> Command {
     Command::new("run")
         .about("Starts a Quickwit node.")
-        .long_about("Starts a Quickwit node with all services enabled by default: `indexer`, `searcher`, `metastore`, `control-plane`, and `janitor`.")
+        .long_about("Starts a Quickwit node with the default services enabled: `indexer`, `searcher`, `metastore`, `control-plane`, and `janitor`.")
         .arg(config_cli_arg())
         .args(&[
-            arg!(--"service" <SERVICE> "Services (`indexer`, `searcher`, `metastore`, `control-plane`, or `janitor`) to run. If unspecified, all the supported services are started.")
+            arg!(--"service" <SERVICE> "Services (`indexer`, `searcher`, `metastore`, `metastore-read-replica`, `control-plane`, or `janitor`) to run. If unspecified, services from the config are used.")
                 .action(ArgAction::Append)
                 .required(false),
         ])

quickwit/quickwit-cli/tests/helpers.rs

@@ -157,7 +157,7 @@ impl TestEnv {
     pub async fn start_server(&self) -> anyhow::Result<()> {
         let run_command = RunCliCommand {
             config_uri: self.resource_files.config.clone(),
-            services: Some(QuickwitService::supported_services()),
+            services: Some(QuickwitService::default_services()),
         };
         let server_handle = tokio::spawn(async move {
             if let Err(error) = run_command

quickwit/quickwit-integration-tests/src/test_utils/cluster_sandbox.rs

@@ -201,7 +201,7 @@ impl ClusterSandboxBuilder {
 
     pub async fn build_and_start_standalone() -> ClusterSandbox {
         ClusterSandboxBuilder::default()
-            .add_node(QuickwitService::supported_services())
+            .add_node(QuickwitService::default_services())
             .build_config()
             .await
             .start()

quickwit/quickwit-integration-tests/src/tests/metrics_distributed_tests.rs

@@ -201,7 +201,7 @@ async fn test_distributed_tasks_not_shuffles() {
     quickwit_common::setup_logging_for_tests();
 
     let sandbox = ClusterSandboxBuilder::default()
-        .add_node(QuickwitService::supported_services())
+        .add_node(QuickwitService::default_services())
         .add_node([QuickwitService::Searcher])
         .build_and_start()
         .await;

quickwit/quickwit-integration-tests/src/tests/tls_tests.rs

@@ -80,7 +80,7 @@ async fn fetch_served_leaf_cert(addr: SocketAddr, ca_path: &str) -> Vec<u8> {
 async fn test_tls_rest() {
     quickwit_common::setup_logging_for_tests();
     let mut sandbox_config = ClusterSandboxBuilder::default()
-        .add_node(QuickwitService::supported_services())
+        .add_node(QuickwitService::default_services())
         .build_config()
         .await;
     sandbox_config.node_configs[0].0.rest_config.tls_config = Some(fixture_tls_config());
@@ -192,7 +192,7 @@ async fn test_tls_grpc() {
 async fn test_mtls_rest() {
     quickwit_common::setup_logging_for_tests();
     let mut sandbox_config = ClusterSandboxBuilder::default()
-        .add_node(QuickwitService::supported_services())
+        .add_node(QuickwitService::default_services())
         .build_config()
         .await;
     // Reuse the server cert/key as the client identity — it is signed by the same CA, so the
@@ -244,7 +244,7 @@ async fn test_mtls_rest() {
 async fn test_health_check_server_plaintext_with_mtls_rest() {
     quickwit_common::setup_logging_for_tests();
     let mut sandbox_config = ClusterSandboxBuilder::default()
-        .add_node(QuickwitService::supported_services())
+        .add_node(QuickwitService::default_services())
         .enable_health_check()
         .build_config()
         .await;
@@ -294,7 +294,7 @@ async fn test_tls_rest_cert_hot_reload() {
     let ca_path = format!("{TLS_FIXTURES_DIR}/ca.crt");
 
     let mut sandbox_config = ClusterSandboxBuilder::default()
-        .add_node(QuickwitService::supported_services())
+        .add_node(QuickwitService::default_services())
         .build_config()
         .await;
     sandbox_config.node_configs[0].0.rest_config.tls_config = Some(TlsConfig {