squash! Add actors for OpenSSL conf and IBMCA

* Refactoring: TrackedSourceFileInfo -> TrackedFilesInfoSource
oamg · Jan 8, 2024 · bee63ae · bee63ae
1 parent 4abf41f
commit bee63ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/repos/system_upgrade/common/actors/openssl/checkopensslconf/actor.py b/repos/system_upgrade/common/actors/openssl/checkopensslconf/actor.py
@@ -1,6 +1,6 @@
 from leapp.actors import Actor
 from leapp.libraries.actor import checkopensslconf
-from leapp.models import InstalledRedHatSignedRPM, Report, TrackedSourceFilesInfo
+from leapp.models import InstalledRedHatSignedRPM, Report, TrackedFilesInfoSource
 from leapp.tags import ChecksPhaseTag, IPUWorkflowTag
 
 
@@ -25,7 +25,7 @@ class CheckOpenSSLConf(Actor):
     """
 
     name = 'check_openssl_conf'
-    consumes = (InstalledRedHatSignedRPM, TrackedSourceFilesInfo)
+    consumes = (InstalledRedHatSignedRPM, TrackedFilesInfoSource)
     produces = (Report,)
     tags = (IPUWorkflowTag, ChecksPhaseTag)
 

diff --git a/repos/system_upgrade/common/actors/openssl/checkopensslconf/libraries/checkopensslconf.py b/repos/system_upgrade/common/actors/openssl/checkopensslconf/libraries/checkopensslconf.py
@@ -2,7 +2,7 @@
 from leapp.libraries.common.config import architecture, version
 from leapp.libraries.common.rpms import has_package
 from leapp.libraries.stdlib import api
-from leapp.models import InstalledRedHatSignedRPM, TrackedSourceFilesInfo
+from leapp.models import InstalledRedHatSignedRPM, TrackedFilesInfoSource
 
 DEFAULT_OPENSSL_CONF = '/etc/pki/tls/openssl.cnf'
 
@@ -53,10 +53,10 @@ def check_ibmca():
 
 
 def _is_openssl_modified():
-    tracked_files = next(api.consume(TrackedSourceFilesInfo), None)
+    tracked_files = next(api.consume(TrackedFilesInfoSource), None)
     if not tracked_files:
         # unexpected at all, skipping testing, but keeping the log just in case
-        api.current_logger.warning('The TrackedSourceFilesInfo message is missing! Skipping check of openssl config.')
+        api.current_logger.warning('The TrackedFilesInfoSource message is missing! Skipping check of openssl config.')
         return False
     for finfo in tracked_files.files:
         if finfo.path == DEFAULT_OPENSSL_CONF:

diff --git a/...system_upgrade/common/actors/openssl/checkopensslconf/tests/unit_test_checkopensslconf.py b/...system_upgrade/common/actors/openssl/checkopensslconf/tests/unit_test_checkopensslconf.py
@@ -5,7 +5,7 @@
 from leapp.libraries.common.config import architecture
 from leapp.libraries.common.testutils import create_report_mocked, CurrentActorMocked, logger_mocked
 from leapp.libraries.stdlib import api
-from leapp.models import InstalledRedHatSignedRPM, TrackedSourceFilesInfo
+from leapp.models import InstalledRedHatSignedRPM, TrackedFilesInfoSource
 
 
 # TODO(pstodulk)