Merge pull request #222 from Helene/fix_yaml_parser

Fix parsing file name properly in configgenerator

Author: Helene

source/confgenerator.py

@@ -86,8 +86,12 @@ def generate_config(self):
                            "insecure_skip_verify": True}
                     scrape_job["tls_config"] = tls
                 if self.attr.get('enabled', False):
-                    basic_auth = {"username": self.attr.get('username'),
-                                  "password": self.attr.get('password')}
+                    basic_auth = {"username": self.attr.get('username')}
+                    if os.path.isfile(self.attr.get('password')):
+                        pw = {"password_file": self.attr.get('password')}
+                    else:
+                        pw = {"password": self.attr.get('password')}
+                    basic_auth.update(pw)
                     scrape_job["basic_auth"] = basic_auth
                 targets = {"targets": [f"{self.host_ip()}:{self.attr.get('prometheus')}"]}
                 scrape_job["static_configs"] = [targets]

tests/test_confgenerator.py

@@ -8,14 +8,27 @@
 
 
 def my_setup():
-    global attr, args, endpoints, sensors_conf
+    global attr, attr1, args, endpoints, sensors_conf
+
+    path = os.getcwd()
+    pwFile = os.path.join(path, "tests", "test_data", 'basic_auth')
 
     attr = {'port': 4242, 'prometheus': 9250, 'rawCounters': True, 'protocol': 'http', 'enabled': True,
             'username': 'scale_admin', 'password': 'TXlWZXJ5U3Ryb25nUGFzc3cwcmQhCg==', 'server': 'localhost',
             'serverPort': 9980, 'retryDelay': 60, 'apiKeyName': 'scale_grafana',
             'apiKeyValue': 'c0a910e4-094a-46d8-b04d-c2f73a43fd17', 'caCertPath': False,
             'includeDiskData': False, 'logPath': '/var/log/ibm_bridge_for_grafana', 'logLevel': 10,
             'logFile': 'zserver.log'}
+
+    attr1 = {'port': 4242, 'prometheus': 9250, 'rawCounters': True, 'protocol': 'http', 'enabled': True,
+             'username': 'scale_admin', 'server': 'localhost',
+             'serverPort': 9980, 'retryDelay': 60, 'apiKeyName': 'scale_grafana',
+             'apiKeyValue': 'c0a910e4-094a-46d8-b04d-c2f73a43fd17', 'caCertPath': False,
+             'includeDiskData': False, 'logPath': '/var/log/ibm_bridge_for_grafana', 'logLevel': 10,
+             'logFile': 'zserver.log'}
+
+    attr1['password'] = pwFile
+
     args = {'server': 'localhost', 'port': 9980, 'retryDelay': 60,
             'apiKeyName': 'scale_grafana',
             'apiKeyValue': 'c0a910e4-094a-46d8-b04d-c2f73a43fd17'}
@@ -78,10 +91,31 @@ def test_case01():
                     resp = conf_generator.generate_config()
                     assert isinstance(resp, str)
                     assert len(resp) > 0
+                    assert "password" in resp
+                    assert "password_file" not in resp
 
 
 @with_setup(my_setup)
 def test_case02():
+    with mock.patch('source.metadata.MetadataHandler._MetadataHandler__initializeTables') as md_init:
+        with mock.patch('source.metadata.MetadataHandler._MetadataHandler__getSupportedMetrics') as md_supp:
+            with mock.patch('source.metadata.MetadataHandler.SensorsConfig', return_value=sensors_conf) as md_sensConf:
+                with mock.patch('source.confgenerator.PrometheusConfigGenerator.host_ip', return_value='127.0.0.1'):
+                    logger = logging.getLogger(__name__)
+                    args['logger'] = logger
+                    md = MetadataHandler(**args)
+                    md.__initializeTables = md_init.return_value
+                    md.__getSupportedMetrics = md_supp.return_value
+                    md.SensorsConfig = md_sensConf.return_value
+                    conf_generator = PrometheusConfigGenerator(logger, md, attr1, endpoints)
+                    resp = conf_generator.generate_config()
+                    assert isinstance(resp, str)
+                    assert len(resp) > 0
+                    assert "password_file" in resp
+
+
+@with_setup(my_setup)
+def test_case03():
     with mock.patch('source.metadata.MetadataHandler._MetadataHandler__initializeTables') as md_init:
         with mock.patch('source.metadata.MetadataHandler._MetadataHandler__getSupportedMetrics') as md_supp:
             with mock.patch('source.metadata.MetadataHandler.SensorsConfig', return_value=sensors_conf) as md_sensConf:

tests/test_data/basic_auth

@@ -0,0 +1 @@
+TXlWZXJ5U3Ryb25nUGFzc3cwcmQhCg==