From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com
Subject: [PATCH manager v3 34/39] api: notification: pass config/updater directly to rust bindings
Date: Fri, 9 Oct 2026 14:56:41 +0200 [thread overview]
Message-ID: <20261009125646.284673-35-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261009125646.284673-1-l.wagner@proxmox.com>
Instead of having to enumerate function parameters individually, pass
the entire parameter hash to the rust bindings. This reduces potential
for future errors and reduces churn when adding new parameters.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
PVE/API2/Cluster/Notifications.pm | 147 +++++-------------------------
PVE/VZDump.pm | 19 ++--
2 files changed, 33 insertions(+), 133 deletions(-)
diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm
index 8b455227..3f99de08 100644
--- a/PVE/API2/Cluster/Notifications.pm
+++ b/PVE/API2/Cluster/Notifications.pm
@@ -518,21 +518,11 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
- my $name = extract_param($param, 'name');
- my $mailto = extract_param($param, 'mailto');
- my $mailto_user = extract_param($param, 'mailto-user');
- my $from_address = extract_param($param, 'from-address');
- my $author = extract_param($param, 'author');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
-
eval {
PVE::Notify::lock_config(sub {
my $config = PVE::Notify::read_config();
- $config->add_sendmail_endpoint(
- $name, $mailto, $mailto_user, $from_address, $author, $comment, $disable,
- );
+ $config->add_sendmail_endpoint($param);
PVE::Notify::write_config($config);
});
@@ -582,13 +572,6 @@ __PACKAGE__->register_method({
my ($param) = @_;
my $name = extract_param($param, 'name');
- my $mailto = extract_param($param, 'mailto');
- my $mailto_user = extract_param($param, 'mailto-user');
- my $from_address = extract_param($param, 'from-address');
- my $author = extract_param($param, 'author');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
-
my $delete = extract_param($param, 'delete');
my $digest = extract_param($param, 'digest');
@@ -597,15 +580,7 @@ __PACKAGE__->register_method({
my $config = PVE::Notify::read_config();
$config->update_sendmail_endpoint(
- $name,
- $mailto,
- $mailto_user,
- $from_address,
- $author,
- $comment,
- $disable,
- $delete,
- $digest,
+ $name, $param, $delete, $digest,
);
PVE::Notify::write_config($config);
@@ -789,18 +764,19 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
- my $name = extract_param($param, 'name');
- my $server = extract_param($param, 'server');
my $token = extract_param($param, 'token');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
+ my $name = $param->{name};
eval {
PVE::Notify::lock_config(sub {
my $config = PVE::Notify::read_config();
$config->add_gotify_endpoint(
- $name, $server, $token, $comment, $disable,
+ $param,
+ {
+ 'name' => $name,
+ 'token' => $token,
+ },
);
PVE::Notify::write_config($config);
@@ -850,10 +826,7 @@ __PACKAGE__->register_method({
my ($param) = @_;
my $name = extract_param($param, 'name');
- my $server = extract_param($param, 'server');
my $token = extract_param($param, 'token');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
my $delete = extract_param($param, 'delete');
my $digest = extract_param($param, 'digest');
@@ -864,10 +837,10 @@ __PACKAGE__->register_method({
$config->update_gotify_endpoint(
$name,
- $server,
- $token,
- $comment,
- $disable,
+ $param,
+ {
+ token => $token,
+ },
$delete,
$digest,
);
@@ -1102,36 +1075,19 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
- my $name = extract_param($param, 'name');
- my $server = extract_param($param, 'server');
- my $port = extract_param($param, 'port');
- my $mode = extract_param($param, 'mode');
- my $username = extract_param($param, 'username');
+ my $name = $param->{name};
my $password = extract_param($param, 'password');
- my $mailto = extract_param($param, 'mailto');
- my $mailto_user = extract_param($param, 'mailto-user');
- my $from_address = extract_param($param, 'from-address');
- my $author = extract_param($param, 'author');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
eval {
PVE::Notify::lock_config(sub {
my $config = PVE::Notify::read_config();
$config->add_smtp_endpoint(
- $name,
- $server,
- $port,
- $mode,
- $username,
- $password,
- $mailto,
- $mailto_user,
- $from_address,
- $author,
- $comment,
- $disable,
+ $param,
+ {
+ name => $name,
+ password => $password,
+ },
);
PVE::Notify::write_config($config);
@@ -1182,17 +1138,7 @@ __PACKAGE__->register_method({
my ($param) = @_;
my $name = extract_param($param, 'name');
- my $server = extract_param($param, 'server');
- my $port = extract_param($param, 'port');
- my $mode = extract_param($param, 'mode');
- my $username = extract_param($param, 'username');
my $password = extract_param($param, 'password');
- my $mailto = extract_param($param, 'mailto');
- my $mailto_user = extract_param($param, 'mailto-user');
- my $from_address = extract_param($param, 'from-address');
- my $author = extract_param($param, 'author');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
my $delete = extract_param($param, 'delete');
my $digest = extract_param($param, 'digest');
@@ -1203,17 +1149,10 @@ __PACKAGE__->register_method({
$config->update_smtp_endpoint(
$name,
- $server,
- $port,
- $mode,
- $username,
- $password,
- $mailto,
- $mailto_user,
- $from_address,
- $author,
- $comment,
- $disable,
+ $param,
+ {
+ password => $password,
+ },
$delete,
$digest,
);
@@ -1705,31 +1644,11 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
- my $name = extract_param($param, 'name');
- my $match_severity = extract_param($param, 'match-severity');
- my $match_field = extract_param($param, 'match-field');
- my $match_calendar = extract_param($param, 'match-calendar');
- my $target = extract_param($param, 'target');
- my $mode = extract_param($param, 'mode');
- my $invert_match = extract_param($param, 'invert-match');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
-
eval {
PVE::Notify::lock_config(sub {
my $config = PVE::Notify::read_config();
- $config->add_matcher(
- $name,
- $target,
- $match_severity,
- $match_field,
- $match_calendar,
- $mode,
- $invert_match,
- $comment,
- $disable,
- );
+ $config->add_matcher($param);
PVE::Notify::write_config($config);
});
@@ -1770,14 +1689,6 @@ __PACKAGE__->register_method({
my ($param) = @_;
my $name = extract_param($param, 'name');
- my $match_severity = extract_param($param, 'match-severity');
- my $match_field = extract_param($param, 'match-field');
- my $match_calendar = extract_param($param, 'match-calendar');
- my $target = extract_param($param, 'target');
- my $mode = extract_param($param, 'mode');
- my $invert_match = extract_param($param, 'invert-match');
- my $comment = extract_param($param, 'comment');
- my $disable = extract_param($param, 'disable');
my $digest = extract_param($param, 'digest');
my $delete = extract_param($param, 'delete');
@@ -1786,17 +1697,7 @@ __PACKAGE__->register_method({
my $config = PVE::Notify::read_config();
$config->update_matcher(
- $name,
- $target,
- $match_severity,
- $match_field,
- $match_calendar,
- $mode,
- $invert_match,
- $comment,
- $disable,
- $delete,
- $digest,
+ $name, $param, $delete, $digest,
);
PVE::Notify::write_config($config);
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 11c5089f..01c8064d 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -557,21 +557,20 @@ sub send_notification {
# verified once the config is serialized. That means that
# we can rely on that fact that no other endpoint with this name exists.
my $endpoint_name = "<" . join(",", @$mailto) . ">";
- $notification_config->add_sendmail_endpoint(
- $endpoint_name,
- $mailto,
- undef,
- undef,
- "vzdump backup tool",
- );
+ $notification_config->add_sendmail_endpoint({
+ name => $endpoint_name,
+ mailto => $mailto,
+ author => "vzdump backup tool",
+ });
my $endpoints = [$endpoint_name];
# Add a matcher that matches all notifications, set our
# newly created target as a target.
- $notification_config->add_matcher(
- "<matcher-$endpoint_name>", $endpoints,
- );
+ $notification_config->add_matcher({
+ name => "<matcher-$endpoint_name>",
+ target => $endpoints,
+ });
PVE::Notify::notify(
$severity, "vzdump", $template_data, $fields, $notification_config,
--
2.47.3
next prev parent reply other threads:[~2026-10-09 13:04 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-09 12:56 [PATCH many v3 00/39] notifications: add nested match expressions Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 01/39] add new proxmox-match-expression crate Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 02/39] notify: log which matchers matched on a notification Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 03/39] notify: promote matcher to dir-style module Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 04/39] notify: fix doc comment Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 05/39] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 06/39] notify: matcher: break out field " Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 07/39] notify: matcher: break out calendar " Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 08/39] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 09/39] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 10/39] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 11/39] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 12/39] notify: matcher: add expression support Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 13/39] notify: api: support new expression parameter Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 14/39] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 15/39] notify: migrate PBS's and PVE's default matcher to expression syntax Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 16/39] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 17/39] notify: matcher: don't allow empty field/severity matchers Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox v3 18/39] notify: matcher: re-serialize expression on create/update Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-widget-toolkit v3 19/39] notifications: increase matcher window width Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-widget-toolkit v3 20/39] notifications: matcher: add support for match expressions Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-widget-toolkit v3 21/39] notifications: matcher: add better calendar editor Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-widget-toolkit v3 22/39] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-backup v3 23/39] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-backup v3 24/39] api: notification: add 'migrate-to-expression' parameter to get_matcher Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-backup v3 25/39] ui: notification: enable new matcher UI Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-perl-rs v3 26/39] notify: move proxmox-notify bindings from common to pve-rs Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-perl-rs v3 27/39] notify: matcher: pass matcher config / updater directly Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-perl-rs v3 28/39] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-perl-rs v3 29/39] notify: add 'migrate_to_expression' parameter for get_matcher Lukas Wagner
2026-10-09 12:56 ` [PATCH pve-cluster v3 30/39] notify: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-09 12:56 ` [PATCH pve-cluster v3 31/39] cluster: move pvecfg node version helpers from qemu-server Lukas Wagner
2026-10-09 12:56 ` [PATCH common v3 32/39] tools: move version_cmp() helper " Lukas Wagner
2026-10-09 12:56 ` [PATCH manager v3 33/39] vzdump: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-09 12:56 ` Lukas Wagner [this message]
2026-10-09 12:56 ` [PATCH manager v3 35/39] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-10-09 12:56 ` [PATCH manager v3 36/39] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-10-09 12:56 ` [PATCH manager v3 37/39] ui: notification: enable new matcher UI Lukas Wagner
2026-10-09 12:56 ` [PATCH manager v3 38/39] api: notification: reject matchers with expression if not supported by all nodes Lukas Wagner
2026-10-09 12:56 ` [PATCH proxmox-mail-forward v3 39/39] 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=20261009125646.284673-35-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox