Skip to content
Merged
Changes from all commits
Commits
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
37 changes: 34 additions & 3 deletions vmm/src/app/qemu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ fn networking_to_proto(n: &Networking) -> pb::NetworkingConfig {
pb::NetworkingConfig { mode: mode.into() }
}

fn sanitize_optional<T: AsRef<str>>(value: Option<T>) -> Option<T> {
value.filter(|value| !value.as_ref().trim().is_empty())
}

#[derive(Debug, Deserialize)]
pub struct InstanceInfo {
#[serde(default)]
Expand Down Expand Up @@ -271,8 +275,9 @@ impl VmInfo {
},
app_url: self
.gateway_enabled
.then_some(self.instance_id.as_ref())
.then_some(self.instance_id.as_deref())
.flatten()
.and_then(|id| sanitize_optional(Some(id)))
.map(|id| {
// Use custom gateway URL if available, otherwise fall back to global config
if let Some(custom_gw_url) = custom_gateway_urls.first() {
Expand All @@ -297,7 +302,7 @@ impl VmInfo {
}
}),
app_id: self.manifest.app_id.clone(),
instance_id: self.instance_id.as_deref().map(Into::into),
instance_id: sanitize_optional(self.instance_id.clone()),
exited_at: self.exited_at.clone(),
events: self.events.clone(),
}
Expand Down Expand Up @@ -336,7 +341,8 @@ impl VmState {
}
let uptime = display_ts(proc_state.and_then(|info| info.state.started_at.as_ref()));
let exited_at = display_ts(proc_state.and_then(|info| info.state.stopped_at.as_ref()));
let instance_id = workdir.instance_info().ok().map(|info| info.instance_id);
let instance_id =
sanitize_optional(workdir.instance_info().ok().map(|info| info.instance_id));
VmInfo {
manifest: self.config.manifest.clone(),
workdir: workdir.path().to_path_buf(),
Expand All @@ -354,6 +360,31 @@ impl VmState {
}
}

#[cfg(test)]
mod tests {
use super::sanitize_optional;

#[test]
fn sanitize_optional_filters_empty_owned_values() {
assert_eq!(sanitize_optional(Some(String::new())), None);
assert_eq!(sanitize_optional(Some(" ".to_string())), None);
assert_eq!(
sanitize_optional(Some("instance-123".to_string())),
Some("instance-123".to_string())
);
}

#[test]
fn sanitize_optional_filters_empty_borrowed_values() {
assert_eq!(sanitize_optional(Some("")), None);
assert_eq!(sanitize_optional(Some(" ")), None);
assert_eq!(
sanitize_optional(Some("instance-123")),
Some("instance-123")
);
}
}

impl VmConfig {
pub fn config_qemu(
&self,
Expand Down
Loading