From eea3793994ce5e7a6a06f13159769db80b52399b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Aug 2023 09:55:56 +0200 Subject: [PATCH] datamodel: /local-data: refactor policy_get_tagset macro --- .../datamodel/templates/macros/local_data_macros.lua.j2 | 9 +-------- .../datamodel/templates/macros/policy_macros.lua.j2 | 4 ++++ 2 files changed, 5 insertions(+), 8 deletions(-) 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 215b175bb..c4f2768a6 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 @@ -44,9 +44,7 @@ assert(hints.add_hosts('{{ file }}').result == true) {% macro local_data_records(input_str, is_rpz, ttl, nodata, tags=none, id='rrs') -%} {{ id }} = ffi.new('struct kr_rule_zonefile_config') {{ id }}.ttl = {{ local_data_ttl(ttl) }} -{% if tags %} {{ id }}.tags = {{ policy_get_tagset(tags) }} -{% endif %} {{ id }}.nodata = {{ boolean(nodata) }} {{ id }}.is_rpz = {{ boolean(is_rpz) }} {% if is_rpz -%} @@ -60,11 +58,6 @@ assert(C.kr_rule_zonefile({{ id }})==0) {%- endmacro %} {% macro local_data_subtree_root(root, type, ttl, tags) -%} -{%- if tags -%} -{%- set get_tags = policy_get_tagset(tags) -%} -{%- else -%} -{%- set get_tags = '0' -%} -{%- endif -%} assert(C.kr_rule_local_subtree(todname('{{ root }}'), - C.KR_RULE_SUB_{{ type.upper() }}, {{ local_data_ttl(ttl) }}, {{ get_tags }}) == 0) + C.KR_RULE_SUB_{{ type.upper() }}, {{ local_data_ttl(ttl) }}, {{ policy_get_tagset(tags) }}) == 0) {%- endmacro %} diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 index 36ce102f0..347532e6b 100644 --- a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 +++ b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 @@ -49,7 +49,11 @@ policy.TAGS_ASSIGN({{ string_table(tags) }}) {%- endmacro %} {% macro policy_get_tagset(tags) -%} +{%- if tags -%} policy.get_tagset({{ string_table(tags) }}) +{%- else -%} +0 +{%- endif -%} {%- endmacro %} -- 2.47.2