Rename QuickwitConfig to NodeConfig (#3652)

quickwit/quickwit-cli/src/lib.rs

@@ -30,7 +30,7 @@ use quickwit_common::runtimes::RuntimesConfig;
 use quickwit_common::uri::Uri;
 use quickwit_config::service::QuickwitService;
 use quickwit_config::{
-    ConfigFormat, MetastoreConfigs, QuickwitConfig, SourceConfig, StorageConfigs,
+    ConfigFormat, MetastoreConfigs, NodeConfig, SourceConfig, StorageConfigs,
     DEFAULT_QW_CONFIG_PATH,
 };
 use quickwit_indexing::check_source_connectivity;
@@ -223,12 +223,12 @@ pub fn start_actor_runtimes(
 }
 
 /// Loads a node config located at `config_uri` with the default storage configuration.
-async fn load_node_config(config_uri: &Uri) -> anyhow::Result<QuickwitConfig> {
+async fn load_node_config(config_uri: &Uri) -> anyhow::Result<NodeConfig> {
     let config_content = load_file(&StorageResolver::unconfigured(), config_uri)
         .await
         .context("Failed to load node config.")?;
     let config_format = ConfigFormat::sniff_from_uri(config_uri)?;
-    let config = QuickwitConfig::load(config_format, config_content.as_slice())
+    let config = NodeConfig::load(config_format, config_content.as_slice())
         .await
         .with_context(|| format!("Failed to parse node config `{config_uri}`."))?;
     info!(config_uri=%config_uri, config=?config, "Loaded node config.");

quickwit/quickwit-cli/src/service.rs

@@ -25,7 +25,7 @@ use itertools::Itertools;
 use quickwit_common::runtimes::RuntimesConfig;
 use quickwit_common::uri::Uri;
 use quickwit_config::service::QuickwitService;
-use quickwit_config::QuickwitConfig;
+use quickwit_config::NodeConfig;
 use quickwit_serve::serve_quickwit;
 use quickwit_telemetry::payload::{QuickwitFeature, QuickwitTelemetryInfo, TelemetryEvent};
 use tokio::signal;
@@ -116,7 +116,7 @@ impl RunCliCommand {
     }
 }
 
-fn quickwit_telemetry_info(config: &QuickwitConfig) -> QuickwitTelemetryInfo {
+fn quickwit_telemetry_info(config: &NodeConfig) -> QuickwitTelemetryInfo {
     let mut features = HashSet::new();
     if config.indexer_config.enable_otlp_endpoint {
         features.insert(QuickwitFeature::Otlp);

quickwit/quickwit-cli/src/tool.rs

@@ -37,7 +37,7 @@ use quickwit_common::runtimes::RuntimesConfig;
 use quickwit_common::uri::Uri;
 use quickwit_config::service::QuickwitService;
 use quickwit_config::{
-    IndexerConfig, QuickwitConfig, SourceConfig, SourceInputFormat, SourceParams, TransformConfig,
+    IndexerConfig, NodeConfig, SourceConfig, SourceInputFormat, SourceParams, TransformConfig,
     VecSourceParams, CLI_INGEST_SOURCE_ID,
 };
 use quickwit_core::{clear_cache_directory, IndexService};
@@ -775,7 +775,7 @@ impl ThroughputCalculator {
     }
 }
 
-async fn create_empty_cluster(config: &QuickwitConfig) -> anyhow::Result<Cluster> {
+async fn create_empty_cluster(config: &NodeConfig) -> anyhow::Result<Cluster> {
     let self_node = ClusterMember::new(
         config.node_id.clone(),
         quickwit_cluster::GenerationId::now(),

quickwit/quickwit-cli/tests/helpers.rs

@@ -209,11 +209,11 @@ pub async fn create_test_env(
             .replace("#index_id", &index_id)
             .replace("index_uri: #index_uri\n", ""),
     )?;
-    let quickwit_config_path = resources_dir_path.join("config.yaml");
+    let node_config_path = resources_dir_path.join("config.yaml");
     let rest_listen_port = find_available_tcp_port()?;
     let grpc_listen_port = find_available_tcp_port()?;
     fs::write(
-        &quickwit_config_path,
+        &node_config_path,
         // A poor's man templating engine reloaded...
         DEFAULT_QUICKWIT_CONFIG
             .replace("#metastore_uri", metastore_uri.as_str())
@@ -227,7 +227,7 @@ pub async fn create_test_env(
     fs::write(&wikipedia_docs_path, WIKI_JSON_DOCS)?;
 
     let mut resource_files = HashMap::new();
-    resource_files.insert("config", quickwit_config_path);
+    resource_files.insert("config", node_config_path);
     resource_files.insert("index_config", index_config_path);
     resource_files.insert("index_config_without_uri", index_config_without_uri_path);
     resource_files.insert("logs", log_docs_path);

quickwit/quickwit-cluster/src/lib.rs

@@ -31,7 +31,7 @@ pub use chitchat::transport::ChannelTransport;
 use chitchat::transport::UdpTransport;
 use chitchat::FailureDetectorConfig;
 use quickwit_config::service::QuickwitService;
-use quickwit_config::QuickwitConfig as NodeConfig;
+use quickwit_config::NodeConfig;
 use time::OffsetDateTime;
 
 pub use crate::change::ClusterChange;

quickwit/quickwit-config/src/lib.rs

@@ -32,7 +32,7 @@ mod config_value;
 mod index_config;
 pub mod merge_policy_config;
 mod metastore_config;
-mod quickwit_config;
+mod node_config;
 mod qw_env_vars;
 pub mod service;
 mod source_config;
@@ -63,8 +63,8 @@ use crate::merge_policy_config::{
 pub use crate::metastore_config::{
     MetastoreBackend, MetastoreConfig, MetastoreConfigs, PostgresMetastoreConfig,
 };
-pub use crate::quickwit_config::{
-    IndexerConfig, IngestApiConfig, JaegerConfig, QuickwitConfig, SearcherConfig,
+pub use crate::node_config::{
+    IndexerConfig, IngestApiConfig, JaegerConfig, NodeConfig, SearcherConfig,
     DEFAULT_QW_CONFIG_PATH,
 };
 use crate::source_config::serialize::{SourceConfigV0_6, VersionedSourceConfig};

quickwit/quickwit-config/src/quickwit_config/mod.rs → quickwit/quickwit-config/src/node_config/mod.rs

@@ -33,7 +33,7 @@ use quickwit_common::uri::Uri;
 use serde::{Deserialize, Serialize};
 use tracing::warn;
 
-use crate::quickwit_config::serialize::load_quickwit_config_with_env;
+use crate::node_config::serialize::load_node_config_with_env;
 use crate::service::QuickwitService;
 use crate::storage_config::StorageConfigs;
 use crate::{ConfigFormat, MetastoreConfigs};
@@ -222,7 +222,7 @@ impl Default for JaegerConfig {
 }
 
 #[derive(Clone, Debug, Serialize)]
-pub struct QuickwitConfig {
+pub struct NodeConfig {
     pub cluster_id: String,
     pub node_id: String,
     pub enabled_services: HashSet<QuickwitService>,
@@ -244,12 +244,11 @@ pub struct QuickwitConfig {
     pub jaeger_config: JaegerConfig,
 }
 
-impl QuickwitConfig {
-    /// Parses and validates a [`QuickwitConfig`] from a given URI and config content.
+impl NodeConfig {
+    /// Parses and validates a [`NodeConfig`] from a given URI and config content.
     pub async fn load(config_format: ConfigFormat, config_content: &[u8]) -> anyhow::Result<Self> {
         let env_vars = env::vars().collect::<HashMap<_, _>>();
-        let config =
-            load_quickwit_config_with_env(config_format, config_content, &env_vars).await?;
+        let config = load_node_config_with_env(config_format, config_content, &env_vars).await?;
         if !config.data_dir_path.try_exists()? {
             bail!(
                 "Data dir `{}` does not exist.",
@@ -294,6 +293,6 @@ impl QuickwitConfig {
 
     #[cfg(any(test, feature = "testsuite"))]
     pub fn for_test() -> Self {
-        serialize::quickwit_config_for_test()
+        serialize::node_config_for_test()
     }
 }