From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 834B093A9A for ; Tue, 9 Apr 2024 15:26:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A0121EFB5 for ; Tue, 9 Apr 2024 15:26:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Apr 2024 15:26:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 432DA42232 for ; Tue, 9 Apr 2024 15:26:04 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 9 Apr 2024 15:25:42 +0200 Message-Id: <20240409132555.364926-7-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240409132555.364926-1-l.wagner@proxmox.com> References: <20240409132555.364926-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox 06/19] notify: give each notification a unique ID X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2024 13:26:05 -0000 We need this for queuing notifications on PBS from the unprivileged proxy process. Signed-off-by: Lukas Wagner --- proxmox-notify/Cargo.toml | 1 + proxmox-notify/src/lib.rs | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/proxmox-notify/Cargo.toml b/proxmox-notify/Cargo.toml index 185b50a..797b1ac 100644 --- 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 35dcb17..91c0b61 100644 --- 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) { -- 2.39.2