fix: remove config and move to build mod

Author: maltesander

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

@@ -77,20 +77,20 @@ use strum::EnumDiscriminants;
 
 use crate::{
     OPERATOR_NAME,
-    command::build_container_command_args,
-    config::{
+    controller::build::{
+        command::build_container_command_args,
+        discovery,
         jvm::{construct_hadoop_heapsize_env, construct_non_heap_jvm_args},
+        kerberos::{self, add_kerberos_pod_config, kerberos_container_start_commands},
         opa::{HiveOpaConfig, OPA_TLS_VOLUME_NAME},
     },
-    controller::build::discovery,
     crd::{
         APP_NAME, Container, HIVE_PORT, HIVE_PORT_NAME, HiveClusterStatus, HiveRole, METRICS_PORT,
         METRICS_PORT_NAME, MetaStoreConfig, STACKABLE_CONFIG_DIR, STACKABLE_CONFIG_DIR_NAME,
         STACKABLE_CONFIG_MOUNT_DIR, STACKABLE_CONFIG_MOUNT_DIR_NAME,
         STACKABLE_LOG_CONFIG_MOUNT_DIR, STACKABLE_LOG_CONFIG_MOUNT_DIR_NAME, STACKABLE_LOG_DIR,
         STACKABLE_LOG_DIR_NAME, v1alpha1,
     },
-    kerberos::{self, add_kerberos_pod_config, kerberos_container_start_commands},
     listener::{LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, build_role_listener},
     operations::{graceful_shutdown::add_graceful_shutdown_config, pdb::add_pdbs},
     service::{build_rolegroup_headless_service, build_rolegroup_metrics_service},
@@ -250,7 +250,9 @@ pub enum Error {
     },
 
     #[snafu(display("failed to construct JVM arguments"))]
-    ConstructJvmArguments { source: crate::config::jvm::Error },
+    ConstructJvmArguments {
+        source: crate::controller::build::jvm::Error,
+    },
 
     #[snafu(display("failed to apply group listener for {role}"))]
     ApplyGroupListener {

rust/operator-binary/src/controller.rs

@@ -1,12 +1,9 @@
 use stackable_operator::crd::s3;
 
-use crate::{
-    config::opa::HiveOpaConfig,
-    crd::{
-        HIVE_METASTORE_LOG4J2_PROPERTIES, STACKABLE_CONFIG_DIR, STACKABLE_CONFIG_MOUNT_DIR,
-        STACKABLE_LOG_CONFIG_MOUNT_DIR, STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD,
-        v1alpha1,
-    },
+use super::{opa::HiveOpaConfig, properties::ConfigFileName};
+use crate::crd::{
+    STACKABLE_CONFIG_DIR, STACKABLE_CONFIG_MOUNT_DIR, STACKABLE_LOG_CONFIG_MOUNT_DIR,
+    STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD, v1alpha1,
 };
 
 pub fn build_container_command_args(
@@ -15,16 +12,17 @@ pub fn build_container_command_args(
     s3_connection_spec: Option<&s3::v1alpha1::ConnectionSpec>,
     hive_opa_config: Option<&HiveOpaConfig>,
 ) -> Vec<String> {
+    let log4j2_properties = ConfigFileName::Log4j2;
     let mut args = vec![
         // copy config files to a writeable empty folder in order to set s3 access and secret keys
         format!("echo copying {STACKABLE_CONFIG_MOUNT_DIR} to {STACKABLE_CONFIG_DIR}"),
         format!("cp -RL {STACKABLE_CONFIG_MOUNT_DIR}/* {STACKABLE_CONFIG_DIR}"),
         // Copy log4j2 properties
         format!(
-            "echo copying {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES} to {STACKABLE_CONFIG_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES}"
+            "echo copying {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{log4j2_properties} to {STACKABLE_CONFIG_DIR}/{log4j2_properties}"
         ),
         format!(
-            "cp -RL {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES} {STACKABLE_CONFIG_DIR}/{HIVE_METASTORE_LOG4J2_PROPERTIES}"
+            "cp -RL {STACKABLE_LOG_CONFIG_MOUNT_DIR}/{log4j2_properties} {STACKABLE_CONFIG_DIR}/{log4j2_properties}"
         ),
         // Template config files
         format!(

rust/operator-binary/src/command.rs …r-binary/src/controller/build/command.rsrust/operator-binary/src/command.rs renamed to rust/operator-binary/src/controller/build/command.rs rust/operator-binary/src/command.rs renamed to rust/operator-binary/src/controller/build/command.rs

@@ -4,10 +4,10 @@ use stackable_operator::{
     role_utils::{self, JvmArgumentOverrides},
 };
 
+use super::properties::ConfigFileName;
 use crate::crd::{
-    HiveRoleType, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT, MetaStoreConfig,
-    STACKABLE_CONFIG_DIR, STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD,
-    v1alpha1::HiveCluster,
+    HiveRoleType, METRICS_PORT, MetaStoreConfig, STACKABLE_CONFIG_DIR, STACKABLE_TRUST_STORE,
+    STACKABLE_TRUST_STORE_PASSWORD, v1alpha1::HiveCluster,
 };
 
 const JAVA_HEAP_FACTOR: f32 = 0.8;
@@ -32,8 +32,9 @@ fn construct_jvm_args(
     role: &HiveRoleType,
     role_group: &str,
 ) -> Result<Vec<String>, Error> {
+    let security_properties = ConfigFileName::Security;
     let mut jvm_args = vec![
-        format!("-Djava.security.properties={STACKABLE_CONFIG_DIR}/{JVM_SECURITY_PROPERTIES_FILE}"),
+        format!("-Djava.security.properties={STACKABLE_CONFIG_DIR}/{security_properties}"),
         format!(
             "-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/jmx_hive_config.yaml"
         ),

rust/operator-binary/src/config/jvm.rs …rator-binary/src/controller/build/jvm.rsrust/operator-binary/src/config/jvm.rs renamed to rust/operator-binary/src/controller/build/jvm.rs rust/operator-binary/src/config/jvm.rs renamed to rust/operator-binary/src/controller/build/jvm.rs

@@ -19,7 +19,8 @@ use stackable_operator::{
     utils::cluster_info::KubernetesClusterInfo,
 };
 
-use crate::crd::{HIVE_SITE_XML, HiveRole, STACKABLE_CONFIG_DIR, v1alpha1};
+use super::properties::ConfigFileName;
+use crate::crd::{HiveRole, STACKABLE_CONFIG_DIR, v1alpha1};
 
 #[derive(Snafu, Debug)]
 #[allow(clippy::enum_variant_names)] // all variants have the same prefix: `Add`
@@ -110,9 +111,10 @@ pub fn kerberos_container_start_commands(hive: &v1alpha1::HiveCluster) -> String
         return String::new();
     }
 
+    let hive_site_xml = ConfigFileName::HiveSite;
     let mut args = vec![formatdoc! {"
         export KERBEROS_REALM=$(grep -oP 'default_realm = \\K.*' /stackable/kerberos/krb5.conf)
-        sed -i -e 's/${{env.KERBEROS_REALM}}/'\"$KERBEROS_REALM/g\" {STACKABLE_CONFIG_DIR}/{HIVE_SITE_XML}",
+        sed -i -e 's/${{env.KERBEROS_REALM}}/'\"$KERBEROS_REALM/g\" {STACKABLE_CONFIG_DIR}/{hive_site_xml}",
     }];
 
     if hive.spec.cluster_config.hdfs.is_some() {

rust/operator-binary/src/kerberos.rs …-binary/src/controller/build/kerberos.rsrust/operator-binary/src/kerberos.rs renamed to rust/operator-binary/src/controller/build/kerberos.rs rust/operator-binary/src/kerberos.rs renamed to rust/operator-binary/src/controller/build/kerberos.rs

@@ -1,5 +1,9 @@
 //! Builders that turn a `ValidatedCluster` into Kubernetes resources.
 
+pub mod command;
 pub mod config_map;
 pub mod discovery;
+pub mod jvm;
+pub mod kerberos;
+pub mod opa;
 pub mod properties;

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

@@ -1,7 +1,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{crd::s3, kube::ResourceExt};
 
-use crate::{config::opa::HiveOpaConfig, crd::v1alpha1};
+use crate::{controller::build::opa::HiveOpaConfig, crd::v1alpha1};
 
 #[derive(Snafu, Debug)]
 pub enum Error {

rust/operator-binary/src/config/opa.rs …rator-binary/src/controller/build/opa.rsrust/operator-binary/src/config/opa.rs renamed to rust/operator-binary/src/controller/build/opa.rs rust/operator-binary/src/config/opa.rs renamed to rust/operator-binary/src/controller/build/opa.rs

@@ -15,15 +15,15 @@ use stackable_operator::{
 use crate::{
     controller::{
         CONTAINER_IMAGE_BASE_NAME, HiveRoleGroupConfig, RoleGroupName, ValidatedCluster,
-        ValidatedClusterConfig, ValidatedRoleConfig, dereference::DereferencedObjects,
+        ValidatedClusterConfig, ValidatedRoleConfig, build::kerberos::kerberos_config_properties,
+        dereference::DereferencedObjects,
     },
     crd::{
         HiveRole, MetaStoreConfig,
         databases::{MetadataDatabaseConnection, derby_driver_class},
         v1alpha1::{self, HiveMetastoreRoleConfig},
     },
     framework::role_utils::with_validated_config,
-    kerberos::kerberos_config_properties,
 };
 
 #[derive(Snafu, Debug)]

rust/operator-binary/src/controller/dereference.rs

@@ -54,12 +54,6 @@ pub const STACKABLE_LOG_DIR_NAME: &str = "log";
 pub const STACKABLE_LOG_CONFIG_MOUNT_DIR: &str = "/stackable/mount/log-config";
 pub const STACKABLE_LOG_CONFIG_MOUNT_DIR_NAME: &str = "log-config-mount";
 
-// Config file names
-// TODO(@maltesander): remove once fully consolidated with ConfigFileName
-pub const HIVE_SITE_XML: &str = "hive-site.xml";
-pub const HIVE_METASTORE_LOG4J2_PROPERTIES: &str = "metastore-log4j2.properties";
-pub const JVM_SECURITY_PROPERTIES_FILE: &str = "security.properties";
-
 // Default ports
 pub const HIVE_PORT_NAME: &str = "hive";
 pub const HIVE_PORT: u16 = 9083;