refactor: Fold product_logging into the build step

Move the Vector config building and the `BundleBuilderLogLevel` mapping out of the
top-level `product_logging` module into `controller/build/properties/logging.rs`,
mirroring hdfs. `build_vector_config` returns `Option<String>` (the agent config or
`None` when disabled) and is infallible, so the dead `InvalidLoggingConfig` error
path is dropped. The DaemonSet now imports `BundleBuilderLogLevel` from the build
module, and the standalone `product_logging.rs` is removed.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -71,9 +71,9 @@ use crate::{
         APP_NAME, Container, DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT, OPERATOR_NAME,
         OpaClusterStatus, OpaConfig, OpaRole, user_info_fetcher, v1alpha2,
     },
+    controller::build::properties::logging::BundleBuilderLogLevel,
     discovery::{self, build_discovery_configmaps},
     operations::graceful_shutdown::add_graceful_shutdown_config,
-    product_logging::BundleBuilderLogLevel,
     service::{
         self, APP_PORT, APP_PORT_NAME, build_rolegroup_headless_service,
         build_rolegroup_metrics_service, build_server_role_service,

rust/operator-binary/src/controller/build/config_map.rs

@@ -7,14 +7,14 @@ use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     k8s_openapi::api::core::v1::ConfigMap,
     kvp::ObjectLabels,
+    product_logging::framework::VECTOR_CONFIG_FILE,
     role_utils::RoleGroupRef,
 };
 
-use super::properties::{ConfigFileName, config_json, user_info_fetcher};
+use super::properties::{ConfigFileName, config_json, logging, user_info_fetcher};
 use crate::{
     controller::validate::{OpaRoleGroupConfig, ValidatedCluster},
     crd::v1alpha2,
-    product_logging::extend_role_group_config_map,
 };
 
 #[derive(Snafu, Debug)]
@@ -35,12 +35,6 @@ pub enum Error {
     #[snafu(display("failed to build user-info-fetcher.json"))]
     BuildUserInfoFetcher { source: user_info_fetcher::Error },
 
-    #[snafu(display("failed to add the logging configuration to the ConfigMap [{cm_name}]"))]
-    InvalidLoggingConfig {
-        source: crate::product_logging::Error,
-        cm_name: String,
-    },
-
     #[snafu(display("failed to build ConfigMap for [{rolegroup}]"))]
     BuildConfigMap {
         source: stackable_operator::builder::configmap::Error,
@@ -86,14 +80,11 @@ pub fn build_rolegroup_config_map(
         );
     }
 
-    extend_role_group_config_map(
-        rolegroup_ref,
-        &rolegroup_config.merged_config.logging,
-        &mut cm_builder,
-    )
-    .context(InvalidLoggingConfigSnafu {
-        cm_name: rolegroup_ref.object_name(),
-    })?;
+    if let Some(vector_config) =
+        logging::build_vector_config(rolegroup_ref, &rolegroup_config.merged_config.logging)
+    {
+        cm_builder.add_data(VECTOR_CONFIG_FILE, vector_config);
+    }
 
     cm_builder
         .build()

…t/operator-binary/src/product_logging.rs …c/controller/build/properties/logging.rsrust/operator-binary/src/product_logging.rs renamed to rust/operator-binary/src/controller/build/properties/logging.rs rust/operator-binary/src/product_logging.rs renamed to rust/operator-binary/src/controller/build/properties/logging.rs

@@ -1,6 +1,6 @@
-use snafu::Snafu;
+//! Builds the Vector agent config file and maps log levels for the Stackable Rust sidecars.
+
 use stackable_operator::{
-    builder::configmap::ConfigMapBuilder,
     product_logging::{
         self,
         spec::{ContainerLogConfig, ContainerLogConfigChoice, LogLevel, Logging},
@@ -10,26 +10,6 @@ use stackable_operator::{
 
 use crate::crd::{Container, v1alpha2};
 
-#[derive(Snafu, Debug)]
-pub enum Error {
-    #[snafu(display("object has no namespace"))]
-    ObjectHasNoNamespace,
-    #[snafu(display("failed to retrieve the ConfigMap [{cm_name}]"))]
-    ConfigMapNotFound {
-        source: stackable_operator::client::Error,
-        cm_name: String,
-    },
-    #[snafu(display("failed to retrieve the entry [{entry}] for ConfigMap [{cm_name}]"))]
-    MissingConfigMapEntry {
-        entry: &'static str,
-        cm_name: String,
-    },
-    #[snafu(display("vectorAggregatorConfigMapName must be set"))]
-    MissingVectorAggregatorAddress,
-}
-
-type Result<T, E = Error> = std::result::Result<T, E>;
-
 #[derive(strum::Display)]
 #[strum(serialize_all = "UPPERCASE")]
 pub enum BundleBuilderLogLevel {
@@ -52,12 +32,16 @@ impl From<LogLevel> for BundleBuilderLogLevel {
     }
 }
 
-/// Extend the role group ConfigMap with logging and Vector configurations
-pub fn extend_role_group_config_map(
+/// Builds the Vector agent config (`vector.yaml`) for the role group, or `None` when the Vector
+/// agent is disabled.
+pub fn build_vector_config(
     rolegroup: &RoleGroupRef<v1alpha2::OpaCluster>,
     logging: &Logging<Container>,
-    cm_builder: &mut ConfigMapBuilder,
-) -> Result<()> {
+) -> Option<String> {
+    if !logging.enable_vector_agent {
+        return None;
+    }
+
     let vector_log_config = if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
     }) = logging.containers.get(&Container::Vector)
@@ -67,12 +51,8 @@ pub fn extend_role_group_config_map(
         None
     };
 
-    if logging.enable_vector_agent {
-        cm_builder.add_data(
-            product_logging::framework::VECTOR_CONFIG_FILE,
-            product_logging::framework::create_vector_config(rolegroup, vector_log_config),
-        );
-    }
-
-    Ok(())
+    Some(product_logging::framework::create_vector_config(
+        rolegroup,
+        vector_log_config,
+    ))
 }

rust/operator-binary/src/controller/build/properties/mod.rs

@@ -6,6 +6,7 @@
 //! operators.
 
 pub mod config_json;
+pub mod logging;
 pub mod user_info_fetcher;
 
 /// The names of the config files assembled into the rolegroup `ConfigMap`.

rust/operator-binary/src/main.rs

@@ -40,7 +40,6 @@ mod controller;
 mod crd;
 mod discovery;
 mod operations;
-mod product_logging;
 mod service;
 mod webhooks;