Store username and password envs separately

Author: sbernauer

crates/stackable-operator/src/crd/database/client/celery.rs

@@ -20,13 +20,29 @@ pub struct CeleryDatabaseConnectionDetails {
     /// `<generic URI from the user>`.
     pub uri_template: String,
 
-    /// The [`EnvVar`]s the operator needs to mount into the created Pods.
-    pub env_vars: Vec<EnvVar>,
+    /// The [`EnvVar`] that mounts the credentials Secret and provides the username.
+    pub username_env: Option<EnvVar>,
+
+    /// The [`EnvVar`] that mounts the credentials Secret and provides the password.
+    pub password_env: Option<EnvVar>,
+
+    /// The [`EnvVar`] that mounts the user-specified Secret and provides the generic URI.
+    pub generic_uri_var: Option<EnvVar>,
 }
 
 impl CeleryDatabaseConnectionDetails {
+    pub fn env_vars(&self) -> impl Iterator<Item = &EnvVar> {
+        [
+            &self.username_env,
+            &self.password_env,
+            &self.generic_uri_var,
+        ]
+        .into_iter()
+        .flatten()
+    }
+
     pub fn add_to_container(&self, cb: &mut ContainerBuilder) {
-        cb.add_env_vars(self.env_vars.iter());
+        cb.add_env_vars(self.env_vars());
     }
 }
 
@@ -51,7 +67,9 @@ impl CeleryDatabaseConnection for GenericCeleryDatabaseConnection {
 
         CeleryDatabaseConnectionDetails {
             uri_template: format!("${{{uri_env_name}}}"),
-            env_vars: vec![uri_env_var],
+            username_env: None,
+            password_env: None,
+            generic_uri_var: Some(uri_env_var),
         }
     }
 }

crates/stackable-operator/src/crd/database/client/sqlalchemy.rs

@@ -20,13 +20,29 @@ pub struct SQLAlchemyDatabaseConnectionDetails {
     /// `<generic URI from the user>`.
     pub uri_template: String,
 
-    /// The [`EnvVar`]s the operator needs to mount into the created Pods.
-    pub env_vars: Vec<EnvVar>,
+    /// The [`EnvVar`] that mounts the credentials Secret and provides the username.
+    pub username_env: Option<EnvVar>,
+
+    /// The [`EnvVar`] that mounts the credentials Secret and provides the password.
+    pub password_env: Option<EnvVar>,
+
+    /// The [`EnvVar`] that mounts the user-specified Secret and provides the generic URI.
+    pub generic_uri_var: Option<EnvVar>,
 }
 
 impl SQLAlchemyDatabaseConnectionDetails {
+    pub fn env_vars(&self) -> impl Iterator<Item = &EnvVar> {
+        [
+            &self.username_env,
+            &self.password_env,
+            &self.generic_uri_var,
+        ]
+        .into_iter()
+        .flatten()
+    }
+
     pub fn add_to_container(&self, cb: &mut ContainerBuilder) {
-        cb.add_env_vars(self.env_vars.iter());
+        cb.add_env_vars(self.env_vars());
     }
 }
 
@@ -51,7 +67,9 @@ impl SQLAlchemyDatabaseConnection for GenericSQLAlchemyDatabaseConnection {
 
         SQLAlchemyDatabaseConnectionDetails {
             uri_template: format!("${{{uri_env_name}}}"),
-            env_vars: vec![uri_env_var],
+            username_env: None,
+            password_env: None,
+            generic_uri_var: Some(uri_env_var),
         }
     }
 }

crates/stackable-operator/src/crd/database/server/postgresql.rs

@@ -102,7 +102,9 @@ impl SQLAlchemyDatabaseConnection for PostgresqlConnection {
         );
         SQLAlchemyDatabaseConnectionDetails {
             uri_template,
-            env_vars: vec![username_env, password_env],
+            username_env: Some(username_env),
+            password_env: Some(password_env),
+            generic_uri_var: None,
         }
     }
 }
@@ -129,14 +131,9 @@ mod tests {
             sqlalchemy_connection_details.uri_template,
             "postgresql+psycopg2://${METADATA_DATABASE_USERNAME}:${METADATA_DATABASE_PASSWORD}@airflow-postgresql:5432/airflow"
         );
-        assert_eq!(
-            sqlalchemy_connection_details
-                .env_vars
-                .iter()
-                .map(|env| &env.name)
-                .collect::<Vec<_>>(),
-            vec!["METADATA_DATABASE_USERNAME", "METADATA_DATABASE_PASSWORD"]
-        );
+        assert!(sqlalchemy_connection_details.username_env.is_some());
+        assert!(sqlalchemy_connection_details.password_env.is_some());
+        assert!(sqlalchemy_connection_details.generic_uri_var.is_none());
 
         let jdbc_connection_details = postgres_connection
             .jdbc_connection_details(UNIQUE_DATABASE_NAME)

crates/stackable-operator/src/crd/database/server/redis.rs

@@ -59,7 +59,9 @@ impl CeleryDatabaseConnection for RedisConnection {
         );
         CeleryDatabaseConnectionDetails {
             uri_template,
-            env_vars: vec![username_env, password_env],
+            username_env: Some(username_env),
+            password_env: Some(password_env),
+            generic_uri_var: None,
         }
     }
 }
@@ -87,16 +89,8 @@ mod tests {
             celery_connection_details.uri_template,
             "redis://${WORKER_QUEUE_DATABASE_USERNAME}:${WORKER_QUEUE_DATABASE_PASSWORD}@my-redis:42/13"
         );
-        assert_eq!(
-            celery_connection_details
-                .env_vars
-                .iter()
-                .map(|env| &env.name)
-                .collect::<Vec<_>>(),
-            vec![
-                "WORKER_QUEUE_DATABASE_USERNAME",
-                "WORKER_QUEUE_DATABASE_PASSWORD"
-            ]
-        );
+        assert!(celery_connection_details.username_env.is_some());
+        assert!(celery_connection_details.password_env.is_some());
+        assert!(celery_connection_details.generic_uri_var.is_none());
     }
 }