Rename env_var_from_secret to env_var_with_value_from_secret

Author: sbernauer

crates/stackable-operator/src/builder/pod/env.rs

@@ -1,6 +1,6 @@
 use k8s_openapi::api::core::v1::{EnvVar, EnvVarSource, SecretKeySelector};
 
-pub fn env_var_from_secret(
+pub fn env_var_with_value_from_secret(
     env_var_name: impl Into<String>,
     secret_name: impl Into<String>,
     secret_key: impl Into<String>,

crates/stackable-operator/src/database_connections/drivers/celery.rs

@@ -3,7 +3,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    builder::pod::{container::ContainerBuilder, env::env_var_from_secret},
+    builder::pod::{container::ContainerBuilder, env::env_var_with_value_from_secret},
     database_connections::TemplatingMechanism,
 };
 
@@ -100,7 +100,7 @@ impl CeleryDatabaseConnection for GenericCeleryDatabaseConnection {
             "{upper}_DATABASE_URL",
             upper = unique_database_name.to_uppercase()
         );
-        let url_env_var = env_var_from_secret(
+        let url_env_var = env_var_with_value_from_secret(
             &url_env_name,
             &self.connection_url_secret_name,
             "connectionUrl",

crates/stackable-operator/src/database_connections/drivers/sqlalchemy.rs

@@ -3,7 +3,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    builder::pod::{container::ContainerBuilder, env::env_var_from_secret},
+    builder::pod::{container::ContainerBuilder, env::env_var_with_value_from_secret},
     database_connections::TemplatingMechanism,
 };
 
@@ -99,7 +99,7 @@ impl SqlAlchemyDatabaseConnection for GenericSqlAlchemyDatabaseConnection {
             "{upper}_DATABASE_URL",
             upper = unique_database_name.to_uppercase()
         );
-        let url_env_var = env_var_from_secret(
+        let url_env_var = env_var_with_value_from_secret(
             &url_env_name,
             &self.connection_url_secret_name,
             "connectionUrl",

crates/stackable-operator/src/database_connections/helpers.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use k8s_openapi::api::core::v1::EnvVar;
 
-use crate::builder::pod::env::env_var_from_secret;
+use crate::builder::pod::env::env_var_with_value_from_secret;
 
 /// Returns the needed [`EnvVar`] mounts for username and password.
 ///
@@ -14,8 +14,8 @@ pub fn username_and_password_envs(
     let (username_env_name, password_env_name) =
         username_and_password_env_names(unique_database_name);
     (
-        env_var_from_secret(username_env_name, credentials_secret_name, "username"),
-        env_var_from_secret(password_env_name, credentials_secret_name, "password"),
+        env_var_with_value_from_secret(username_env_name, credentials_secret_name, "username"),
+        env_var_with_value_from_secret(password_env_name, credentials_secret_name, "password"),
     )
 }