fix: consolidate listener class default, keystore / truststore constants

Author: maltesander

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

@@ -21,6 +21,9 @@ use crate::{
     },
 };
 
+/// Sub-directory of [`CONFIG_DIR_NAME`] holding the HDFS exchange config.
+const EXCHANGE_HDFS_CONFIG: &str = "exchange-hdfs-config";
+
 #[derive(Snafu, Debug)]
 pub enum Error {
     #[snafu(display("failed to resolve S3 connection"))]
@@ -240,7 +243,7 @@ impl ResolvedFaultTolerantExecutionConfig {
                         hdfs_config.skip_directory_scheme_validation,
                     );
 
-                    let hdfs_config_dir = format!("{CONFIG_DIR_NAME}/exchange-hdfs-config");
+                    let hdfs_config_dir = format!("{CONFIG_DIR_NAME}/{EXCHANGE_HDFS_CONFIG}");
                     exchange_manager_properties.insert(
                         "hdfs.config.resources".to_string(),
                         format!("{hdfs_config_dir}/core-site.xml,{hdfs_config_dir}/hdfs-site.xml"),
@@ -308,8 +311,8 @@ impl ResolvedFaultTolerantExecutionConfig {
     }
 
     fn resolve_hdfs_backend(&mut self, hdfs_config: &HdfsExchangeConfig) {
-        let hdfs_config_dir = format!("{CONFIG_DIR_NAME}/exchange-hdfs-config");
-        let volume_name = "exchange-hdfs-config".to_string();
+        let hdfs_config_dir = format!("{CONFIG_DIR_NAME}/{EXCHANGE_HDFS_CONFIG}");
+        let volume_name = EXCHANGE_HDFS_CONFIG.to_string();
 
         self.volumes.push(
             VolumeBuilder::new(&volume_name)

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

@@ -57,6 +57,10 @@ const DEFAULT_NODE_SCHEDULER_INCLUDE_COORDINATOR: &str = "false";
 
 const LOG_FILE_COUNT: u32 = 2;
 
+// TLS keystore/truststore file names (PKCS#12).
+const KEYSTORE_P12: &str = "keystore.p12";
+const TRUSTSTORE_P12: &str = "truststore.p12";
+
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display(
@@ -153,15 +157,15 @@ pub fn build(
         };
         props.insert(
             HTTP_SERVER_KEYSTORE_PATH.to_string(),
-            format!("{tls_store_dir}/keystore.p12"),
+            format!("{tls_store_dir}/{KEYSTORE_P12}"),
         );
         props.insert(
             HTTP_SERVER_HTTPS_KEYSTORE_KEY.to_string(),
             STACKABLE_TLS_STORE_PASSWORD.to_string(),
         );
         props.insert(
             HTTP_SERVER_TRUSTSTORE_PATH.to_string(),
-            format!("{tls_store_dir}/truststore.p12"),
+            format!("{tls_store_dir}/{TRUSTSTORE_P12}"),
         );
         props.insert(
             HTTP_SERVER_HTTPS_TRUSTSTORE_KEY.to_string(),
@@ -171,15 +175,15 @@ pub fn build(
     if internal_tls_enabled {
         props.insert(
             INTERNAL_COMMUNICATION_HTTPS_KEYSTORE_PATH.to_string(),
-            format!("{STACKABLE_INTERNAL_TLS_DIR}/keystore.p12"),
+            format!("{STACKABLE_INTERNAL_TLS_DIR}/{KEYSTORE_P12}"),
         );
         props.insert(
             INTERNAL_COMMUNICATION_HTTPS_KEYSTORE_KEY.to_string(),
             STACKABLE_TLS_STORE_PASSWORD.to_string(),
         );
         props.insert(
             INTERNAL_COMMUNICATION_HTTPS_TRUSTSTORE_PATH.to_string(),
-            format!("{STACKABLE_INTERNAL_TLS_DIR}/truststore.p12"),
+            format!("{STACKABLE_INTERNAL_TLS_DIR}/{TRUSTSTORE_P12}"),
         );
         props.insert(
             INTERNAL_COMMUNICATION_HTTPS_TRUSTSTORE_KEY.to_string(),

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

@@ -86,6 +86,8 @@ pub const ENV_INTERNAL_SECRET: &str = "INTERNAL_SECRET";
 pub const ENV_SPOOLING_SECRET: &str = "SPOOLING_SECRET";
 // TLS
 const TLS_DEFAULT_SECRET_CLASS: &str = "tls";
+// Listener
+pub const DEFAULT_LISTENER_CLASS: &str = "cluster-internal";
 // Logging
 pub const MAX_TRINO_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {
     value: 10.0,
@@ -374,7 +376,7 @@ impl Default for v1alpha1::TrinoCoordinatorRoleConfig {
 }
 
 fn coordinator_default_listener_class() -> ListenerClassName {
-    ListenerClassName::from_str("cluster-internal")
+    ListenerClassName::from_str(DEFAULT_LISTENER_CLASS)
         .expect("the default listener class name must be valid")
 }