blarg

Author: hawkw

nexus/src/app/background/tasks/support_bundle_collector.rs

@@ -1177,7 +1177,7 @@ async fn write_ereport(ereport: Ereport, dir: &Utf8Path) -> anyhow::Result<()> {
     // Nexus doesn't have full control over --- it came from the ereport
     // metadata --- we must check that it doesn't contain any characters
     // unsuitable for use in a filesystem path.
-    let pn = ereport
+    let pn = ereport.data
         .part_number
         .as_deref()
         // If the part or serial numbers contain any unsavoury characters, it
@@ -1187,24 +1187,25 @@ async fn write_ereport(ereport: Ereport, dir: &Utf8Path) -> anyhow::Result<()> {
         // giving up on using it in the path.
         .filter(|&s| is_fs_safe_single_path_component(s))
         .unwrap_or("unknown_part");
-    let sn = ereport
+    let sn = ereport.data
         .serial_number
         .as_deref()
         .filter(|&s| is_fs_safe_single_path_component(s))
         .unwrap_or("unknown_serial");
-
+    let id = &ereport.data.id;
+    
     let dir = dir
         .join(format!("{pn}-{sn}"))
         // N.B. that we call `into_untyped_uuid()` here, as the `Display`
         // implementation for a typed UUID appends " (ereporter_restart)", which
         // we don't want.
-        .join(ereport.id().restart_id.into_untyped_uuid().to_string());
+        .join(id.restart_id.into_untyped_uuid().to_string());
     tokio::fs::create_dir_all(&dir)
         .await
         .with_context(|| format!("failed to create directory '{dir}'"))?;
-    let file_path = dir.join(format!("{}.json", ereport.id.ena));
+    let file_path = dir.join(format!("{}.json", id.ena));
     let json = serde_json::to_vec(&ereport).with_context(|| {
-        format!("failed to serialize ereport {pn}:{sn}/{}", ereport.id)
+        format!("failed to serialize ereport {pn}:{sn}/{id}")
     })?;
     tokio::fs::write(&file_path, json)
         .await