fix/ldap-secret-key-name (#362)

# Description

This PR fixes the inconsistency of Trino with Superset and NiFi. While Superset and NiFi use "user" and "password" for the LDAP Secret keys, Trino just used it's environment variable names. 



Co-authored-by: Felix Hennig <fhennig@users.noreply.github.com>

Author: Felix Hennig

CHANGELOG.md

@@ -16,8 +16,9 @@ All notable changes to this project will be documented in this file.
 - `operator-rs` `0.25.0` -> `0.30.1` ([#344], [#360]).
 - LDAP integration tests create all resources in their namespace and not some in the default namespace ([#344]).
 - Don't run init container as root and avoid chmod and chowning ([#353]).
-- [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#356]).
+- [BREAKING]: Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#356]).
 - [BREAKING]: Removed tools image for init container and replaced with Trino product image. This means the latest stackable version has to be used in the product image selection ([#357])
+- [BREAKING]: Use `user` and `password` Secret keys for LDAP bind credentials Secrets, instead of env var names ([#362])
 
 ### Fixed
 
@@ -34,6 +35,7 @@ All notable changes to this project will be documented in this file.
 [#357]: https://github.com/stackabletech/trino-operator/pull/357
 [#358]: https://github.com/stackabletech/trino-operator/pull/358
 [#360]: https://github.com/stackabletech/trino-operator/pull/360
+[#362]: https://github.com/stackabletech/trino-operator/pull/362
 
 ## [0.8.0] - 2022-11-07
 

rust/operator-binary/src/controller.rs

@@ -647,29 +647,26 @@ fn build_rolegroup_statefulset(
         .collect::<Vec<_>>();
 
     let secret_name = build_shared_internal_secret_name(trino);
-    if let Some(internal_secret) = env_var_from_secret(&Some(secret_name), ENV_INTERNAL_SECRET) {
-        env.push(internal_secret);
-    };
+    env.push(env_var_from_secret(&secret_name, None, ENV_INTERNAL_SECRET));
 
     // we need to mount ldap bind credentials from the secret as env vars
     if let Some(auth) = authentication_config {
         match auth {
             TrinoAuthenticationConfig::MultiUser { .. } => {}
             TrinoAuthenticationConfig::Ldap(ldap) => {
                 if let Some(ldap_bind_secret) = &ldap.bind_credentials {
-                    if let Some(ldap_user) = env_var_from_secret(
-                        &Some(ldap_bind_secret.secret_class.clone()),
+                    // LDAP user
+                    env.push(env_var_from_secret(
+                        &ldap_bind_secret.secret_class,
+                        Some("user"),
                         LDAP_USER_ENV,
-                    ) {
-                        env.push(ldap_user);
-                    }
-
-                    if let Some(ldap_password) = env_var_from_secret(
-                        &Some(ldap_bind_secret.secret_class.clone()),
+                    ));
+                    // LDAP password
+                    env.push(env_var_from_secret(
+                        &ldap_bind_secret.secret_class,
+                        Some("password"),
                         LDAP_PASSWORD_ENV,
-                    ) {
-                        env.push(ldap_password);
-                    }
+                    ));
                 }
             }
         }
@@ -863,19 +860,22 @@ async fn user_authentication(
     })
 }
 
-fn env_var_from_secret(secret_name: &Option<String>, env_var: &str) -> Option<EnvVar> {
-    secret_name.as_ref().map(|secret| EnvVar {
+/// Give a secret name and an optional key in the secret to use.
+/// The value from the key will be set into the given env var name.
+/// If not secret key is given, the env var name will be used as the secret key.
+fn env_var_from_secret(secret_name: &str, secret_key: Option<&str>, env_var: &str) -> EnvVar {
+    EnvVar {
         name: env_var.to_string(),
         value_from: Some(EnvVarSource {
             secret_key_ref: Some(SecretKeySelector {
                 optional: Some(false),
-                name: Some(secret.to_string()),
-                key: env_var.to_string(),
+                name: Some(secret_name.to_string()),
+                key: secret_key.unwrap_or(env_var).to_string(),
             }),
             ..EnvVarSource::default()
         }),
         ..EnvVar::default()
-    })
+    }
 }
 
 /// Defines all required roles and their required configuration.

tests/templates/kuttl/ldap/12-install-trino.yaml.j2

@@ -6,8 +6,8 @@ metadata:
   labels:
     secrets.stackable.tech/class: trino-with-ldap-bind
 stringData:
-  LDAP_USER: cn=admin,dc=example,dc=org
-  LDAP_PASSWORD: admin
+  user: cn=admin,dc=example,dc=org
+  password: admin
 ---
 apiVersion: trino.stackable.tech/v1alpha1
 kind: TrinoCluster