From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 15 Jun 2023 09:31:57 +0000 (+0200)
Subject: manager /local-data/addresses*: be stricter about errors
X-Git-Tag: v6.0.1~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa780e22bba1c7ed95ecf56e6f5e696a9ca996f9;p=thirdparty%2Fknot-resolver.git

manager /local-data/addresses*: be stricter about errors

In versions before 6.x these errors intentionally didn't cause
the startup fail, but I think we can be more strict now.
---

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
index 27064d736..c3104b7de 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
@@ -20,14 +20,14 @@ hints.root_file('{{ file }}')
 
 {% macro local_data_addresses(pairs) -%}
 {% for name, address in pairs.items() %}
-hints['{{ name }}'] = '{{ address }}'
+assert(hints.set('{{ name }} {{ address }}').result == true)
 {% endfor %}
 {%- endmacro %}
 
 
 {% macro local_data_addresses_files(files) -%}
 {% for file in files %}
-hints.add_hosts('{{ file }}')
+assert(hints.add_hosts('{{ file }}').result == true)
 {% endfor %}
 {%- endmacro %}