Skip to content

Commit b968353

Browse files
committed
fix: init commit, remove btool from solnlib
1 parent 3d24b40 commit b968353

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

solnlib/splunkenv.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import socket
2222
from typing import List, Optional, Tuple, Union
2323
from splunk.clilib.cli_common import getAppConf
24-
from splunk.clilib.bundle_paths import make_splunkhome_path
24+
from splunk.clilib.bundle_paths import make_splunkhome_path as mksplhomepath
2525

2626
from .utils import is_true
2727

@@ -111,7 +111,7 @@ def make_splunkhome_path(parts: Union[List, Tuple]) -> str:
111111
ValueError: Escape from intended parent directories.
112112
"""
113113

114-
make_splunkhome_path(parts)
114+
return mksplhomepath(parts)
115115

116116

117117
def get_splunk_host_info() -> Tuple:
@@ -249,7 +249,7 @@ def get_conf_stanza(
249249
return stanzas[stanza]
250250

251251

252-
def get_conf_stanzas(conf_name: str, app_name: str, logger = None) -> dict:
252+
def get_conf_stanzas(conf_name: str, app_name: str, logger=None) -> dict:
253253
"""Get stanzas of `conf_name`
254254
255255
Arguments:
@@ -265,12 +265,16 @@ def get_conf_stanzas(conf_name: str, app_name: str, logger = None) -> dict:
265265
"""
266266

267267
path = make_splunkhome_path(["etc", "apps", app_name])
268-
app_conf = getAppConf(confName=conf_name, app=app_name, use_btool=False, app_path=path)
268+
app_conf = getAppConf(
269+
confName=conf_name, app=app_name, use_btool=False, app_path=path
270+
)
269271

270272
if logger:
271273
logger.info(f"akakakakakkakakakaka 21 path: {path}")
272274

273275
if logger:
274-
logger.info(f"akakakakakkakakakaka 22 app_conf={type(app_conf)} app_conf: {app_conf}")
276+
logger.info(
277+
f"akakakakakkakakakaka 22 app_conf={type(app_conf)} app_conf: {app_conf}"
278+
)
275279

276280
return app_conf

0 commit comments

Comments
 (0)