Merge branch 'develop' into feat/proxy-component

splunk · Dec 13, 2024 · d2bfe29 · d2bfe29
2 parents 2d6ac73 + 78e5d7a
commit d2bfe29
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/splunk_add_on_ucc_framework/templates/oauth.template b/splunk_add_on_ucc_framework/templates/oauth.template
@@ -23,6 +23,7 @@ logger = log.Logs().get_logger('{{app_name|lower}}_rh_oauth2_token')
 # Map for available proxy type
 _PROXY_TYPE_MAP = {
     'http': socks.PROXY_TYPE_HTTP,
+    # comment the below line if your add-on is not compatible with 'http_no_tunnel' protocol
     'http_no_tunnel': socks.PROXY_TYPE_HTTP_NO_TUNNEL,
     'socks4': socks.PROXY_TYPE_SOCKS4,
     'socks5': socks.PROXY_TYPE_SOCKS5,
@@ -40,7 +41,7 @@ class {{app_name | lower}}_rh_oauth2_token(admin.MConfigHandler):
     """
 
     def __init__(self, *args, **kwargs):
-        super().__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         session_key = self.getSessionKey()
         log_level = conf_manager.get_log_level(
             logger=logger,
@@ -50,7 +51,7 @@ class {{app_name | lower}}_rh_oauth2_token(admin.MConfigHandler):
             log_stanza="{{log_stanza}}",
             log_level_field="{{log_level_field}}"
         )
-        logger.set_level(log_level)
+        log.Logs().set_level(log_level)
 
     def setup(self):
         if self.requestedAction == admin.ACTION_EDIT:

diff --git a/...put_global_config_configuration/Splunk_TA_UCCExample/bin/splunk_ta_uccexample_rh_oauth.py b/...put_global_config_configuration/Splunk_TA_UCCExample/bin/splunk_ta_uccexample_rh_oauth.py
@@ -23,6 +23,7 @@
 # Map for available proxy type
 _PROXY_TYPE_MAP = {
     'http': socks.PROXY_TYPE_HTTP,
+    # comment the below line if your add-on is not compatible with 'http_no_tunnel' protocol
     'http_no_tunnel': socks.PROXY_TYPE_HTTP_NO_TUNNEL,
     'socks4': socks.PROXY_TYPE_SOCKS4,
     'socks5': socks.PROXY_TYPE_SOCKS5,
@@ -40,7 +41,7 @@ class splunk_ta_uccexample_rh_oauth2_token(admin.MConfigHandler):
     """
 
     def __init__(self, *args, **kwargs):
-        super().__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         session_key = self.getSessionKey()
         log_level = conf_manager.get_log_level(
             logger=logger,
@@ -50,7 +51,7 @@ def __init__(self, *args, **kwargs):
             log_stanza="logging",
             log_level_field="loglevel"
         )
-        logger.set_level(log_level)
+        log.Logs().set_level(log_level)
 
     def setup(self):
         if self.requestedAction == admin.ACTION_EDIT:

diff --git a/...output_global_config_everything/Splunk_TA_UCCExample/bin/splunk_ta_uccexample_rh_oauth.py b/...output_global_config_everything/Splunk_TA_UCCExample/bin/splunk_ta_uccexample_rh_oauth.py
@@ -23,6 +23,7 @@
 # Map for available proxy type
 _PROXY_TYPE_MAP = {
     'http': socks.PROXY_TYPE_HTTP,
+    # comment the below line if your add-on is not compatible with 'http_no_tunnel' protocol
     'http_no_tunnel': socks.PROXY_TYPE_HTTP_NO_TUNNEL,
     'socks4': socks.PROXY_TYPE_SOCKS4,
     'socks5': socks.PROXY_TYPE_SOCKS5,
@@ -40,7 +41,7 @@ class splunk_ta_uccexample_rh_oauth2_token(admin.MConfigHandler):
     """
 
     def __init__(self, *args, **kwargs):
-        super().__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         session_key = self.getSessionKey()
         log_level = conf_manager.get_log_level(
             logger=logger,
@@ -50,7 +51,7 @@ def __init__(self, *args, **kwargs):
             log_stanza="logging",
             log_level_field="loglevel"
         )
-        logger.set_level(log_level)
+        log.Logs().set_level(log_level)
 
     def setup(self):
         if self.requestedAction == admin.ACTION_EDIT:

diff --git a/tests/testdata/test_addons/package_global_config_everything/package/lib/requirements.txt b/tests/testdata/test_addons/package_global_config_everything/package/lib/requirements.txt
@@ -1 +1,2 @@
 splunktaucclib
+httplib2