all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Michael Köppl" <m.koeppl@proxmox.com>
To: "Lukas Wagner" <l.wagner@proxmox.com>,
	<pbs-devel@lists.proxmox.com>, <pve-devel@lists.proxmox.com>
Subject: Re: [PATCH proxmox v2 13/34] notify: api: support new expression parameter
Date: Wed, 07 Oct 2026 11:32:24 +0200	[thread overview]
Message-ID: <DLYI36D8VWWY.81CPF810STVF@proxmox.com> (raw)
In-Reply-To: <20261001083706.144246-14-l.wagner@proxmox.com>

On Thu Oct 1, 2026 at 10:36 AM CEST, Lukas Wagner wrote:

[snip]

> +    fn ensure_no_ignored_properties(&self) -> Result<(), Error> {
> +        if self.expression.is_some() {
> +            let conflicting_properties = self.properties_conflicting_with_expression();
> +
> +            if !conflicting_properties.is_empty() {
> +                let joined = conflicting_properties.join(", ");
> +                return Err(Error::Generic(format!(
> +                    "'expression' property is mutually exclusive with: {joined}"
> +                )));
> +            }
> +        }
> +
> +        Ok(())
> +    }
> +
> +    fn ensure_valid_expression(&self) -> Result<(), Error> {
> +        if let Some(expression) = &self.expression {
> +            match serde_json::from_str::<Expression<NotificationMatcher>>(expression) {
> +                Ok(expr) => {

When the expression passed in is pretty-printed JSON (e.g. if read from
a JSON file as part of a script or something similar), this check here
still work, but the original unescaped string is what gets stored,
which fails with

	could not serialize configuration: writing "notifications.cfg"
	failed: detected unexpected control character in section
	'json-pretty' key 'expression'

Since parsing happens here already anyway, perhaps the parsed expression
could be used in add_matcher() and update_matcher() instead of the
original string?

> +                    Self::verify_match_expression_constraints(&expr)?;
> +                }
> +                Err(err) => {
> +                    return Err(Error::Generic(format!(
> +                        "'expression' is not valid: {err:#}"
> +                    )));
> +                }
> +            }
> +        }
> +
> +        Ok(())
> +    }
> +

[snip]




  reply	other threads:[~2026-10-07  9:32 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-01  8:36 [PATCH many v2 00/34] notifications: add nested match expressions Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 01/34] add new proxmox-match-expression crate Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 02/34] notify: log which matchers matched on a notification Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 03/34] notify: promote matcher to dir-style module Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 04/34] notify: fix doc comment Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 05/34] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 06/34] notify: matcher: break out field " Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 07/34] notify: matcher: break out calendar " Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 08/34] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 09/34] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 10/34] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 11/34] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 12/34] notify: matcher: add expression support Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 13/34] notify: api: support new expression parameter Lukas Wagner
2026-10-07  9:32   ` Michael Köppl [this message]
2026-10-01  8:36 ` [PATCH proxmox v2 14/34] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 15/34] notify: migrate PBS's and PVE's default matcher to expression syntax Lukas Wagner
2026-10-07  9:32   ` Michael Köppl
2026-10-08 13:06     ` Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 16/34] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox v2 17/34] notify: matcher: don't allow empty field/severity matchers Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-widget-toolkit v2 18/34] notifications: increase matcher window width Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-widget-toolkit v2 19/34] notifications: matcher: add support for match expressions Lukas Wagner
2026-10-07  9:32   ` Michael Köppl
2026-10-08 13:44     ` Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-widget-toolkit v2 20/34] notifications: matcher: add better calendar editor Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-widget-toolkit v2 21/34] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-backup v2 22/34] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-backup v2 23/34] api: notification: add 'migrate-to-expression' parameter to get_matcher Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-backup v2 24/34] ui: notification: enable new matcher UI Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-perl-rs v2 25/34] notify: move proxmox-notify bindings from common to pve-rs Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-perl-rs v2 26/34] notify: matcher: pass matcher config / updater directly Lukas Wagner
2026-10-01  8:36 ` [PATCH proxmox-perl-rs v2 27/34] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-01  8:37 ` [PATCH proxmox-perl-rs v2 28/34] notify: add 'migrate_to_expression' parameter for get_matcher Lukas Wagner
2026-10-01  8:37 ` [PATCH pve-cluster v2 29/34] notify: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-01  8:37 ` [PATCH manager v2 30/34] vzdump: " Lukas Wagner
2026-10-01  8:37 ` [PATCH manager v2 31/34] api: notification: pass config/updater directly to rust bindings Lukas Wagner
2026-10-01  8:37 ` [PATCH manager v2 32/34] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-10-01  8:37 ` [PATCH manager v2 33/34] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-10-01  8:37 ` [PATCH manager v2 34/34] ui: notification: enable new matcher UI Lukas Wagner
2026-10-07  9:32 ` [PATCH many v2 00/34] notifications: add nested match expressions Michael Köppl
2026-10-08 14:57   ` Lukas Wagner
2026-10-09 13:22 ` superseded: " 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=DLYI36D8VWWY.81CPF810STVF@proxmox.com \
    --to=m.koeppl@proxmox.com \
    --cc=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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal