Merge !1435: datamodel: local-data: allow list of addresses

CZ-NIC · Aug 3, 2023 · b3c95f9 · b3c95f9
2 parents 85bbd2a + b28f6bb
commit b3c95f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manager/knot_resolver_manager/datamodel/local_data_schema.py b/manager/knot_resolver_manager/datamodel/local_data_schema.py
@@ -83,7 +83,7 @@ class LocalDataSchema(ConfigSchema):
     nodata: bool = True
     root_fallback_addresses: Optional[Dict[DomainName, ListOrItem[IPAddress]]] = None
     root_fallback_addresses_files: Optional[List[File]] = None
-    addresses: Optional[Dict[DomainName, IPAddress]] = None
+    addresses: Optional[Dict[DomainName, ListOrItem[IPAddress]]] = None
     addresses_files: Optional[List[File]] = None
     records: Optional[EscapedStr] = None
     subtrees: Optional[List[SubtreeSchema]] = None

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
@@ -19,9 +19,11 @@ hints.root_file('{{ file }}')
 
 
 {% macro local_data_addresses(pairs) -%}
-{% for name, address in pairs.items() %}
+{%- for name, addresses in pairs.items() -%}
+{% for address in addresses %}
 assert(hints.set('{{ name }} {{ address }}').result == true)
 {% endfor %}
+{%- endfor -%}
 {%- endmacro %}