Used filters

Signed-off-by: shlao <[email protected]>

Author: shlao

insights/specs/datasources/host_key_files.py

@@ -4,16 +4,18 @@
 
 import os
 
+from insights.specs import Specs
 from insights.core.context import HostContext
-from insights.core.exceptions import SkipComponent
+from insights.core.filters import add_filter
 from insights.core.plugins import datasource
+from insights.core.exceptions import SkipComponent
 from insights.core.spec_factory import DatasourceProvider
 
-ERROR_KEY = "error: Could not load host key:"
-VAR_LOG_MSG = '/var/log/messages'
+ERROR_MSG = "error: Could not load host key:"
+add_filter(Specs.messages, ERROR_MSG)
 
 
-@datasource(HostContext)
+@datasource(Specs.messages, HostContext)
 def host_key_files(broker):
     """
     This datasource reads '/var/log/messages' to check the host key path, and check
@@ -30,10 +32,10 @@ def host_key_files(broker):
         SkipComponent: When any exception occurs.
     """
     error_loadings = set()
-    with open(VAR_LOG_MSG, 'r', encoding='utf-8') as file:
-        for line in file:
-            if ERROR_KEY in line:
-                error_loadings.add(line.split(ERROR_KEY)[-1].strip())
+    messages = broker[Specs.messages].content
+    for line in messages:
+        if ERROR_MSG in line:
+            error_loadings.add(line.split(ERROR_MSG)[-1].strip())
 
     if not error_loadings:
         raise SkipComponent()

insights/tests/datasources/test_host_key_files.py

@@ -1,12 +1,14 @@
 import pytest
 
-from mock.mock import patch, mock_open
+from mock.mock import patch, Mock
+from insights.specs import Specs
 from insights.core.dr import SkipComponent
 from insights.core.spec_factory import DatasourceProvider
 from insights.specs.datasources.host_key_files import host_key_files
 
 VAR_LOGS = """
 Mar 16 19:30:54 host sshd[10644]: error: Could not load host key: /etc/ssh/ssh_host_dsa_key
+Mar 16 19:30:54 host sshd[10645]: error: New host key: /etc/ssh_host_dsa_key
 Mar 16 19:30:54 host sshd[10645]: error: Could not load host key: /etc/ssh_host_dsa_key
 """.strip()
 
@@ -17,31 +19,31 @@
 """.strip()
 
 
-@patch(
-    'insights.specs.datasources.host_key_files.open', new_callable=mock_open, read_data=VAR_LOGS
-)
 @patch('os.path.exists')
-def test_host_key_files(mock_exists, mock_ds_open):
+def test_host_key_files(mock_exists):
     files_dict = {
         '/etc/ssh/ssh_host_dsa_key': True,
         '/etc/ssh_host_dsa_key': False,
     }
     mock_exists.side_effect = lambda path: files_dict.get(path, False)
 
-    broker = {}
+    messages = Mock()
+    messages.content = VAR_LOGS.splitlines()
+    broker = {Specs.messages: messages}
+
     result = host_key_files(broker)
     assert result is not None
 
     expected = DatasourceProvider(content=EXPECTED_RESULT, relative_path=RELATIVE_PATH)
     assert len(result.content) == len(expected.content) == 2
 
 
-@patch(
-    'insights.specs.datasources.host_key_files.open', new_callable=mock_open, read_data=""
-)
 @patch('os.path.exists')
-def test_host_key_files_empty_log(mock_exists, mock_ds_open):
-    broker = {}
+def test_host_key_files_empty_log(mock_exists):
+    messages = Mock()
+    messages.content = []
+    broker = {Specs.messages: messages}
+
     with pytest.raises(SkipComponent) as e:
         host_key_files(broker)
     assert 'SkipComponent' in str(e)