public inbox for pbs-devel@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 v4 12/39] notify: matcher: add expression support
Date: Wed, 21 Oct 2026 16:39:33 +0200	[thread overview]
Message-ID: <DMALDYSY5IJG.1UBL7PZKKQ6HA@proxmox.com> (raw)
In-Reply-To: <20261012131413.314088-13-l.wagner@proxmox.com>

On Mon Oct 12, 2026 at 3:13 PM CEST, Lukas Wagner wrote:

[snip]

> diff --git a/proxmox-notify/src/matcher/field.rs b/proxmox-notify/src/matcher/field.rs
> index ad04b388..fd25939c 100644
> --- a/proxmox-notify/src/matcher/field.rs
> +++ b/proxmox-notify/src/matcher/field.rs
> @@ -6,6 +6,7 @@ use regex::Regex;
>  use proxmox_schema::{
>      ApiStringFormat, Schema, StringSchema, api_types::SAFE_ID_REGEX_STR, const_regex,
>  };
> +use serde::{Deserialize, Serialize};
>
>  use crate::{Error, Notification};
>
> @@ -30,42 +31,38 @@ pub const MATCH_FIELD_ENTRY_SCHEMA: Schema = StringSchema::new("Match metadata f
>      .schema();
>
>  /// Check if the notification metadata fields match
> -#[derive(Clone, Debug)]
> +#[derive(Clone, Debug, Serialize, Deserialize)]
> +#[serde(rename_all = "kebab-case", untagged)]

Via the API or CLI, I can supply an expression with keys that are
AFAIU mutually exclusive:

```
pvesh create /cluster/notifications/matchers \
	--name notsupposedtowork \
	--target mail-to-root \
	--expression \
	'{"match":{"type":"field","field":"type","values":["vzdump"],"regex":"^replication$"}}'
```

This will be accepted, but the config will only contain this:

```
matcher: notsupposedtowork
	expression {"match":{"type":"field","field":"type","values":["vzdump"]}}
	target mail-to-root
```

So it silently drops the second key. I think this should probably be
rejected, no? I think adding `deny_unknown_fields` should resolve this.
Because then, if the field matcher has the form
`{"field": "...", "values": [...]}`, "regex" will be unknown.
Analogously if the field matcher is the regex form, then "values" will
be unknown.

Wouldn't see this as a blocker, though. Could also be resolved as a
follow-up IMO.

>  pub enum FieldMatcher {
>      Exact {
>          field: String,
> -        matched_values: Vec<String>,
> +        values: Vec<String>,
>      },
>      Regex {
>          field: String,
> -        matched_regex: Regex,
> +        #[serde(with = "serde_regex")]
> +        regex: Regex,
>      },
>  }

[snip]




  reply	other threads:[~2026-10-21 14:39 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-12 13:13 [PATCH many v4 00/39] notifications: add nested match expressions Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 01/39] add new proxmox-match-expression crate Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 02/39] notify: log which matchers matched on a notification Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 03/39] notify: promote matcher to dir-style module Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 04/39] notify: fix doc comment Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 05/39] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 06/39] notify: matcher: break out field " Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 07/39] notify: matcher: break out calendar " Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 08/39] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 09/39] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 10/39] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 11/39] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 12/39] notify: matcher: add expression support Lukas Wagner
2026-10-21 14:39   ` Michael Köppl [this message]
2026-10-12 13:13 ` [PATCH proxmox v4 13/39] notify: api: support new expression parameter Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 14/39] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 15/39] notify: migrate PBS's and PVE's default matcher to expression syntax Lukas Wagner
2026-10-21 14:39   ` Michael Köppl
2026-10-12 13:13 ` [PATCH proxmox v4 16/39] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox v4 17/39] notify: matcher: don't allow empty field/severity matchers Lukas Wagner
2026-10-21 14:39   ` Michael Köppl
2026-10-12 13:13 ` [PATCH proxmox v4 18/39] notify: matcher: re-serialize expression on create/update Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-widget-toolkit v4 19/39] notifications: increase matcher window width Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-widget-toolkit v4 20/39] notifications: matcher: add support for match expressions Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-widget-toolkit v4 21/39] notifications: matcher: add better calendar editor Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-widget-toolkit v4 22/39] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-backup v4 23/39] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-backup v4 24/39] api: notification: add 'migrate-to-expression' parameter to get_matcher Lukas Wagner
2026-10-12 13:13 ` [PATCH proxmox-backup v4 25/39] ui: notification: enable new matcher UI Lukas Wagner
2026-10-12 13:14 ` [PATCH proxmox-perl-rs v4 26/39] notify: move proxmox-notify bindings from common to pve-rs Lukas Wagner
2026-10-12 13:14 ` [PATCH proxmox-perl-rs v4 27/39] notify: matcher: pass matcher config / updater directly Lukas Wagner
2026-10-12 13:14 ` [PATCH proxmox-perl-rs v4 28/39] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-12 13:14 ` [PATCH proxmox-perl-rs v4 29/39] notify: add 'migrate_to_expression' parameter for get_matcher Lukas Wagner
2026-10-12 13:14 ` [PATCH pve-cluster v4 30/39] notify: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-12 13:14 ` [PATCH pve-cluster v4 31/39] cluster: move pvecfg node version helpers from qemu-server Lukas Wagner
2026-10-12 13:14 ` [PATCH common v4 32/39] tools: move version_cmp() helper " Lukas Wagner
2026-10-12 13:14 ` [PATCH manager v4 33/39] vzdump: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-12 13:14 ` [PATCH manager v4 34/39] api: notification: pass config/updater directly to rust bindings Lukas Wagner
2026-10-12 13:14 ` [PATCH manager v4 35/39] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-10-12 13:14 ` [PATCH manager v4 36/39] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-10-12 13:14 ` [PATCH manager v4 37/39] ui: notification: enable new matcher UI Lukas Wagner
2026-10-12 13:14 ` [PATCH manager v4 38/39] api: notification: reject matchers with expression if not supported by all nodes Lukas Wagner
2026-10-12 13:14 ` [PATCH proxmox-mail-forward v4 39/39] cargo: opt into legacy-matchers feature Lukas Wagner
2026-10-21 14:40 ` [PATCH many v4 00/39] notifications: add nested match expressions Michael Köppl

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=DMALDYSY5IJG.1UBL7PZKKQ6HA@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal