From: Vasek Sraier <git@vakabus.cz>
Date: Sat, 4 Dec 2021 14:59:42 +0000 (+0100)
Subject: Revert "utils: modelling: replace '_' with '-' in dict key"
X-Git-Tag: v6.0.0a1~69^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a333085a984d1dcfadc34df2e62880fd10f5a22;p=thirdparty%2Fknot-resolver.git

Revert "utils: modelling: replace '_' with '-' in dict key"

This reverts commit f4ef21ef7269db92c681923f0629f21725d5a8f4.
---

diff --git a/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2
index d9f3c5a64..c2ada9dff 100644
--- a/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2
@@ -5,7 +5,7 @@
 {% if zone.views %}
 {% for view_id in zone.views %}
 -- stub-zone: {{ name }} view: {{ view_id }}
-{% set view = cfg.views[view_id] %}
+{% set view = cfg.views[view_id.replace("-", "_")] %}
 
 {% set options = none %}
 {% if zone.options and view.options %}
diff --git a/manager/knot_resolver_manager/utils/modelling.py b/manager/knot_resolver_manager/utils/modelling.py
index e86f1f6e6..ddc5adb1e 100644
--- a/manager/knot_resolver_manager/utils/modelling.py
+++ b/manager/knot_resolver_manager/utils/modelling.py
@@ -278,14 +278,12 @@ def _validated_object_type(
     elif is_dict(cls):
         key_type, val_type = get_generic_type_arguments(cls)
         try:
-            d: Dict[Any, Any] = {}
-            for key, val in obj.items():
-                k: str = str(key).replace("_", "-")
-
-                d[_validated_object_type(key_type, k, object_path=f"{object_path} @ key {k}")] = _validated_object_type(
-                    val_type, val, object_path=f"{object_path} @ value for key {k}"
+            return {
+                _validated_object_type(key_type, key, object_path=f"{object_path} @ key {key}"): _validated_object_type(
+                    val_type, val, object_path=f"{object_path} @ value for key {key}"
                 )
-            return d
+                for key, val in obj.items()
+            }
         except AttributeError as e:
             raise SchemaException(
                 f"Expected dict-like object, but failed to access its .items() method. Value was {obj}", object_path