manager: datamodel: policy: forward-tls action removed

- ForwardServerSchema moved to policy_schema module

diff --git a/manager/knot_resolver_manager/datamodel/forward_zone_schema.py b/manager/knot_resolver_manager/datamodel/forward_zone_schema.py
index defb13daaaa795f8a7fb98cc0304401eaf64b286..2bc1539df151c3c96e2ca88b080c5cea7677f4ad 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/forward_zone_schema.py
+++ b/manager/knot_resolver_manager/datamodel/forward_zone_schema.py
@@ -1,26 +1,10 @@
 from typing import List, Optional, Union
 
-from knot_resolver_manager.datamodel.types import CheckedPath, DomainName, IPAddressOptionalPort, PolicyFlagEnum
+from knot_resolver_manager.datamodel.policy_schema import ForwardServerSchema
+from knot_resolver_manager.datamodel.types import IPAddressOptionalPort, PolicyFlagEnum
 from knot_resolver_manager.utils import SchemaNode
 
 
-class ForwardServerSchema(SchemaNode):
-    """
-    Configuration of Forward server.
-
-    ---
-    address: IP address of Forward server.
-    pin_sha256: Hash of accepted CA certificate.
-    hostname: Hostname of the Forward server.
-    ca_file: Path to CA certificate file.
-    """
-
-    address: IPAddressOptionalPort
-    pin_sha256: Optional[Union[str, List[str]]] = None
-    hostname: Optional[DomainName] = None
-    ca_file: Optional[CheckedPath] = None
-
-
 class ForwardZoneSchema(SchemaNode):
     """
     Configuration of Forward Zone.

diff --git a/manager/knot_resolver_manager/datamodel/policy_schema.py b/manager/knot_resolver_manager/datamodel/policy_schema.py
index 83379128e1897ed5ede6fdca6580a2e4dbe194b3..6f9b46cf2223673d7f46a0b8fb6553918a6e4ee1 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/policy_schema.py
+++ b/manager/knot_resolver_manager/datamodel/policy_schema.py
@@ -2,7 +2,9 @@ from typing import List, Optional, Union
 
 from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema
 from knot_resolver_manager.datamodel.types import (
+    CheckedPath,
     DNSRecordTypeEnum,
+    DomainName,
     IPAddressOptionalPort,
     PolicyActionEnum,
     PolicyFlagEnum,
@@ -44,7 +46,20 @@ class AnswerSchema(SchemaNode):
 
 
 class ForwardServerSchema(SchemaNode):
-    pass
+    """
+    Configuration of Forward server.
+
+    ---
+    address: IP address of Forward server.
+    pin_sha256: Hash of accepted CA certificate.
+    hostname: Hostname of the Forward server.
+    ca_file: Path to CA certificate file.
+    """
+
+    address: IPAddressOptionalPort
+    pin_sha256: Optional[Union[str, List[str]]] = None
+    hostname: Optional[DomainName] = None
+    ca_file: Optional[CheckedPath] = None
 
 
 class PolicySchema(SchemaNode):
@@ -60,7 +75,7 @@ class PolicySchema(SchemaNode):
     message: Deny message for 'deny' action.
     reroute: Configuration for 'reroute' action.
     answer: Answer definition for 'answer' action.
-    servers: Servers configuration for 'mirror', 'forward', 'forward-tls' and 'stub' action.
+    servers: Servers configuration for 'mirror', 'forward' and 'stub' action.
     """
 
     action: PolicyActionEnum
@@ -74,7 +89,7 @@ class PolicySchema(SchemaNode):
     servers: Optional[Union[List[IPAddressOptionalPort], List[ForwardServerSchema]]] = None
 
     def _validate(self) -> None:
-        servers = ["mirror", "forward", "forward-tls", "stub"]
+        servers = ["mirror", "forward", "stub"]
 
         def _field(action: str) -> str:
             if action in servers:

diff --git a/manager/knot_resolver_manager/datamodel/types/enums.py b/manager/knot_resolver_manager/datamodel/types/enums.py
index 292be734a84f2d56426c420233b943bcf3fbe5f3..cd45e1d603be9861e1f25349f34138217b14b5db 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/types/enums.py
+++ b/manager/knot_resolver_manager/datamodel/types/enums.py
@@ -13,7 +13,6 @@ PolicyActionEnum = Literal[
     # Chain actions
     "mirror",
     "forward",
-    "forward-tls",
     "stub",
     "debug-always",
     "debug-cache-miss",

diff --git a/manager/tests/unit/datamodel/test_policy_schema.py b/manager/tests/unit/datamodel/test_policy_schema.py
index e2acd529c2351847aaeaff94f5ff1f94a2d14038..34cc4e57ec1ecff995351989716f19b32e218b6e 100644 (file)
--- a/manager/tests/unit/datamodel/test_policy_schema.py
+++ b/manager/tests/unit/datamodel/test_policy_schema.py
@@ -18,7 +18,7 @@ noconfig_actions = [
     "qtrace",
     "reqtrace",
 ]
-configurable_actions = ["deny", "reroute", "answer", "mirror", "forward", "forward-tls", "stub"]
+configurable_actions = ["deny", "reroute", "answer", "mirror", "forward", "stub"]
 policy_actions = get_generic_type_arguments(PolicyActionEnum)
 
 
@@ -47,7 +47,6 @@ def test_action_invalid(val: Dict[str, Any]):
         {"action": "answer", "answer": {"rtype": "AAAA", "rdata": "192.0.2.7"}},
         {"action": "mirror", "servers": ["192.0.2.1@5353", "2001:148f:ffff::1"]},
         {"action": "forward", "servers": ["192.0.2.1@5353", "2001:148f:ffff::1"]},
-        {"action": "forward-tls", "servers": ["192.0.2.1@5353", "2001:148f:ffff::1"]},
         {"action": "stub", "servers": ["192.0.2.1@5353", "2001:148f:ffff::1"]},
     ],
 )