metaconfig/named: fix validation of logging channels in categories

Fixes #1784
quattor · Dec 11, 2024 · 94c00a9 · 94c00a9
1 parent 124f057
commit 94c00a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan
@@ -7,10 +7,11 @@ declaration template metaconfig/named/schema;
 
 include 'pan/types';
 
-type named_acl_name = string with
-    exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/acls/" + SELF) ||
-    match (SELF, "^(none|localhost|any|localnets)$") ||
-    error ("ACL with name " + SELF + " is not defined");
+type named_acl_name = string with exists (
+    format("/software/components/metaconfig/services/{/etc/named.conf}/contents/acls/", SELF)) || match (
+    SELF, "^(none|localhost|any|localnets)$") || error (
+    "ACL with name %s is not defined", SELF
+);
 
 type named_source = {
     "ip" ? type_ip
@@ -95,9 +96,10 @@ type named_zone = {
     true;
 };
 
-type named_channel_name = string with
-    exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/" + SELF) ||
-    error (SELF + " doesn't refer to a logging channel");
+type named_channel_name = string with exists (
+    format("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/channels/%s", SELF)) || error (
+    "%s doesn't refer to a logging channel", SELF,
+);
 
 @{
     Named log parameters

diff --git a/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan b/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan
@@ -6,8 +6,11 @@ prefix "/software/components/metaconfig/services/{/etc/named.conf}/contents";
 
 "logging/channels/default_debug" = dict (
     "severity", "dynamic",
-    "file", "data/named.run");
-"logging/category" = dict();
+    "file", "data/named.run"
+);
+"logging/category" = dict(
+    "queries", list("default_debug"),
+);
 "includes" = append("/etc/named.rfc1912.zones");
 "includes" = append("/etc/another.conf");