Skip to content

Commit 49f8ba0

Browse files
committed
Revert "fix: Use $VAR instead of ${VAR} (for Airflow)"
This reverts commit 8e05224. It was actually mot needed :)
1 parent 8e05224 commit 49f8ba0

5 files changed

Lines changed: 6 additions & 9 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl SQLAlchemyDatabaseConnection for PostgresqlConnection {
106106
"postgresql+psycopg2://${{env:{username_env_name}}}:${{env:{password_env_name}}}@{host}:{port}/{database}{parameters}",
107107
),
108108
TemplatingMechanism::BashEnvSubstitution => format!(
109-
"postgresql+psycopg2://${username_env_name}:${password_env_name}@{host}:{port}/{database}{parameters}",
109+
"postgresql+psycopg2://${{{username_env_name}}}:${{{password_env_name}}}@{host}:{port}/{database}{parameters}",
110110
),
111111
};
112112
SQLAlchemyDatabaseConnectionDetails {
@@ -142,7 +142,7 @@ impl CeleryDatabaseConnection for PostgresqlConnection {
142142
"db+postgresql://${{env:{username_env_name}}}:${{env:{password_env_name}}}@{host}:{port}/{database}{parameters}",
143143
),
144144
TemplatingMechanism::BashEnvSubstitution => format!(
145-
"db+postgresql://${username_env_name}:${password_env_name}@{host}:{port}/{database}{parameters}",
145+
"db+postgresql://${{{username_env_name}}}:${{{password_env_name}}}@{host}:{port}/{database}{parameters}",
146146
),
147147
};
148148
CeleryDatabaseConnectionDetails {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl CeleryDatabaseConnection for RedisConnection {
6161
"redis://${{env:{username_env_name}}}:${{env:{password_env_name}}}@{host}:{port}/{database_id}",
6262
),
6363
TemplatingMechanism::BashEnvSubstitution => format!(
64-
"redis://${username_env_name}:${password_env_name}@{host}:{port}/{database_id}",
64+
"redis://${{{username_env_name}}}:${{{password_env_name}}}@{host}:{port}/{database_id}",
6565
),
6666
};
6767
CeleryDatabaseConnectionDetails {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl CeleryDatabaseConnection for GenericCeleryDatabaseConnection {
8181
let uri_env_var = env_var_from_secret(&uri_env_name, &self.uri_secret, "uri");
8282
let uri_template = match templating_mechanism {
8383
TemplatingMechanism::ConfigUtils => format!("${{env:{uri_env_name}}}"),
84-
TemplatingMechanism::BashEnvSubstitution => format!("${uri_env_name}"),
84+
TemplatingMechanism::BashEnvSubstitution => format!("${{{uri_env_name}}}"),
8585
};
8686

8787
CeleryDatabaseConnectionDetails {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl SQLAlchemyDatabaseConnection for GenericSQLAlchemyDatabaseConnection {
8181
let uri_env_var = env_var_from_secret(&uri_env_name, &self.uri_secret, "uri");
8282
let uri_template = match templating_mechanism {
8383
TemplatingMechanism::ConfigUtils => format!("${{env:{uri_env_name}}}"),
84-
TemplatingMechanism::BashEnvSubstitution => format!("${uri_env_name}"),
84+
TemplatingMechanism::BashEnvSubstitution => format!("${{{uri_env_name}}}"),
8585
};
8686

8787
SQLAlchemyDatabaseConnectionDetails {

crates/stackable-operator/src/databases/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ pub enum TemplatingMechanism {
2828
#[default]
2929
ConfigUtils,
3030

31-
/// Let `bash` substitute the env variable, e.g. `$EXAMPLE_USERNAME`.
32-
///
33-
/// Please note that we use `$VAR` over `${VAR}`, as for *some* reason Airflow correctly expands
34-
/// the first while failing to expand the latter.
31+
/// Let `bash` substitute the env variable, e.g. `${EXAMPLE_USERNAME}`.
3532
BashEnvSubstitution,
3633
}

0 commit comments

Comments
 (0)