notify: give each notification a unique ID

We need this for queuing notifications on PBS from the unprivileged
proxy process.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>

diff --git a/proxmox-notify/Cargo.toml b/proxmox-notify/Cargo.toml
index 185b50a74458c9b178d073f8546d17c7cf0d57f5..797b1acfcde73a8dce148b1951e6e6e611932718 100644 (file)
--- a/proxmox-notify/Cargo.toml
+++ b/proxmox-notify/Cargo.toml
@@ -28,6 +28,7 @@ proxmox-section-config = { workspace = true }
 proxmox-serde.workspace = true
 proxmox-sys = { workspace = true, optional = true }
 proxmox-time.workspace = true
+proxmox-uuid = { workspace = true, features = ["serde"] }
 
 [features]
 default = ["sendmail", "gotify", "smtp"]

diff --git a/proxmox-notify/src/lib.rs b/proxmox-notify/src/lib.rs
index 35dcb17dd9e649418c2712bf1ecbd7b2f047560d..91c0b611b039a45bcf3f543b9a34ea8e895bbf4c 100644 (file)
--- a/proxmox-notify/src/lib.rs
+++ b/proxmox-notify/src/lib.rs
@@ -10,6 +10,7 @@ use serde_json::Value;
 
 use proxmox_schema::api;
 use proxmox_section_config::SectionConfigData;
+use proxmox_uuid::Uuid;
 
 pub mod matcher;
 use crate::config::CONFIG;
@@ -198,6 +199,8 @@ pub struct Notification {
     content: Content,
     /// Metadata
     metadata: Metadata,
+    /// Unique ID
+    id: Uuid,
 }
 
 impl Notification {
@@ -217,6 +220,7 @@ impl Notification {
                 template_name: template_name.as_ref().to_string(),
                 data: template_data,
             },
+            id: Uuid::generate(),
         }
     }
     #[cfg(feature = "mail-forwarder")]
@@ -246,8 +250,14 @@ impl Notification {
                 additional_fields,
                 timestamp: proxmox_time::epoch_i64(),
             },
+            id: Uuid::generate(),
         })
     }
+
+    /// Return the unique ID of this notification.
+    pub fn id(&self) -> &Uuid {
+        &self.id
+    }
 }
 
 /// Notification configuration
@@ -548,6 +558,7 @@ impl Bus {
                 template_name: "test".to_string(),
                 data: json!({ "target": target }),
             },
+            id: Uuid::generate(),
         };
 
         if let Some(endpoint) = self.endpoints.get(target) {