public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox v2 21/63] notify: config: pass builtins explicitly when parsing section config
Date: Wed, 18 Nov 2026 10:43:05 +0100	[thread overview]
Message-ID: <20261118094348.273646-22-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261118094348.273646-1-l.wagner@proxmox.com>

Instead of passing &Context just for calling default_config, we pass
the section config data directly as an option. This makes the code a bit
less awkward in tests, where we don't care about builtins.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 proxmox-notify/src/api/matcher.rs | 12 ++----
 proxmox-notify/src/api/mod.rs     |  5 +--
 proxmox-notify/src/config.rs      | 64 +++++++++++++++----------------
 3 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/proxmox-notify/src/api/matcher.rs b/proxmox-notify/src/api/matcher.rs
index 65ceb1dc7..f8bc06a9a 100644
--- a/proxmox-notify/src/api/matcher.rs
+++ b/proxmox-notify/src/api/matcher.rs
@@ -210,17 +210,14 @@ mod tests {
 
     use super::*;
 
-    use crate::{api_types::expression::NotificationMatcher, context::test::test_context};
+    use crate::api_types::expression::NotificationMatcher;
 
     fn empty_config() -> Config {
-        let context = test_context();
-        Config::parse_section_config(&context, "", "").unwrap()
+        Config::parse_section_config("", "", None).unwrap()
     }
 
     fn config_with_two_matchers() -> Config {
-        let context = test_context();
         Config::parse_section_config(
-            &context,
             "
 sendmail: foo
     mailto test@example.com
@@ -230,6 +227,7 @@ matcher: matcher1
 matcher: matcher2
 ",
             "",
+            None,
         )
         .unwrap()
     }
@@ -502,9 +500,7 @@ matcher: matcher2
         // The normalized expression should stay the same after
         // a read/write cycle of the config
         let (raw_config, raw_private_config) = config.to_section_config().unwrap();
-        let context = test_context();
-        let config =
-            Config::parse_section_config(&context, &raw_config, &raw_private_config).unwrap();
+        let config = Config::parse_section_config(&raw_config, &raw_private_config, None).unwrap();
         let matcher = get_matcher(&config, "matcher1")?;
 
         assert_eq!(matcher.expression, Some(stored));
diff --git a/proxmox-notify/src/api/mod.rs b/proxmox-notify/src/api/mod.rs
index b70c32df8..43e448bc9 100644
--- a/proxmox-notify/src/api/mod.rs
+++ b/proxmox-notify/src/api/mod.rs
@@ -221,12 +221,11 @@ fn remove_private_config_entry(config: &mut Config, name: &str) -> Result<(), Ht
 
 #[cfg(test)]
 mod test_helpers {
-    use crate::{Config, context::test};
+    use crate::Config;
 
     #[allow(unused)]
     pub fn empty_config() -> Config {
-        let context = test::test_context();
-        Config::parse_section_config(&context, "", "").unwrap()
+        Config::parse_section_config("", "", None).unwrap()
     }
 }
 
diff --git a/proxmox-notify/src/config.rs b/proxmox-notify/src/config.rs
index 8c7c84cc8..f59da9bdd 100644
--- a/proxmox-notify/src/config.rs
+++ b/proxmox-notify/src/config.rs
@@ -6,12 +6,12 @@ use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlug
 use serde_json::Value;
 use tracing::error;
 
+use crate::Error;
 use crate::api_types::{
     BACKEND_NAME_SCHEMA, GOTIFY_TYPENAME, GotifyConfig, GotifyPrivateConfig, MATCHER_TYPENAME,
     MatcherConfig, SENDMAIL_TYPENAME, SMTP_TYPENAME, SendmailConfig, SmtpConfig, SmtpPrivateConfig,
     WEBHOOK_TYPENAME, WebhookConfig, WebhookPrivateConfig,
 };
-use crate::{Context, Error};
 
 /// Section config schema for the public config file.
 pub fn config_parser() -> &'static SectionConfig {
@@ -139,51 +139,47 @@ pub struct Config {
 impl Config {
     /// Parse notification configuration from section config format.
     pub fn parse_section_config(
-        context: &Context,
         raw_config: &str,
         raw_private_config: &str,
+        builtin_config: Option<&SectionConfigData>,
     ) -> Result<Self, Error> {
         let (mut config, digest) = parse_config(raw_config)?;
         let (private_config, _) = parse_private_config(raw_private_config)?;
 
-        let default_config = context.default_config();
+        if let Some(builtin_config) = builtin_config {
+            for (key, (builtin_typename, builtin_value)) in &builtin_config.sections {
+                if let Some((typename, value)) = config.sections.get_mut(key) {
+                    if builtin_typename == typename && value == builtin_value {
+                        // Entry is built-in and the config entry section in notifications.cfg
+                        // is exactly the same.
+                        if let Some(obj) = value.as_object_mut() {
+                            obj.insert("origin".to_string(), Value::String("builtin".into()));
+                        } else {
+                            error!("section config entry is not an object. This should not happen");
+                        }
+                    } else {
+                        // Entry is built-in, but it has been modified by the user.
+                        if let Some(obj) = value.as_object_mut() {
+                            obj.insert(
+                                "origin".to_string(),
+                                Value::String("modified-builtin".into()),
+                            );
+                        } else {
+                            error!("section config entry is not an object. This should not happen");
+                        }
+                    }
+                } else {
+                    let mut val = builtin_value.clone();
 
-        let builtin_config = config_parser()
-            .parse("<builtin>", default_config)
-            .map_err(|err| Error::ConfigDeserialization(err.into()))?;
-
-        for (key, (builtin_typename, builtin_value)) in &builtin_config.sections {
-            if let Some((typename, value)) = config.sections.get_mut(key) {
-                if builtin_typename == typename && value == builtin_value {
-                    // Entry is built-in and the config entry section in notifications.cfg
-                    // is exactly the same.
-                    if let Some(obj) = value.as_object_mut() {
+                    if let Some(obj) = val.as_object_mut() {
                         obj.insert("origin".to_string(), Value::String("builtin".into()));
                     } else {
                         error!("section config entry is not an object. This should not happen");
                     }
-                } else {
-                    // Entry is built-in, but it has been modified by the user.
-                    if let Some(obj) = value.as_object_mut() {
-                        obj.insert(
-                            "origin".to_string(),
-                            Value::String("modified-builtin".into()),
-                        );
-                    } else {
-                        error!("section config entry is not an object. This should not happen");
-                    }
+                    config
+                        .set_data(key, builtin_typename, val)
+                        .map_err(|err| Error::ConfigDeserialization(err.into()))?;
                 }
-            } else {
-                let mut val = builtin_value.clone();
-
-                if let Some(obj) = val.as_object_mut() {
-                    obj.insert("origin".to_string(), Value::String("builtin".into()));
-                } else {
-                    error!("section config entry is not an object. This should not happen");
-                }
-                config
-                    .set_data(key, builtin_typename, val)
-                    .map_err(|err| Error::ConfigDeserialization(err.into()))?;
             }
         }
 
-- 
2.47.3





  parent reply	other threads:[~2026-11-18  9:47 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18  9:42 [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 01/63] notify: disallow `unsafe` code Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 02/63] notify: refactor error type Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 03/63] notify: move `Endpoint` trait to endpoint module as pub(crate) Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 04/63] notify: use ConfigDigest instead of raw byte arrays Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 05/63] notify: remove static context and pass context as parameter Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 06/63] notify: matcher: drop unused field matcher verifiers Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 07/63] notify: introduce 'send-impl', 'api-impl' and 'api-types' features Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 08/63] notify: matcher: make matcher validation methods public Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 09/63] notify: matcher: stub CalendarMatcher::matches on wasm32 Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 10/63] notify: make SendmailEndpoint and SmtpEndpoint private types Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 11/63] notify: move `send`, `test_target` and `Bus` to new `send` module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 12/63] notify: move Origin type to api_types module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 13/63] notify: move Target " Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 14/63] notify: move Config to config module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 15/63] notify: move Notification and sub-types to `notification` module Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 16/63] notify: move schema module to api_types Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 17/63] notify: move check_matches from api_types::matcher to send::Bus Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 18/63] notify: move TemplateSource to context module Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 19/63] notify: config: cleanup helper names and visibility Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 20/63] notify: config: rename section config parser/writer methods Lukas Wagner
2026-11-18  9:43 ` Lukas Wagner [this message]
2026-11-18  9:43 ` [PATCH proxmox v2 22/63] notify: implement PartialEq for all Config types Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 23/63] notify: use typed SectionConfigData Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 24/63] notify: api: api types: rename Deleteable* -> Deletable* Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 25/63] notify: context: parse builtin config only once Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 26/63] notify: context: parse proxy config in trait impl, not at the callsite Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 27/63] notify: gate sub-modules with the appropriate feature flags Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 28/63] notify: fold mail-forwarder feature into send-impl Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 29/63] notify: forwarded mails: don't hardcode severity and metadata fields Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 30/63] notify: don't pass uid when instantiating forwarded mail notifications Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 31/63] notify: derive PartialEq for Notification type Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 32/63] notify: add getters for severity and fields on " Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 33/63] notify: add test suite for " Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 34/63] notify: serialize raw, forwarded mail content as base64 Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 35/63] notify: unify code paths for legacy-sendmail and regular notifications Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 36/63] notify: add backwards-compat note to Notification type Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 37/63] notify: remove 'test_target' API Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 38/63] notify: replace notification instantiation with builder pattern Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 39/63] notify: add send receipts Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 40/63] notify: make sure that template name matches SAFE_ID_REGEX Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 41/63] notify: implement notification queue submitter Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 42/63] notify: context: add read_config Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 43/63] notify: queue: add queue consumer Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 44/63] notify: queue: add worker task Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 45/63] notifications: don't ignore verification errors in legacy-sendmail mode Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 46/63] notifications: adapt to proxmox-notify API changes Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 47/63] api: notification: send test notification via proxmox_notify::send Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 48/63] notifications: send all notifications via proxmox-notify's queue Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-perl-rs v2 49/63] pve: notify: adapt to changes in the public API of proxmox-notify Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-perl-rs v2 50/63] pve: notify: add `PVE::RS::Notify::enqueue` method Lukas Wagner
2026-11-18  9:43 ` [PATCH pve-cluster v2 51/63] notify: send notifications via notification queue Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 52/63] vzdump: send legacy-sendmail notifications via simplified API Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 53/63] debian: create notification queue directory via tmpfiles Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 54/63] debian: add 'pve-notify-worker' as dependecy Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 55/63] api: services: add 'pve-notify-worker' as known service Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 56/63] services: request pve-notify-worker.service via Wants Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 57/63] forward mails via notification queue Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 58/63] use return code to signal permanent or temporary failure Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 59/63] limit size of mail read from stdin Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 60/63] cargo: move mail forwarder into a workspace member crate Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 61/63] add crate for code shared between the mail-forwarder and the worker Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 62/63] add pve-notify-worker crate and package Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 63/63] debian: add versioned break for pve-manager and proxmox-backup-server Lukas Wagner
2026-11-18 21:44 ` [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Thomas Lamprecht
2026-11-19 10:45   ` 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=20261118094348.273646-22-l.wagner@proxmox.com \
    --to=l.wagner@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