From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-perl-rs v5 31/42] notify: add 'migrate_to_expression' parameter for get_matcher
Date: Thu, 22 Oct 2026 14:15:56 +0200 [thread overview]
Message-ID: <20261022121608.271515-32-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261022121608.271515-1-l.wagner@proxmox.com>
If set, we return the matcher with any occurrences of the 'old' match-*,
invert-match and mode keys to an equivalent expression.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
pve-rs/src/bindings/notify.rs | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/pve-rs/src/bindings/notify.rs b/pve-rs/src/bindings/notify.rs
index 820b8c0..da3c056 100644
--- a/pve-rs/src/bindings/notify.rs
+++ b/pve-rs/src/bindings/notify.rs
@@ -12,7 +12,7 @@ pub mod pve_rs_notify {
use std::collections::HashMap;
use std::sync::Mutex;
- use anyhow::{bail, Error};
+ use anyhow::{Error, bail};
use serde_json::Value as JSONValue;
use perlmod::Value;
@@ -33,7 +33,7 @@ pub mod pve_rs_notify {
DeleteableWebhookProperty, WebhookConfig, WebhookConfigUpdater,
};
use proxmox_notify::matcher::{DeleteableMatcherProperty, MatcherConfig, MatcherConfigUpdater};
- use proxmox_notify::{api, Config, Notification, Severity};
+ use proxmox_notify::{Config, Notification, Severity, api};
/// A notification catalog instance.
///
@@ -464,9 +464,15 @@ pub mod pve_rs_notify {
pub fn get_matcher(
#[try_from_ref] this: &NotificationConfig,
id: &str,
+ migrate_to_expression: bool,
) -> Result<MatcherConfig, HttpError> {
let config = this.config.lock().unwrap();
- api::matcher::get_matcher(&config, id)
+
+ if migrate_to_expression {
+ api::matcher::get_matcher_as_expression(&config, id)
+ } else {
+ api::matcher::get_matcher(&config, id)
+ }
}
/// Method: Add a matcher.
--
2.47.3
next prev parent reply other threads:[~2026-10-22 12:21 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-22 12:15 [PATCH many v5 00/42] notifications: add nested match expressions Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 01/42] add new proxmox-match-expression crate Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 02/42] notify: log which matchers matched on a notification Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 03/42] notify: promote matcher to dir-style module Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 04/42] notify: fix doc comment Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 05/42] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 06/42] notify: matcher: break out field " Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 07/42] notify: matcher: break out calendar " Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 08/42] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 09/42] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 10/42] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 11/42] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 12/42] notify: matcher: add expression support Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 13/42] notify: api: support new expression parameter Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 14/42] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 15/42] notify: migrate PBS's and PVE's default matcher to expression syntax Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 16/42] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 17/42] notify: matcher: don't allow empty field/severity matchers Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 18/42] notify: matcher: re-serialize expression on create/update Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox v5 19/42] notify: matcher: ensure that field names match SAFE_ID_REGEX Lukas Wagner
2026-10-22 14:30 ` Michael Köppl
2026-10-22 12:15 ` [PATCH proxmox v5 20/42] notify: matcher: expression: reject ambiguous field matchers Lukas Wagner
2026-10-22 14:29 ` Michael Köppl
2026-10-22 12:15 ` [PATCH proxmox-widget-toolkit v5 21/42] notifications: increase matcher window width Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-widget-toolkit v5 22/42] notifications: matcher: add support for match expressions Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-widget-toolkit v5 23/42] notifications: matcher: add better calendar editor Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-widget-toolkit v5 24/42] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-backup v5 25/42] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-backup v5 26/42] api: notification: add 'migrate-to-expression' parameter to get_matcher Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-backup v5 27/42] ui: notification: enable new matcher UI Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-perl-rs v5 28/42] notify: move proxmox-notify bindings from common to pve-rs Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-perl-rs v5 29/42] notify: matcher: pass matcher config / updater directly Lukas Wagner
2026-10-22 12:15 ` [PATCH proxmox-perl-rs v5 30/42] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-22 12:15 ` Lukas Wagner [this message]
2026-10-22 12:15 ` [PATCH proxmox-perl-rs v5 32/42] debian: document versioned break for PVE::RS::Notify changes Lukas Wagner
2026-10-22 12:15 ` [PATCH pve-cluster v5 33/42] notify: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-22 12:15 ` [PATCH pve-cluster v5 34/42] cluster: move pvecfg node version helpers from qemu-server Lukas Wagner
2026-10-22 12:16 ` [PATCH common v5 35/42] tools: move version_cmp() helper " Lukas Wagner
2026-10-22 12:16 ` [PATCH manager v5 36/42] vzdump: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-22 12:16 ` [PATCH manager v5 37/42] api: notification: pass config/updater directly to rust bindings Lukas Wagner
2026-10-22 12:16 ` [PATCH manager v5 38/42] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-10-22 12:16 ` [PATCH manager v5 39/42] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-10-22 12:16 ` [PATCH manager v5 40/42] ui: notification: enable new matcher UI Lukas Wagner
2026-10-22 12:16 ` [PATCH manager v5 41/42] api: notification: reject matchers with expression if not supported by all nodes Lukas Wagner
2026-10-22 12:16 ` [PATCH proxmox-mail-forward v5 42/42] cargo: opt into legacy-matchers feature 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=20261022121608.271515-32-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pbs-devel@lists.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.