From: Vasek Sraier <git@vakabus.cz>
Date: Mon, 26 Sep 2022 11:11:39 +0000 (+0200)
Subject: kresctl: fix typing annotations for old python
X-Git-Tag: v6.0.0a1~12^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff479a0e90001425a09db0cd7f97bee02cd90ec4;p=thirdparty%2Fknot-resolver.git

kresctl: fix typing annotations for old python
---

diff --git a/manager/knot_resolver_manager/cli/cmd/completion.py b/manager/knot_resolver_manager/cli/cmd/completion.py
index 751c6e61c..3dc563112 100644
--- a/manager/knot_resolver_manager/cli/cmd/completion.py
+++ b/manager/knot_resolver_manager/cli/cmd/completion.py
@@ -19,7 +19,7 @@ class CompletionCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         completion = subparser.add_parser("completion", help="commands auto-completion")
 
diff --git a/manager/knot_resolver_manager/cli/cmd/config.py b/manager/knot_resolver_manager/cli/cmd/config.py
index 30b7803f3..415db1364 100644
--- a/manager/knot_resolver_manager/cli/cmd/config.py
+++ b/manager/knot_resolver_manager/cli/cmd/config.py
@@ -51,7 +51,7 @@ class ConfigCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         config = subparser.add_parser("config", help="change configuration of a running resolver")
         config.add_argument(
diff --git a/manager/knot_resolver_manager/cli/cmd/convert.py b/manager/knot_resolver_manager/cli/cmd/convert.py
index 2497c0b57..ae8603612 100644
--- a/manager/knot_resolver_manager/cli/cmd/convert.py
+++ b/manager/knot_resolver_manager/cli/cmd/convert.py
@@ -16,7 +16,7 @@ class ConvertCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         convert = subparser.add_parser("convert", help="convert JSON/YAML configuration to Lua script")
         convert.add_argument(
diff --git a/manager/knot_resolver_manager/cli/cmd/exit.py b/manager/knot_resolver_manager/cli/cmd/exit.py
index 21c66def8..f3a0e4050 100644
--- a/manager/knot_resolver_manager/cli/cmd/exit.py
+++ b/manager/knot_resolver_manager/cli/cmd/exit.py
@@ -19,7 +19,7 @@ class ExitCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         stop = subparser.add_parser("exit", help="exit kresctl")
         return stop, ExitCommand
diff --git a/manager/knot_resolver_manager/cli/cmd/metrics.py b/manager/knot_resolver_manager/cli/cmd/metrics.py
index 27808fa96..6e74b4522 100644
--- a/manager/knot_resolver_manager/cli/cmd/metrics.py
+++ b/manager/knot_resolver_manager/cli/cmd/metrics.py
@@ -14,7 +14,7 @@ class MetricsCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         metrics = subparser.add_parser("metrics", help="get prometheus metrics data")
         metrics.add_argument("file", help="optional, file to export metrics to", nargs="?", default=None)
diff --git a/manager/knot_resolver_manager/cli/cmd/schema.py b/manager/knot_resolver_manager/cli/cmd/schema.py
index d74668a71..7f4f63fae 100644
--- a/manager/knot_resolver_manager/cli/cmd/schema.py
+++ b/manager/knot_resolver_manager/cli/cmd/schema.py
@@ -1,8 +1,9 @@
 import argparse
+import json
 from typing import List, Optional, Tuple, Type
 
 from knot_resolver_manager.cli.command import Command, CommandArgs, register_command
-from knot_resolver_manager.utils.requests import request
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 
 
 @register_command
@@ -14,9 +15,9 @@ class SchemaCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
-        schema = subparser.add_parser("schema", help="get JSON schema reprezentation of the configuration")
+        schema = subparser.add_parser("schema", help="get JSON schema representation of the configuration")
         schema.add_argument("file", help="optional, file to export JSON schema to", nargs="?", default=None)
         return schema, SchemaCommand
 
@@ -25,11 +26,10 @@ class SchemaCommand(Command):
         return []
 
     def run(self, args: CommandArgs) -> None:
-        url = f"{args.socket}/schema"
-        response = request("GET", url)
+        schema = json.dumps(KresConfig.json_schema(), indent=4)
 
-        if self.file and response.status == 200:
+        if self.file:
             with open(self.file, "w") as f:
-                f.write(response.body)
+                f.write(schema)
         else:
-            print(response)
+            print(schema)
diff --git a/manager/knot_resolver_manager/cli/cmd/stop.py b/manager/knot_resolver_manager/cli/cmd/stop.py
index db96d0bda..9d46d9781 100644
--- a/manager/knot_resolver_manager/cli/cmd/stop.py
+++ b/manager/knot_resolver_manager/cli/cmd/stop.py
@@ -21,7 +21,7 @@ class StopCommand(Command):
 
     @staticmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         stop = subparser.add_parser("stop", help="shutdown everything")
         return stop, StopCommand
diff --git a/manager/knot_resolver_manager/cli/command.py b/manager/knot_resolver_manager/cli/command.py
index c5d7d0374..c3189485c 100644
--- a/manager/knot_resolver_manager/cli/command.py
+++ b/manager/knot_resolver_manager/cli/command.py
@@ -38,7 +38,7 @@ class Command(ABC):
     @staticmethod
     @abstractmethod
     def register_args_subparser(
-        subparser: argparse._SubParsersAction[argparse.ArgumentParser],
+        subparser: "argparse._SubParsersAction[argparse.ArgumentParser]",
     ) -> Tuple[argparse.ArgumentParser, "Type[Command]"]:
         raise NotImplementedError()