fix: introduce ConfigFileName enum

Author: maltesander

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

@@ -9,10 +9,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::EnvVar,
     kube::ResourceExt,
     product_logging::framework::create_vector_shutdown_file_command,
-    v2::{
-        builder::pod::container::EnvVarSet,
-        product_logging::framework::STACKABLE_LOG_DIR,
-    },
+    v2::{builder::pod::container::EnvVarSet, product_logging::framework::STACKABLE_LOG_DIR},
 };
 
 use crate::{

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

@@ -4,3 +4,30 @@
 pub mod env_vars;
 pub mod product_logging;
 pub mod webserver_config;
+
+/// The names of the Airflow config files assembled into the rolegroup `ConfigMap`.
+///
+/// This is the single source of truth for the on-disk file names; nothing else should hard-code
+/// them (the Vector agent config is the exception — its name comes from the upstream
+/// `product_logging::framework::VECTOR_CONFIG_FILE` constant).
+#[derive(Clone, Copy, Debug, strum::Display)]
+pub enum ConfigFileName {
+    #[strum(serialize = "webserver_config.py")]
+    WebserverConfig,
+    #[strum(serialize = "log_config.py")]
+    LogConfig,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn file_names_match_the_airflow_on_disk_names() {
+        assert_eq!(
+            ConfigFileName::WebserverConfig.to_string(),
+            "webserver_config.py"
+        );
+        assert_eq!(ConfigFileName::LogConfig.to_string(), "log_config.py");
+    }
+}

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

@@ -9,8 +9,6 @@ use stackable_operator::{
     v2::product_logging::framework::ValidatedContainerLogConfigChoice,
 };
 
-pub const LOG_CONFIG_FILE: &str = "log_config.py";
-
 /// The rotating log file the generated `log_config.py` writes to (consumed by the Vector agent).
 const LOG_FILE: &str = "airflow.py.json";
 

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

@@ -18,11 +18,12 @@ use crate::{
     controller::{
         ValidatedCluster, ValidatedLogging,
         build::properties::{
-            product_logging::{LOG_CONFIG_FILE, create_airflow_config, vector_config_file_content},
+            ConfigFileName,
+            product_logging::{create_airflow_config, vector_config_file_content},
             webserver_config,
         },
     },
-    crd::{AIRFLOW_CONFIG_FILENAME, AirflowConfigOverrides, Container},
+    crd::{AirflowConfigOverrides, Container},
 };
 
 #[derive(Snafu, Debug)]
@@ -72,7 +73,7 @@ pub fn build_rolegroup_config_map(
                 )
                 .build(),
         )
-        .add_data(AIRFLOW_CONFIG_FILENAME, config_file);
+        .add_data(ConfigFileName::WebserverConfig.to_string(), config_file);
 
     // Log config for the main container, when it uses an Automatic log config.
     let log_dir = format!("{STACKABLE_LOG_DIR}/{container}");
@@ -81,7 +82,7 @@ pub fn build_rolegroup_config_map(
         &log_dir,
         &validated_cluster.image,
     ) {
-        cm_builder.add_data(LOG_CONFIG_FILE, log_config);
+        cm_builder.add_data(ConfigFileName::LogConfig.to_string(), log_config);
     }
 
     // Vector agent config

rust/operator-binary/src/crd/mod.rs

@@ -54,7 +54,7 @@ use stackable_operator::{
 use strum::{Display, EnumIter, EnumString};
 
 use crate::{
-    controller::ValidatedCluster,
+    controller::{ValidatedCluster, build::properties::ConfigFileName},
     crd::{
         affinity::{get_affinity, get_executor_affinity},
         authentication::{
@@ -80,7 +80,6 @@ pub const OPERATOR_NAME: &str = "airflow.stackable.tech";
 pub const CONFIG_PATH: &str = "/stackable/app/config";
 pub const LOG_CONFIG_DIR: &str = "/stackable/app/log_config";
 pub const AIRFLOW_HOME: &str = "/stackable/airflow";
-pub const AIRFLOW_CONFIG_FILENAME: &str = "webserver_config.py";
 
 stackable_operator::constant!(pub TEMPLATE_VOLUME_NAME: VolumeName = "airflow-executor-pod-template");
 pub const TEMPLATE_LOCATION: &str = "/templates";
@@ -551,11 +550,10 @@ impl AirflowRole {
         let database_initialization_enabled =
             cluster.cluster_config.database_initialization_enabled;
         let has_dag_processors = cluster.has_role(&AirflowRole::DagProcessor);
+        let webserver_config = ConfigFileName::WebserverConfig;
 
         let mut command = vec![
-            format!(
-                "cp -RL {CONFIG_PATH}/{AIRFLOW_CONFIG_FILENAME} {AIRFLOW_HOME}/{AIRFLOW_CONFIG_FILENAME}"
-            ),
+            format!("cp -RL {CONFIG_PATH}/{webserver_config} {AIRFLOW_HOME}/{webserver_config}"),
             // graceful shutdown part
             COMMON_BASH_TRAP_FUNCTIONS.to_string(),
             remove_vector_shutdown_file_command(STACKABLE_LOG_DIR),