From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 13 Aug 2024 12:15:29 +0000 (+0200)
Subject: rec: better error message in case of syntax errors in defaults defined in table.py
X-Git-Tag: rec-5.2.0-alpha1~128^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64b29e502a1d99a6f85881a0c8ed23c768f8ffcc;p=thirdparty%2Fpdns.git

rec: better error message in case of syntax errors in defaults defined in table.py
---

diff --git a/pdns/recursordist/settings/generate.py b/pdns/recursordist/settings/generate.py
index f6d85ea483..e8c2a141e4 100644
--- a/pdns/recursordist/settings/generate.py
+++ b/pdns/recursordist/settings/generate.py
@@ -405,7 +405,8 @@ def gen_rust_vec_default_functions(name, typeName, defvalue):
     """Generate Rust code for the default handling of a vector for typeName"""
     ret = f'// DEFAULT HANDLING for {name}\n'
     ret += f'fn default_value_{name}() -> Vec<recsettings::{typeName}> {{\n'
-    ret += f'    let deserialized: Vec<recsettings::{typeName}> = serde_yaml::from_str({quote(defvalue)}).unwrap();\n'
+    ret += f'    let msg = "default value defined for `{name}\' should be valid YAML";'
+    ret += f'    let deserialized: Vec<recsettings::{typeName}> = serde_yaml::from_str({quote(defvalue)}).expect(&msg);\n'
     ret += f'    deserialized\n'
     ret += '}\n'
     ret += f'fn default_value_equal_{name}(value: &Vec<recsettings::{typeName}>)'