fix unify key store constants

Author: maltesander

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

@@ -30,7 +30,8 @@ use stackable_operator::{
 };
 
 use crate::crd::{
-    DruidRole, STACKABLE_TRUST_STORE_PASSWORD, STACKABLE_TRUST_STORE_TYPE,
+    DruidRole, KEY_STORE_FILE, STACKABLE_TRUST_STORE_PASSWORD, STACKABLE_TRUST_STORE_TYPE,
+    TRUST_STORE_FILE,
     security::{DruidTlsSecurity, PLAINTEXT_PORT_NAME, STACKABLE_TLS_DIR, TLS_PORT_NAME},
 };
 
@@ -83,10 +84,6 @@ const TLS_ALIAS_NAME: &str = "1";
 const AUTH_TRUST_STORE_PATH: &str = "druid.auth.basic.ssl.trustStorePath";
 const AUTH_TRUST_STORE_TYPE: &str = "druid.auth.basic.ssl.trustStoreType";
 const AUTH_TRUST_STORE_PASSWORD: &str = "druid.auth.basic.ssl.trustStorePassword";
-// PKCS12 store file names (within the TLS store directory).
-const TRUST_STORE_FILE: &str = "truststore.p12";
-const KEY_STORE_FILE: &str = "keystore.p12";
-
 // The layer-4 protocol used by all of Druid's exposed ports.
 const TCP_PROTOCOL: &str = "TCP";
 

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

@@ -81,6 +81,9 @@ pub const HDFS_CONFIG_DIRECTORY: &str = "/stackable/hdfs";
 pub const LOG_CONFIG_DIRECTORY: &str = "/stackable/log_config";
 pub const RW_CONFIG_DIRECTORY: &str = "/stackable/rwconfig";
 
+pub const TRUST_STORE_FILE: &str = "truststore.p12";
+pub const KEY_STORE_FILE: &str = "keystore.p12";
+
 // store directories
 pub const STACKABLE_TRUST_STORE: &str = "/stackable/truststore.p12";
 pub const STACKABLE_TRUST_STORE_PASSWORD: &str = "changeit";

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

@@ -1,7 +1,8 @@
 use stackable_operator::v2::types::kubernetes::SecretClassName;
 
 use crate::crd::{
-    STACKABLE_TRUST_STORE_PASSWORD, authentication::AuthenticationClassesResolved, v1alpha1,
+    STACKABLE_TRUST_STORE_PASSWORD, TRUST_STORE_FILE,
+    authentication::AuthenticationClassesResolved, v1alpha1,
 };
 
 /// The validated TLS security decision for a Druid cluster: which server/internal TLS `SecretClass`
@@ -82,7 +83,7 @@ pub fn add_cert_to_trust_store_cmd(
     destination_directory: &str,
     store_password: &str,
 ) -> Vec<String> {
-    let truststore = format!("{destination_directory}/truststore.p12");
+    let truststore = format!("{destination_directory}/{TRUST_STORE_FILE}");
     vec![format!(
         "if [ -f {truststore} ]; then cert-tools generate-pkcs12-truststore --pkcs12 {truststore}:{store_password} --pem {cert_file} --out {truststore} --out-password {store_password}; else cert-tools generate-pkcs12-truststore --pem {cert_file} --out {truststore} --out-password {store_password}; fi"
     )]