Adjust crypto policies to run only on upgrade to 9+

Signed-off-by: Jakub Jelen <[email protected]>

Author: Jakuje

repos/system_upgrade/common/actors/cryptopoliciescheck/actor.py

@@ -1,5 +1,6 @@
 from leapp.actors import Actor
 from leapp.libraries.actor import cryptopoliciescheck
+from leapp.libraries.common.config import version
 from leapp.models import CryptoPolicyInfo, Report, TargetUserSpacePreupgradeTasks
 from leapp.tags import ChecksPhaseTag, IPUWorkflowTag
 
@@ -21,4 +22,8 @@ class CryptoPoliciesCheck(Actor):
     tags = (IPUWorkflowTag, ChecksPhaseTag,)
 
     def process(self):
+        # there are no crypto policies in EL 7
+        if int(version.get_target_major_version()) < 9:
+            return
+
         cryptopoliciescheck.process(self.consume(CryptoPolicyInfo))

repos/system_upgrade/common/actors/cryptopoliciescheck/tests/component_test_cryptopoliciescheck.py

@@ -1,3 +1,6 @@
+import pytest
+
+from leapp.libraries.common.config import version
 from leapp.models import (
     CopyFile,
     CryptoPolicyInfo,
@@ -8,7 +11,13 @@
 )
 
 
-def test_actor_execution_default(current_actor_context):
+@pytest.mark.parametrize(('target_version', 'should_run'), [
+    ('8', False),
+    ('9', True),
+    ('10', True),
+])
+def test_actor_execution_default(monkeypatch, current_actor_context, target_version, should_run):
+    monkeypatch.setattr(version, 'get_target_major_version', lambda: target_version)
     current_actor_context.feed(
         CryptoPolicyInfo(
             current_policy="DEFAULT",
@@ -17,10 +26,17 @@ def test_actor_execution_default(current_actor_context):
         )
     )
     current_actor_context.run()
-    assert not current_actor_context.consume(TargetUserSpacePreupgradeTasks)
+    if should_run:
+        assert not current_actor_context.consume(TargetUserSpacePreupgradeTasks)
 
 
-def test_actor_execution_legacy(current_actor_context):
+@pytest.mark.parametrize(('target_version', 'should_run'), [
+    ('8', False),
+    ('9', True),
+    ('10', True),
+])
+def test_actor_execution_legacy(monkeypatch, current_actor_context, target_version, should_run):
+    monkeypatch.setattr(version, 'get_target_major_version', lambda: target_version)
     current_actor_context.feed(
         CryptoPolicyInfo(
             current_policy="LEGACY",
@@ -30,15 +46,22 @@ def test_actor_execution_legacy(current_actor_context):
     )
     current_actor_context.run()
 
-    assert current_actor_context.consume(TargetUserSpacePreupgradeTasks)
-    u = current_actor_context.consume(TargetUserSpacePreupgradeTasks)[0]
-    assert u.install_rpms == ['crypto-policies-scripts']
-    assert u.copy_files == []
+    if should_run:
+        assert current_actor_context.consume(TargetUserSpacePreupgradeTasks)
+        u = current_actor_context.consume(TargetUserSpacePreupgradeTasks)[0]
+        assert u.install_rpms == ['crypto-policies-scripts']
+        assert u.copy_files == []
 
-    assert current_actor_context.consume(Report)
+        assert current_actor_context.consume(Report)
 
 
-def test_actor_execution_custom(current_actor_context):
+@pytest.mark.parametrize(('target_version', 'should_run'), [
+    ('8', False),
+    ('9', True),
+    ('10', True),
+])
+def test_actor_execution_custom(monkeypatch, current_actor_context, target_version, should_run):
+    monkeypatch.setattr(version, 'get_target_major_version', lambda: target_version)
     current_actor_context.feed(
         CryptoPolicyInfo(
             current_policy="CUSTOM:SHA2",
@@ -52,12 +75,13 @@ def test_actor_execution_custom(current_actor_context):
     )
     current_actor_context.run()
 
-    assert current_actor_context.consume(TargetUserSpacePreupgradeTasks)
-    u = current_actor_context.consume(TargetUserSpacePreupgradeTasks)[0]
-    assert u.install_rpms == ['crypto-policies-scripts']
-    assert u.copy_files == [
-        CopyFile(src='/etc/crypto-policies/policies/CUSTOM.pol'),
-        CopyFile(src='/etc/crypto-policies/policies/modules/SHA2.pmod'),
-    ]
+    if should_run:
+        assert current_actor_context.consume(TargetUserSpacePreupgradeTasks)
+        u = current_actor_context.consume(TargetUserSpacePreupgradeTasks)[0]
+        assert u.install_rpms == ['crypto-policies-scripts']
+        assert u.copy_files == [
+            CopyFile(src='/etc/crypto-policies/policies/CUSTOM.pol'),
+            CopyFile(src='/etc/crypto-policies/policies/modules/SHA2.pmod'),
+        ]
 
-    assert current_actor_context.consume(Report)
+        assert current_actor_context.consume(Report)

repos/system_upgrade/common/actors/scancryptopolicies/actor.py

@@ -1,5 +1,6 @@
 from leapp.actors import Actor
 from leapp.libraries.actor import scancryptopolicies
+from leapp.libraries.common.config import version
 from leapp.models import CryptoPolicyInfo
 from leapp.tags import FactsPhaseTag, IPUWorkflowTag
 
@@ -23,4 +24,8 @@ class ScanCryptoPolicies(Actor):
     tags = (IPUWorkflowTag, FactsPhaseTag)
 
     def process(self):
+        # there are no crypto policies in EL 7
+        if int(version.get_target_major_version()) < 9:
+            return
+
         scancryptopolicies.process()

repos/system_upgrade/common/actors/scancryptopolicies/tests/component_test_scancryptopolicies.py

@@ -1,6 +1,16 @@
+import pytest
+
+from leapp.libraries.common.config import version
 from leapp.models import CryptoPolicyInfo
 
 
-def test_actor_execution(current_actor_context):
+@pytest.mark.parametrize(('target_version', 'should_run'), [
+    ('8', False),
+    ('9', True),
+    ('10', True),
+])
+def test_actor_execution(monkeypatch, current_actor_context, target_version, should_run):
+    monkeypatch.setattr(version, 'get_target_major_version', lambda: target_version)
     current_actor_context.run()
-    assert current_actor_context.consume(CryptoPolicyInfo)
+    if should_run:
+        assert current_actor_context.consume(CryptoPolicyInfo)