feat: migrate to separate conf-parser library

This PR removes specific Splunk .conf files parser from it and reuses the library created specifically for this purpose.
splunk · Nov 16, 2021 · 2ab9fe9 · 2ab9fe9
1 parent 2b8c84c
commit 2ab9fe9
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 529 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,6 +40,7 @@ jinja2 = ">=2,<4"
 defusedxml = "^0.7.1"
 jsonschema = "^4.1.2"
 dunamai = "1.7.0"
+addonfactory-splunk-conf-parser-lib = "^0.3.3"
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2"

diff --git a/splunk_add_on_ucc_framework/app_conf.py b/splunk_add_on_ucc_framework/app_conf.py
@@ -16,7 +16,7 @@
 import time
 from typing import IO
 
-from . import conf_parser
+import addonfactory_splunk_conf_parser_lib as conf_parser
 
 
 class AppConf:

diff --git a/splunk_add_on_ucc_framework/conf_parser.py b/splunk_add_on_ucc_framework/conf_parser.py
diff --git a/splunk_add_on_ucc_framework/meta_conf.py b/splunk_add_on_ucc_framework/meta_conf.py
@@ -15,7 +15,7 @@
 #
 from typing import IO
 
-from . import conf_parser
+import addonfactory_splunk_conf_parser_lib as conf_parser
 
 DEFAULT = """
 # Application-level permissions

diff --git a/splunk_add_on_ucc_framework/modular_alert_builder/build_core/alert_actions_helper.py b/splunk_add_on_ucc_framework/modular_alert_builder/build_core/alert_actions_helper.py
@@ -19,7 +19,7 @@
 import sys
 from os import makedirs, remove
 
-from splunk_add_on_ucc_framework import conf_parser
+import addonfactory_splunk_conf_parser_lib as conf_parser
 
 from .alert_actions_merge import merge_conf_file
 

diff --git a/splunk_add_on_ucc_framework/modular_alert_builder/build_core/alert_actions_merge.py b/splunk_add_on_ucc_framework/modular_alert_builder/build_core/alert_actions_merge.py
@@ -20,7 +20,7 @@
 from os.path import basename as bn
 from shutil import copy
 
-from splunk_add_on_ucc_framework import conf_parser
+import addonfactory_splunk_conf_parser_lib as conf_parser
 
 from . import alert_actions_exceptions as aae
 from . import arf_consts as ac