Switch to config-utils templating

Author: sbernauer

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

@@ -95,7 +95,7 @@ impl SQLAlchemyDatabaseConnection for PostgresqlConnection {
             username_and_password_envs(unique_database_name, credentials_secret);
 
         let uri_template = format!(
-            "postgresql+psycopg2://${{{username_env_name}}}:${{{password_env_name}}}@{host}:{port}/{database}{parameters}",
+            "postgresql+psycopg2://${{env:{username_env_name}}}:${{env:{password_env_name}}}@{host}:{port}/{database}{parameters}",
             username_env_name = username_env.name,
             password_env_name = password_env.name,
             parameters = connection_parameters_as_url_query_parameters(parameters)
@@ -129,7 +129,7 @@ mod tests {
             postgres_connection.sqlalchemy_connection_details(UNIQUE_DATABASE_NAME);
         assert_eq!(
             sqlalchemy_connection_details.uri_template,
-            "postgresql+psycopg2://${METADATA_DATABASE_USERNAME}:${METADATA_DATABASE_PASSWORD}@airflow-postgresql:5432/airflow"
+            "postgresql+psycopg2://${env:METADATA_DATABASE_USERNAME}:${env:METADATA_DATABASE_PASSWORD}@airflow-postgresql:5432/airflow"
         );
         assert!(sqlalchemy_connection_details.username_env.is_some());
         assert!(sqlalchemy_connection_details.password_env.is_some());
@@ -171,7 +171,7 @@ mod tests {
             postgres_connection.sqlalchemy_connection_details(UNIQUE_DATABASE_NAME);
         assert_eq!(
             sqlalchemy_connection_details.uri_template,
-            "postgresql+psycopg2://${METADATA_DATABASE_USERNAME}:${METADATA_DATABASE_PASSWORD}@my-airflow.default.svc.cluster.local:1234/my_database?createDatabaseIfNotExist=true&foo=bar"
+            "postgresql+psycopg2://${env:METADATA_DATABASE_USERNAME}:${env:METADATA_DATABASE_PASSWORD}@my-airflow.default.svc.cluster.local:1234/my_database?createDatabaseIfNotExist=true&foo=bar"
         );
 
         let jdbc_connection_details = postgres_connection

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

@@ -53,7 +53,7 @@ impl CeleryDatabaseConnection for RedisConnection {
             username_and_password_envs(unique_database_name, credentials_secret);
 
         let uri_template = format!(
-            "redis://${{{username_env_name}}}:${{{password_env_name}}}@{host}:{port}/{database_id}",
+            "redis://${{env:{username_env_name}}}:${{{password_env_name}}}@{host}:{port}/{database_id}",
             username_env_name = username_env.name,
             password_env_name = password_env.name,
         );
@@ -87,7 +87,7 @@ mod tests {
             redis_connection.celery_connection_details(UNIQUE_DATABASE_NAME);
         assert_eq!(
             celery_connection_details.uri_template,
-            "redis://${WORKER_QUEUE_DATABASE_USERNAME}:${WORKER_QUEUE_DATABASE_PASSWORD}@my-redis:42/13"
+            "redis://${env:WORKER_QUEUE_DATABASE_USERNAME}:${WORKER_QUEUE_DATABASE_PASSWORD}@my-redis:42/13"
         );
         assert!(celery_connection_details.username_env.is_some());
         assert!(celery_connection_details.password_env.is_some());

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

@@ -15,7 +15,7 @@ pub trait CeleryDatabaseConnection {
 
 pub struct CeleryDatabaseConnectionDetails {
     /// The connection URI, which can contain env variable templates, e.g.
-    /// `redis://:${METADATA_DATABASE_PASSWORD}@airflow-redis-master:6379/0`
+    /// `redis://:${env:METADATA_DATABASE_PASSWORD}@airflow-redis-master:6379/0`
     /// or
     /// `<generic URI from the user>`.
     pub uri_template: String,
@@ -66,7 +66,7 @@ impl CeleryDatabaseConnection for GenericCeleryDatabaseConnection {
         let uri_env_var = env_var_from_secret(&uri_env_name, &self.uri_secret, "uri");
 
         CeleryDatabaseConnectionDetails {
-            uri_template: format!("${{{uri_env_name}}}"),
+            uri_template: format!("${{env:{uri_env_name}}}"),
             username_env: None,
             password_env: None,
             generic_uri_var: Some(uri_env_var),

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

@@ -15,7 +15,7 @@ pub trait SQLAlchemyDatabaseConnection {
 
 pub struct SQLAlchemyDatabaseConnectionDetails {
     /// The connection URI, which can contain env variable templates, e.g.
-    /// `postgresql+psycopg2://${METADATA_DATABASE_USERNAME}:${METADATA_DATABASE_PASSWORD}@airflow-postgresql:5432/airflow`
+    /// `postgresql+psycopg2://${env:METADATA_DATABASE_USERNAME}:${env:METADATA_DATABASE_PASSWORD}@airflow-postgresql:5432/airflow`
     /// or
     /// `<generic URI from the user>`.
     pub uri_template: String,
@@ -66,7 +66,7 @@ impl SQLAlchemyDatabaseConnection for GenericSQLAlchemyDatabaseConnection {
         let uri_env_var = env_var_from_secret(&uri_env_name, &self.uri_secret, "uri");
 
         SQLAlchemyDatabaseConnectionDetails {
-            uri_template: format!("${{{uri_env_name}}}"),
+            uri_template: format!("${{env:{uri_env_name}}}"),
             username_env: None,
             password_env: None,
             generic_uri_var: Some(uri_env_var),

crates/stackable-operator/src/crd/database/tests.rs

@@ -102,7 +102,7 @@ fn test_dummy_celery_database_usage() {
 
     assert_eq!(
         celery_connection_details.uri_template,
-        "${WORKER_QUEUE_DATABASE_URI}"
+        "${env:WORKER_QUEUE_DATABASE_URI}"
     );
     assert_eq!(
         container