[patch] add version verification functions

Author: terc1997

setup.py

@@ -60,7 +60,8 @@ def get_version(rel_path):
         'kubernetes',              # Apache Software License
         'kubeconfig',              # BSD License
         'jinja2',                  # BSD License
-        'jinja2-base64-filters'    # MIT License
+        'jinja2-base64-filters',   # MIT License
+        'semver'                   # BSD License
     ],
     extras_require={
         'dev': [

src/mas/devops/mas.py

@@ -18,6 +18,7 @@
 from openshift.dynamic import DynamicClient
 from openshift.dynamic.exceptions import NotFoundError, ResourceNotFoundError, UnauthorizedError
 from jinja2 import Environment, FileSystemLoader
+import semver
 
 from .ocp import getStorageClasses
 from .olm import getSubscription
@@ -305,3 +306,41 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor
     except NotFoundError:
         logger.error(f"PVC {pvcName} does not exist")
         return False
+
+
+def isVersionBefore(_compare_to_version, _current_version):
+    """
+    The method does a modified semantic version comparison,
+    as we want to treat any pre-release as == to the real release
+    but in strict semantic versioning it is <
+    ie. '8.6.0-pre.m1dev86' is converted to '8.6.0'
+    """
+    if _current_version is None:
+        print("Version is not informed. Returning False")
+        return False
+
+    strippedVersion = _current_version.split("-")[0]
+    if '.x' in strippedVersion:
+        strippedVersion = strippedVersion.replace('.x', '.0')
+    current_version = semver.VersionInfo.parse(strippedVersion)
+    compareToVersion = semver.VersionInfo.parse(_compare_to_version)
+    return current_version.compare(compareToVersion) < 0
+
+
+def isVersionAfter(_compare_to_version, _current_version):
+    """
+    The method does a modified semantic version comparison,
+    as we want to treat any pre-release as == to the real release
+    but in strict semantic versioning it is <
+    ie. '8.6.0-pre.m1dev86' is converted to '8.6.0'
+    """
+    if _current_version is None:
+        print("Version is not informed. Returning False")
+        return False
+
+    strippedVersion = _current_version.split("-")[0]
+    if '.x' in strippedVersion:
+        strippedVersion = strippedVersion.replace('.x', '.0')
+    current_version = semver.VersionInfo.parse(strippedVersion)
+    compareToVersion = semver.VersionInfo.parse(_compare_to_version)
+    return current_version.compare(compareToVersion) >= 0

test/src/test_mas.py

@@ -62,3 +62,18 @@ def test_is_airgap_install():
     # The cluster we are using to test with does not have the MAS ICSP or IDMS installed
     assert mas.isAirgapInstall(dynClient) is False
     assert mas.isAirgapInstall(dynClient, checkICSP=False) is False
+    
+def test_version_before():
+    assert mas.isVersionBefore('9.1.0','9.1.x-feature') is False
+    assert mas.isVersionBefore('9.1.0','9.0.0') is True
+    assert mas.isVersionBefore('8.11.1','9.1.0') is False
+    assert mas.isVersionBefore('9.1.0','9.1.x-stable') is False
+
+def test_version_before():
+    assert mas.isVersionAfter('9.1.0','9.2.x-feature') is True
+    assert mas.isVersionAfter('9.1.0','9.0.0') is False
+    assert mas.isVersionAfter('8.11.1','9.1.0') is True
+    assert mas.isVersionAfter('9.2.0','9.1.x-stable') is False
+
+if __name__ == '__main__':
+    test_version_before()