From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-perl-rs 23/29] notify: matcher: pass matcher config / updater directly
Date: Thu, 9 Jul 2026 13:57:10 +0200 [thread overview]
Message-ID: <20260709115716.299836-24-l.wagner@proxmox.com> (raw)
In-Reply-To: <20260709115716.299836-1-l.wagner@proxmox.com>
Instead of enumerating all config properties individually as paramters,
we now pass the config struct or updater as a parameter. This allows us
to simplify the callers and also we don't have to change the binding
code if new parameters are added -- a simple rebuild against
proxmox-notify suffices.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
common/src/bindings/notify.rs | 200 +++++-----------------------------
1 file changed, 26 insertions(+), 174 deletions(-)
diff --git a/common/src/bindings/notify.rs b/common/src/bindings/notify.rs
index 409270a..80ccf39 100644
--- a/common/src/bindings/notify.rs
+++ b/common/src/bindings/notify.rs
@@ -12,7 +12,7 @@ pub mod proxmox_rs_notify {
use std::collections::HashMap;
use std::sync::Mutex;
- use anyhow::{Error, bail};
+ use anyhow::{bail, Error};
use serde_json::Value as JSONValue;
use perlmod::Value;
@@ -26,17 +26,14 @@ pub mod proxmox_rs_notify {
DeleteableSendmailProperty, SendmailConfig, SendmailConfigUpdater,
};
use proxmox_notify::endpoints::smtp::{
- DeleteableSmtpProperty, SmtpConfig, SmtpConfigUpdater, SmtpMode, SmtpPrivateConfig,
+ DeleteableSmtpProperty, SmtpConfig, SmtpConfigUpdater, SmtpPrivateConfig,
SmtpPrivateConfigUpdater,
};
use proxmox_notify::endpoints::webhook::{
DeleteableWebhookProperty, WebhookConfig, WebhookConfigUpdater,
};
- use proxmox_notify::matcher::{
- CalendarMatcher, DeleteableMatcherProperty, FieldMatcher, MatchModeOperator, MatcherConfig,
- MatcherConfigUpdater, SeverityMatcher,
- };
- use proxmox_notify::{Config, Notification, Severity, api};
+ use proxmox_notify::matcher::{DeleteableMatcherProperty, MatcherConfig, MatcherConfigUpdater};
+ use proxmox_notify::{api, Config, Notification, Severity};
/// A notification catalog instance.
///
@@ -189,49 +186,23 @@ pub mod proxmox_rs_notify {
///
/// See [`api::sendmail::add_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn add_sendmail_endpoint(
#[try_from_ref] this: &NotificationConfig,
- name: String,
- mailto: Option<Vec<String>>,
- mailto_user: Option<Vec<String>>,
- from_address: Option<String>,
- author: Option<String>,
- comment: Option<String>,
- disable: Option<bool>,
+ sendmail_config: SendmailConfig,
) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap();
- api::sendmail::add_endpoint(
- &mut config,
- SendmailConfig {
- name,
- mailto: mailto.unwrap_or_default(),
- mailto_user: mailto_user.unwrap_or_default(),
- from_address,
- author,
- comment,
- disable,
- filter: None,
- origin: None,
- },
- )
+ api::sendmail::add_endpoint(&mut config, sendmail_config)
}
/// Method: Update a sendmail endpoint.
///
/// See [`api::sendmail::update_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn update_sendmail_endpoint(
#[try_from_ref] this: &NotificationConfig,
name: &str,
- mailto: Option<Vec<String>>,
- mailto_user: Option<Vec<String>>,
- from_address: Option<String>,
- author: Option<String>,
- comment: Option<String>,
- disable: Option<bool>,
+ updater: SendmailConfigUpdater,
delete: Option<Vec<DeleteableSendmailProperty>>,
digest: Option<&str>,
) -> Result<(), HttpError> {
@@ -241,14 +212,7 @@ pub mod proxmox_rs_notify {
api::sendmail::update_endpoint(
&mut config,
name,
- SendmailConfigUpdater {
- mailto,
- mailto_user,
- from_address,
- author,
- comment,
- disable,
- },
+ updater,
delete.as_deref(),
digest.as_deref(),
)
@@ -295,39 +259,22 @@ pub mod proxmox_rs_notify {
#[export(serialize_error)]
pub fn add_gotify_endpoint(
#[try_from_ref] this: &NotificationConfig,
- name: String,
- server: String,
- token: String,
- comment: Option<String>,
- disable: Option<bool>,
+ gotify_config: GotifyConfig,
+ gotify_private_config: GotifyPrivateConfig,
) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap();
- api::gotify::add_endpoint(
- &mut config,
- GotifyConfig {
- name: name.clone(),
- server,
- comment,
- disable,
- filter: None,
- origin: None,
- },
- GotifyPrivateConfig { name, token },
- )
+ api::gotify::add_endpoint(&mut config, gotify_config, gotify_private_config)
}
/// Method: Update a 'gotify' endpoint.
///
/// See [`api::gotify::update_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn update_gotify_endpoint(
#[try_from_ref] this: &NotificationConfig,
name: &str,
- server: Option<String>,
- token: Option<String>,
- comment: Option<String>,
- disable: Option<bool>,
+ updater: GotifyConfigUpdater,
+ private_updater: GotifyPrivateConfigUpdater,
delete: Option<Vec<DeleteableGotifyProperty>>,
digest: Option<&str>,
) -> Result<(), HttpError> {
@@ -337,12 +284,8 @@ pub mod proxmox_rs_notify {
api::gotify::update_endpoint(
&mut config,
name,
- GotifyConfigUpdater {
- server,
- comment,
- disable,
- },
- GotifyPrivateConfigUpdater { token },
+ updater,
+ private_updater,
delete.as_deref(),
digest.as_deref(),
)
@@ -387,62 +330,24 @@ pub mod proxmox_rs_notify {
///
/// See [`api::smtp::add_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn add_smtp_endpoint(
#[try_from_ref] this: &NotificationConfig,
- name: String,
- server: String,
- port: Option<u16>,
- mode: Option<SmtpMode>,
- username: Option<String>,
- password: Option<String>,
- mailto: Option<Vec<String>>,
- mailto_user: Option<Vec<String>>,
- from_address: String,
- author: Option<String>,
- comment: Option<String>,
- disable: Option<bool>,
+ smtp_config: SmtpConfig,
+ smtp_private_config: SmtpPrivateConfig,
) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap();
- api::smtp::add_endpoint(
- &mut config,
- SmtpConfig {
- name: name.clone(),
- server,
- port,
- mode,
- username,
- mailto: mailto.unwrap_or_default(),
- mailto_user: mailto_user.unwrap_or_default(),
- from_address,
- author,
- comment,
- disable,
- origin: None,
- },
- SmtpPrivateConfig { name, password },
- )
+ api::smtp::add_endpoint(&mut config, smtp_config, smtp_private_config)
}
/// Method: Update an SMTP endpoint.
///
/// See [`api::smtp::update_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn update_smtp_endpoint(
#[try_from_ref] this: &NotificationConfig,
name: &str,
- server: Option<String>,
- port: Option<u16>,
- mode: Option<SmtpMode>,
- username: Option<String>,
- password: Option<String>,
- mailto: Option<Vec<String>>,
- mailto_user: Option<Vec<String>>,
- from_address: Option<String>,
- author: Option<String>,
- comment: Option<String>,
- disable: Option<bool>,
+ updater: SmtpConfigUpdater,
+ private_updater: SmtpPrivateConfigUpdater,
delete: Option<Vec<DeleteableSmtpProperty>>,
digest: Option<&str>,
) -> Result<(), HttpError> {
@@ -452,19 +357,8 @@ pub mod proxmox_rs_notify {
api::smtp::update_endpoint(
&mut config,
name,
- SmtpConfigUpdater {
- server,
- port,
- mode,
- username,
- mailto,
- mailto_user,
- from_address,
- author,
- comment,
- disable,
- },
- SmtpPrivateConfigUpdater { password },
+ updater,
+ private_updater,
delete.as_deref(),
digest.as_deref(),
)
@@ -509,7 +403,6 @@ pub mod proxmox_rs_notify {
///
/// See [`api::webhook::add_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn add_webhook_endpoint(
#[try_from_ref] this: &NotificationConfig,
endpoint_config: WebhookConfig,
@@ -522,7 +415,6 @@ pub mod proxmox_rs_notify {
///
/// See [`api::webhook::update_endpoint`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn update_webhook_endpoint(
#[try_from_ref] this: &NotificationConfig,
name: &str,
@@ -581,53 +473,22 @@ pub mod proxmox_rs_notify {
///
/// See [`api::matcher::add_matcher`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn add_matcher(
#[try_from_ref] this: &NotificationConfig,
- name: String,
- target: Option<Vec<String>>,
- match_severity: Option<Vec<SeverityMatcher>>,
- match_field: Option<Vec<FieldMatcher>>,
- match_calendar: Option<Vec<CalendarMatcher>>,
- mode: Option<MatchModeOperator>,
- invert_match: Option<bool>,
- comment: Option<String>,
- disable: Option<bool>,
+ matcher_config: MatcherConfig,
) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap();
- api::matcher::add_matcher(
- &mut config,
- MatcherConfig {
- name,
- match_severity: match_severity.unwrap_or_default(),
- match_field: match_field.unwrap_or_default(),
- match_calendar: match_calendar.unwrap_or_default(),
- target: target.unwrap_or_default(),
- mode,
- invert_match,
- comment,
- disable,
- origin: None,
- },
- )
+ api::matcher::add_matcher(&mut config, matcher_config)
}
/// Method: Update a matcher.
///
/// See [`api::matcher::update_matcher`].
#[export(serialize_error)]
- #[allow(clippy::too_many_arguments)]
pub fn update_matcher(
#[try_from_ref] this: &NotificationConfig,
name: &str,
- target: Option<Vec<String>>,
- match_severity: Option<Vec<SeverityMatcher>>,
- match_field: Option<Vec<FieldMatcher>>,
- match_calendar: Option<Vec<CalendarMatcher>>,
- mode: Option<MatchModeOperator>,
- invert_match: Option<bool>,
- comment: Option<String>,
- disable: Option<bool>,
+ updater: MatcherConfigUpdater,
delete: Option<Vec<DeleteableMatcherProperty>>,
digest: Option<&str>,
) -> Result<(), HttpError> {
@@ -637,16 +498,7 @@ pub mod proxmox_rs_notify {
api::matcher::update_matcher(
&mut config,
name,
- MatcherConfigUpdater {
- match_severity,
- match_field,
- match_calendar,
- target,
- mode,
- invert_match,
- comment,
- disable,
- },
+ updater,
delete.as_deref(),
digest.as_deref(),
)
--
2.47.3
next prev parent reply other threads:[~2026-07-09 12:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-09 11:56 [PATCH many 00/29] notifications: add nested match expressions Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 01/29] add new proxmox-match-expression crate Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 02/29] notify: promote matcher to dir-style module Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 03/29] notify: fix doc comment Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 04/29] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 05/29] notify: matcher: break out field " Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 06/29] notify: matcher: break out calendar " Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 07/29] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 08/29] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 09/29] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 10/29] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 11/29] notify: matcher: add expression support Lukas Wagner
2026-07-09 11:56 ` [PATCH proxmox 12/29] notify: api: support new expression parameter Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox 13/29] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox 14/29] notify: migrate PBS's and PVE's default matcher to expression syntax Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox 15/29] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-widget-toolkit 16/29] notification: increase matcher window width Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-widget-toolkit 17/29] notifications: matcher: add support for match expressions Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-widget-toolkit 18/29] notification: matcher: add better calendar editor Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-widget-toolkit 19/29] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-backup 20/29] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-backup 21/29] api: notification: add 'migrate-to-expression' parameter to get_matcher Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-backup 22/29] ui: notification: enable new matcher UI Lukas Wagner
2026-07-09 11:57 ` Lukas Wagner [this message]
2026-07-09 11:57 ` [PATCH proxmox-perl-rs 24/29] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-07-09 11:57 ` [PATCH proxmox-perl-rs 25/29] notify: add 'migrate_to_expression' parameter for get_matcher Lukas Wagner
2026-07-09 11:57 ` [PATCH manager 26/29] api: notification: pass config/updater directly to rust bindings Lukas Wagner
2026-07-09 11:57 ` [PATCH manager 27/29] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-07-09 11:57 ` [PATCH manager 28/29] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-07-09 11:57 ` [PATCH manager 29/29] ui: notification: enable new matcher UI 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=20260709115716.299836-24-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.