From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox v2 22/63] notify: implement PartialEq for all Config types
Date: Wed, 18 Nov 2026 10:43:06 +0100 [thread overview]
Message-ID: <20261118094348.273646-23-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261118094348.273646-1-l.wagner@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
proxmox-notify/src/api_types/gotify.rs | 2 +-
.../src/api_types/matcher/calendar.rs | 11 ++++++--
proxmox-notify/src/api_types/matcher/field.rs | 25 ++++++++++++++++++-
proxmox-notify/src/api_types/matcher/mod.rs | 4 +--
.../src/api_types/matcher/severity.rs | 4 +--
proxmox-notify/src/api_types/sendmail.rs | 2 +-
proxmox-notify/src/api_types/smtp.rs | 4 +--
proxmox-notify/src/api_types/webhook.rs | 4 +--
8 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/proxmox-notify/src/api_types/gotify.rs b/proxmox-notify/src/api_types/gotify.rs
index 334920145..f74777472 100644
--- a/proxmox-notify/src/api_types/gotify.rs
+++ b/proxmox-notify/src/api_types/gotify.rs
@@ -19,7 +19,7 @@ pub const GOTIFY_TYPENAME: &str = "gotify";
},
}
)]
-#[derive(Serialize, Deserialize, Updater, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Updater, Default, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// Config for Gotify notification endpoints
pub struct GotifyConfig {
diff --git a/proxmox-notify/src/api_types/matcher/calendar.rs b/proxmox-notify/src/api_types/matcher/calendar.rs
index a0640b49a..65fd9bb4b 100644
--- a/proxmox-notify/src/api_types/matcher/calendar.rs
+++ b/proxmox-notify/src/api_types/matcher/calendar.rs
@@ -45,11 +45,18 @@ impl DailyDurationWrapper {
}
}
+impl PartialEq for DailyDurationWrapper {
+ fn eq(&self, other: &Self) -> bool {
+ // `daily_duration` is derived from `schedule`, so comparing the latter suffices.
+ self.schedule == other.schedule
+ }
+}
+
proxmox_serde::forward_deserialize_to_from_str!(DailyDurationWrapper);
proxmox_serde::forward_serialize_to_display!(DailyDurationWrapper);
/// Match timestamp of the notification.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "kebab-case")]
pub struct CalendarMatcher {
schedule: DailyDurationWrapper,
@@ -90,7 +97,7 @@ pub mod inline {
///
/// This is a wrapper that serializes into an inline format that can be used
/// in a section config key-value pair.
- #[derive(Clone, Debug)]
+ #[derive(Clone, Debug, PartialEq)]
pub struct InlineCalendarMatcher(CalendarMatcher);
impl MatchDirective for InlineCalendarMatcher {
diff --git a/proxmox-notify/src/api_types/matcher/field.rs b/proxmox-notify/src/api_types/matcher/field.rs
index b1ea25302..a00d46c3e 100644
--- a/proxmox-notify/src/api_types/matcher/field.rs
+++ b/proxmox-notify/src/api_types/matcher/field.rs
@@ -29,6 +29,29 @@ impl From<FieldMatcher> for Expression<NotificationMatcher> {
}
}
+// `Regex` does not implement `PartialEq`, so compare the regex patterns instead.
+impl PartialEq for FieldMatcher {
+ fn eq(&self, other: &Self) -> bool {
+ match (self, other) {
+ (
+ Self::Exact { field, values },
+ Self::Exact {
+ field: other_field,
+ values: other_values,
+ },
+ ) => field == other_field && values == other_values,
+ (
+ Self::Regex { field, regex },
+ Self::Regex {
+ field: other_field,
+ regex: other_regex,
+ },
+ ) => field == other_field && regex.as_str() == other_regex.as_str(),
+ _ => false,
+ }
+ }
+}
+
impl MatchDirective for FieldMatcher {
fn matches(&self, notification: &Notification) -> Result<bool, Error> {
Ok(match self {
@@ -99,7 +122,7 @@ pub mod inline {
/// Check if the notification metadata fields match
/// This is a wrapper that serializes into an inline format that can be used
/// in a section config key-value pair.
- #[derive(Clone, Debug)]
+ #[derive(Clone, Debug, PartialEq)]
pub struct InlineFieldMatcher(FieldMatcher);
impl MatchDirective for InlineFieldMatcher {
diff --git a/proxmox-notify/src/api_types/matcher/mod.rs b/proxmox-notify/src/api_types/matcher/mod.rs
index dd9a987f4..e10ae6986 100644
--- a/proxmox-notify/src/api_types/matcher/mod.rs
+++ b/proxmox-notify/src/api_types/matcher/mod.rs
@@ -23,7 +23,7 @@ pub const MATCHER_TYPENAME: &str = "matcher";
#[api]
#[cfg(feature = "legacy-matchers")]
-#[derive(Debug, Serialize, Deserialize, Default, Clone, Copy)]
+#[derive(Debug, Serialize, Deserialize, Default, Clone, Copy, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// The mode in which the results of matches are combined.
pub enum MatchModeOperator {
@@ -75,7 +75,7 @@ pub enum MatchModeOperator {
optional: true,
},
})]
-#[derive(Clone, Debug, Serialize, Deserialize, Updater, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Updater, Default, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// Config for notification matchers.
pub struct MatcherConfig {
diff --git a/proxmox-notify/src/api_types/matcher/severity.rs b/proxmox-notify/src/api_types/matcher/severity.rs
index 2d68a46bb..ed0278888 100644
--- a/proxmox-notify/src/api_types/matcher/severity.rs
+++ b/proxmox-notify/src/api_types/matcher/severity.rs
@@ -6,7 +6,7 @@ use crate::{Error, Notification, Severity, api_types::expression::NotificationMa
use super::MatchDirective;
/// Match severity of the notification.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
pub struct SeverityMatcher {
pub(crate) severities: Vec<Severity>,
}
@@ -44,7 +44,7 @@ pub mod inline {
///
/// This is a wrapper that serializes into an inline format that can be used
/// in a section config key-value pair.
- #[derive(Clone, Debug)]
+ #[derive(Clone, Debug, PartialEq)]
pub struct InlineSeverityMatcher(SeverityMatcher);
/// Common trait implemented by all matching directives
diff --git a/proxmox-notify/src/api_types/sendmail.rs b/proxmox-notify/src/api_types/sendmail.rs
index bb843fbfa..fd7e457c2 100644
--- a/proxmox-notify/src/api_types/sendmail.rs
+++ b/proxmox-notify/src/api_types/sendmail.rs
@@ -33,7 +33,7 @@ pub const SENDMAIL_TYPENAME: &str = "sendmail";
},
},
)]
-#[derive(Debug, Serialize, Deserialize, Updater, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Updater, Default, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// Config for Sendmail notification endpoints
pub struct SendmailConfig {
diff --git a/proxmox-notify/src/api_types/smtp.rs b/proxmox-notify/src/api_types/smtp.rs
index 5cebbf8ad..e7dd37ef3 100644
--- a/proxmox-notify/src/api_types/smtp.rs
+++ b/proxmox-notify/src/api_types/smtp.rs
@@ -9,7 +9,7 @@ use super::schema::{EMAIL_SCHEMA, ENTITY_NAME_SCHEMA, USER_SCHEMA};
pub const SMTP_TYPENAME: &str = "smtp";
#[api]
-#[derive(Debug, Serialize, Deserialize, Default, Clone, Copy)]
+#[derive(Debug, Serialize, Deserialize, Default, Clone, Copy, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// Connection security
pub enum SmtpMode {
@@ -48,7 +48,7 @@ pub enum SmtpMode {
},
},
)]
-#[derive(Debug, Serialize, Deserialize, Updater, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Updater, Default, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// Config for SMTP notification endpoints
pub struct SmtpConfig {
diff --git a/proxmox-notify/src/api_types/webhook.rs b/proxmox-notify/src/api_types/webhook.rs
index 4a2430cec..68c2f381a 100644
--- a/proxmox-notify/src/api_types/webhook.rs
+++ b/proxmox-notify/src/api_types/webhook.rs
@@ -73,7 +73,7 @@ impl From<HttpMethod> for &str {
},
}
)]
-#[derive(Serialize, Deserialize, Updater, Default, Clone)]
+#[derive(Serialize, Deserialize, Updater, Default, Clone, PartialEq)]
#[serde(rename_all = "kebab-case")]
/// Config for Webhook notification endpoints
pub struct WebhookConfig {
@@ -165,7 +165,7 @@ pub enum DeleteableWebhookProperty {
}
#[api]
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
/// Datatype used to represent key-value pairs, the value
/// being encoded in base64.
pub struct KeyAndBase64Val {
--
2.47.3
next prev parent reply other threads:[~2026-11-18 9:47 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 9:42 [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 01/63] notify: disallow `unsafe` code Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 02/63] notify: refactor error type Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 03/63] notify: move `Endpoint` trait to endpoint module as pub(crate) Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 04/63] notify: use ConfigDigest instead of raw byte arrays Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 05/63] notify: remove static context and pass context as parameter Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 06/63] notify: matcher: drop unused field matcher verifiers Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 07/63] notify: introduce 'send-impl', 'api-impl' and 'api-types' features Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 08/63] notify: matcher: make matcher validation methods public Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 09/63] notify: matcher: stub CalendarMatcher::matches on wasm32 Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 10/63] notify: make SendmailEndpoint and SmtpEndpoint private types Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 11/63] notify: move `send`, `test_target` and `Bus` to new `send` module Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 12/63] notify: move Origin type to api_types module Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 13/63] notify: move Target " Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 14/63] notify: move Config to config module Lukas Wagner
2026-11-18 9:42 ` [PATCH proxmox v2 15/63] notify: move Notification and sub-types to `notification` module Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 16/63] notify: move schema module to api_types Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 17/63] notify: move check_matches from api_types::matcher to send::Bus Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 18/63] notify: move TemplateSource to context module Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 19/63] notify: config: cleanup helper names and visibility Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 20/63] notify: config: rename section config parser/writer methods Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 21/63] notify: config: pass builtins explicitly when parsing section config Lukas Wagner
2026-11-18 9:43 ` Lukas Wagner [this message]
2026-11-18 9:43 ` [PATCH proxmox v2 23/63] notify: use typed SectionConfigData Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 24/63] notify: api: api types: rename Deleteable* -> Deletable* Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 25/63] notify: context: parse builtin config only once Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 26/63] notify: context: parse proxy config in trait impl, not at the callsite Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 27/63] notify: gate sub-modules with the appropriate feature flags Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 28/63] notify: fold mail-forwarder feature into send-impl Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 29/63] notify: forwarded mails: don't hardcode severity and metadata fields Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 30/63] notify: don't pass uid when instantiating forwarded mail notifications Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 31/63] notify: derive PartialEq for Notification type Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 32/63] notify: add getters for severity and fields on " Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 33/63] notify: add test suite for " Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 34/63] notify: serialize raw, forwarded mail content as base64 Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 35/63] notify: unify code paths for legacy-sendmail and regular notifications Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 36/63] notify: add backwards-compat note to Notification type Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 37/63] notify: remove 'test_target' API Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 38/63] notify: replace notification instantiation with builder pattern Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 39/63] notify: add send receipts Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 40/63] notify: make sure that template name matches SAFE_ID_REGEX Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 41/63] notify: implement notification queue submitter Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 42/63] notify: context: add read_config Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 43/63] notify: queue: add queue consumer Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox v2 44/63] notify: queue: add worker task Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-backup v2 45/63] notifications: don't ignore verification errors in legacy-sendmail mode Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-backup v2 46/63] notifications: adapt to proxmox-notify API changes Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-backup v2 47/63] api: notification: send test notification via proxmox_notify::send Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-backup v2 48/63] notifications: send all notifications via proxmox-notify's queue Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-perl-rs v2 49/63] pve: notify: adapt to changes in the public API of proxmox-notify Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-perl-rs v2 50/63] pve: notify: add `PVE::RS::Notify::enqueue` method Lukas Wagner
2026-11-18 9:43 ` [PATCH pve-cluster v2 51/63] notify: send notifications via notification queue Lukas Wagner
2026-11-18 9:43 ` [PATCH manager v2 52/63] vzdump: send legacy-sendmail notifications via simplified API Lukas Wagner
2026-11-18 9:43 ` [PATCH manager v2 53/63] debian: create notification queue directory via tmpfiles Lukas Wagner
2026-11-18 9:43 ` [PATCH manager v2 54/63] debian: add 'pve-notify-worker' as dependecy Lukas Wagner
2026-11-18 9:43 ` [PATCH manager v2 55/63] api: services: add 'pve-notify-worker' as known service Lukas Wagner
2026-11-18 9:43 ` [PATCH manager v2 56/63] services: request pve-notify-worker.service via Wants Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 57/63] forward mails via notification queue Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 58/63] use return code to signal permanent or temporary failure Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 59/63] limit size of mail read from stdin Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 60/63] cargo: move mail forwarder into a workspace member crate Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 61/63] add crate for code shared between the mail-forwarder and the worker Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 62/63] add pve-notify-worker crate and package Lukas Wagner
2026-11-18 9:43 ` [PATCH proxmox-mail-forward v2 63/63] debian: add versioned break for pve-manager and proxmox-backup-server Lukas Wagner
2026-11-18 21:44 ` [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Thomas Lamprecht
2026-11-19 10:45 ` Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118094348.273646-23-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.