refactor: move logging to build step

Author: maltesander

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

@@ -18,12 +18,11 @@ use crate::{
         ValidatedCluster,
         build::properties::{
             ConfigFileName, access_control_properties, config_properties,
-            exchange_manager_properties, log_properties, node_properties, security_properties,
-            spooling_manager_properties, writer::to_java_properties_string,
+            exchange_manager_properties, log_properties, logging::get_vector_toml, node_properties,
+            security_properties, spooling_manager_properties, writer::to_java_properties_string,
         },
     },
     crd::{TrinoRole, v1alpha1},
-    product_logging::get_vector_toml,
 };
 
 // File name not exported from crd/mod.rs.
@@ -54,12 +53,6 @@ pub enum Error {
         source: stackable_operator::builder::meta::Error,
     },
 
-    #[snafu(display("failed to build the vector configuration for {cm_name}"))]
-    InvalidLoggingConfig {
-        source: crate::product_logging::Error,
-        cm_name: String,
-    },
-
     #[snafu(display("failed to resolve the {role} role"))]
     ReadRole {
         source: crate::crd::Error,
@@ -194,12 +187,7 @@ pub fn build_rolegroup_config_map(
     data.insert(JVM_CONFIG.to_string(), jvm_config);
 
     // 9. Vector sidecar toml if enabled.
-    let vector_toml = get_vector_toml(rolegroup_ref, &rg.config.logging).with_context(|_| {
-        InvalidLoggingConfigSnafu {
-            cm_name: rolegroup_ref.object_name(),
-        }
-    })?;
-    if let Some(vector_toml) = vector_toml {
+    if let Some(vector_toml) = get_vector_toml(rolegroup_ref, &rg.config.logging) {
         data.insert(
             product_logging::framework::VECTOR_CONFIG_FILE.to_string(),
             vector_toml,

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

@@ -13,7 +13,7 @@ pub fn build(rg: &TrinoRoleGroupConfig) -> BTreeMap<String, String> {
 
     // 1. No defaults
     // 2. Automatic per-container logger levels
-    if let Some(per_container) = crate::product_logging::get_log_property_map(&rg.config.logging) {
+    if let Some(per_container) = super::logging::get_log_property_map(&rg.config.logging) {
         props.extend(per_container);
     }
 

…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,4 +1,3 @@
-use snafu::Snafu;
 use stackable_operator::{
     product_logging::{
         framework::create_vector_config,
@@ -13,26 +12,6 @@ use strum::Display;
 
 use crate::crd::{Container, v1alpha1};
 
-#[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,
-    },
-}
-
-type Result<T, E = Error> = std::result::Result<T, E>;
-
 #[derive(Display)]
 #[strum(serialize_all = "lowercase")]
 pub enum TrinoLogLevel {
@@ -87,7 +66,7 @@ pub fn get_log_property_map(
 pub fn get_vector_toml(
     rolegroup: &RoleGroupRef<v1alpha1::TrinoCluster>,
     logging: &Logging<Container>,
-) -> Result<Option<String>> {
+) -> Option<String> {
     let vector_log_config = if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
     }) = logging.containers.get(&Container::Vector)
@@ -98,8 +77,8 @@ pub fn get_vector_toml(
     };
 
     if logging.enable_vector_agent {
-        Ok(Some(create_vector_config(rolegroup, vector_log_config)))
+        Some(create_vector_config(rolegroup, vector_log_config))
     } else {
-        Ok(None)
+        None
     }
 }

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

@@ -12,6 +12,7 @@ pub mod access_control_properties;
 pub mod config_properties;
 pub mod exchange_manager_properties;
 pub mod log_properties;
+pub mod logging;
 pub mod node_properties;
 pub mod security_properties;
 pub mod spooling_manager_properties;

rust/operator-binary/src/main.rs

@@ -52,7 +52,6 @@ mod crd;
 mod framework;
 mod listener;
 mod operations;
-mod product_logging;
 mod service;
 mod webhooks;