Refactoring library functions to lib

spark8t/cli/pyspark.py

@@ -4,15 +4,15 @@
 import re
 from typing import Optional
 
-from spark8t.cli.params import (
+from spark8t.lib.params import (
     add_config_arguments,
     add_logging_arguments,
     defaults,
-    get_kube_interface,
     k8s_parser,
     parse_arguments_with,
     spark_user_parser,
 )
+from spark8t.lib.process_settings import get_kube_interface
 from spark8t.domain import ServiceAccount
 from spark8t.services import K8sServiceAccountRegistry, SparkInterface
 

spark8t/cli/service_account_registry.py

@@ -4,14 +4,14 @@
 from argparse import ArgumentParser
 from enum import Enum
 
-from spark8t.cli.params import (
+from spark8t.lib.params import (
     add_config_arguments,
     add_logging_arguments,
-    get_kube_interface,
     k8s_parser,
     parse_arguments_with,
     spark_user_parser,
 )
+from spark8t.lib.process_settings import get_kube_interface
 from spark8t.domain import PropertyFile, ServiceAccount
 from spark8t.exceptions import NoAccountFound
 from spark8t.services import K8sServiceAccountRegistry, parse_conf_overrides

spark8t/cli/spark_shell.py

@@ -4,15 +4,15 @@
 import re
 from typing import Optional
 
-from spark8t.cli.params import (
+from spark8t.lib.params import (
     add_config_arguments,
     add_logging_arguments,
     defaults,
-    get_kube_interface,
     k8s_parser,
     parse_arguments_with,
     spark_user_parser,
 )
+from spark8t.lib.process_settings import get_kube_interface
 from spark8t.domain import ServiceAccount
 from spark8t.services import K8sServiceAccountRegistry, SparkInterface
 

spark8t/cli/spark_submit.py

@@ -4,16 +4,16 @@
 import re
 from typing import Optional
 
-from spark8t.cli.params import (
+from spark8t.lib.params import (
     add_config_arguments,
     add_deploy_arguments,
     add_logging_arguments,
     defaults,
-    get_kube_interface,
     k8s_parser,
     parse_arguments_with,
     spark_user_parser,
 )
+from spark8t.lib.process_settings import get_kube_interface
 from spark8t.domain import ServiceAccount
 from spark8t.services import K8sServiceAccountRegistry, SparkInterface
 

spark8t/cli/params.py → spark8t/lib/params.py

@@ -1,9 +1,6 @@
-from argparse import ArgumentParser, Namespace
+from argparse import ArgumentParser
 from typing import Callable, List, Optional
 
-from spark8t.cli import defaults
-from spark8t.services import AbstractKubeInterface, KubeInterface, LightKube
-
 
 def parse_arguments_with(
     parsers: List[Callable[[ArgumentParser], ArgumentParser]],
@@ -119,13 +116,3 @@ def add_deploy_arguments(parser: ArgumentParser) -> ArgumentParser:
         choices=["client", "cluster"],
     )
     return parser
-
-
-def get_kube_interface(args: Namespace) -> AbstractKubeInterface:
-    return (
-        LightKube(args.kubeconfig or defaults.kube_config, defaults)
-        if args.backend == "lightkube"
-        else KubeInterface(
-            args.kubeconfig or defaults.kube_config, context_name=args.context
-        )
-    )

spark8t/lib/process_settings.py

@@ -0,0 +1,15 @@
+from argparse import Namespace
+
+from spark8t.cli import defaults
+from spark8t.domain import Defaults
+from spark8t.services import AbstractKubeInterface, KubeInterface, LightKube
+
+
+def get_kube_interface(args: Namespace) -> AbstractKubeInterface:
+    return (
+        LightKube(args.kubeconfig or defaults.kube_config, defaults)
+        if args.backend == "lightkube"
+        else KubeInterface(
+            args.kubeconfig or defaults.kube_config, context_name=args.context
+        )
+    )

tests/unittest/test_argument_parsing.py

@@ -3,7 +3,7 @@
 import unittest
 from argparse import ArgumentParser
 
-from spark8t.cli.params import (
+from spark8t.lib.params import (
     add_config_arguments,
     add_deploy_arguments,
     add_logging_arguments,