Skip to content

Catch empty AZ env vars #6109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guilload merged 4 commits into from
Jan 23, 2026
+21 −2
Merged

Catch empty AZ env vars #6109

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a67a81
Catch empty AZ env vars
nadav-govari Jan 21, 2026
a1c0a92
move into resolve_optional and add test
nadav-govari Jan 22, 2026
88ddef1
PR suggestion
nadav-govari Jan 23, 2026
6448ff3
Fix fmt, lints, etc.
guilload Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions quickwit/quickwit-config/src/config_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use std::{any, fmt};

use anyhow::{self, Context};
use serde::{Deserialize, Deserializer};
use tracing::log::warn;

use crate::qw_env_vars::{QW_ENV_VARS, QW_NONE};

Expand Down Expand Up @@ -68,7 +69,17 @@ where
// QW env vars take precedence over the config file values.
if E > QW_NONE
&& let Some(env_var_key) = QW_ENV_VARS.get(&E)
&& let Some(env_var_value) = env_vars.get(*env_var_key)
&& let Some(env_var_value) = env_vars.get(*env_var_key).filter(|val| {
if val.is_empty() {
warn!(
"environment variable `{}` is set but value is empty",
*env_var_key
);
false
} else {
true
}
})
{
let value = env_var_value.parse::<T>().map_err(|error| {
anyhow::anyhow!(
Expand Down Expand Up @@ -118,7 +129,7 @@ where T: Deserialize<'de>
mod tests {
use super::*;
use crate::qw_env_vars::{
QW_CLUSTER_ID, QW_GOSSIP_LISTEN_PORT, QW_NODE_ID, QW_REST_LISTEN_PORT,
QW_AVAILABILITY_ZONE, QW_CLUSTER_ID, QW_GOSSIP_LISTEN_PORT, QW_NODE_ID, QW_REST_LISTEN_PORT,
};

#[test]
Expand Down Expand Up @@ -191,6 +202,14 @@ mod tests {
rest_listen_port.resolve(&env_vars).unwrap_err();
}

#[test]
fn test_config_value_resolve_optional_empty_string() {
let mut env_vars = HashMap::new();
env_vars.insert("QW_AVAILABILITY_ZONE".to_string(), "".to_string());
let az = ConfigValue::<usize, QW_AVAILABILITY_ZONE>::none();
assert!(az.resolve_optional(&env_vars).unwrap().is_none());
}

#[test]
fn test_config_value_deserialize() {
fn default_cluster_id() -> ConfigValue<String, QW_CLUSTER_ID> {
Expand Down