fix(check upgrade): update logic to compare server and client version (…

…#7238)

Co-authored-by: John Joyce <[email protected]>

metadata-ingestion/src/datahub/upgrade/upgrade.py

@@ -242,7 +242,7 @@ def valid_server_version(version: Version) -> bool:
 
 def is_client_server_compatible(client: VersionStats, server: VersionStats) -> int:
     """
-    -ve implies client is behind server
+    -ve implies server is behind client
     0 implies client and server are aligned
     +ve implies server is ahead of client
     """
@@ -251,7 +251,12 @@ def is_client_server_compatible(client: VersionStats, server: VersionStats) -> i
     ):
         # we cannot evaluate compatibility, choose True as default
         return 0
-    return server.version.micro - client.version.micro
+    if server.version.major != client.version.major:
+        return server.version.major - client.version.major
+    elif server.version.minor != client.version.minor:
+        return server.version.minor - client.version.minor
+    else:
+        return server.version.micro - client.version.micro
 
 
 def maybe_print_upgrade_message(  # noqa: C901

metadata-ingestion/tests/unit/test_check_upgrade.py

@@ -0,0 +1,32 @@
+from packaging.version import Version
+
+from datahub.upgrade.upgrade import VersionStats, is_client_server_compatible
+
+
+def test_is_client_server_compatible():
+
+    # Client and Server are Compatible
+    assert compare_client_server_version_string("0.9.6", "0.9.6") == 0
+    assert compare_client_server_version_string("0.9.6.1", "0.9.6") == 0
+
+    # Server is behind Client
+    assert compare_client_server_version_string("0.9.6", "0.9.5") < 0
+    assert compare_client_server_version_string("0.9.6.1", "0.9.5") < 0
+    assert compare_client_server_version_string("0.9.5.1", "0.8.5") < 0
+
+    # Server is ahead of Client
+    assert compare_client_server_version_string("0.9.6", "0.9.7") > 0
+    assert compare_client_server_version_string("0.9.6.1", "0.9.7") > 0
+    assert compare_client_server_version_string("0.8.45.1", "0.9.7") > 0
+
+    # Pre-relase versions are ignored and compatibility is assumed
+    assert compare_client_server_version_string("0.9.6.1rc1", "0.9.6") == 0
+    assert compare_client_server_version_string("0.9.6.1rc1", "0.9.5") == 0
+    assert compare_client_server_version_string("0.9.6.1rc1", "0.9.7") == 0
+
+
+def compare_client_server_version_string(client_ver_str, server_ver_str):
+    client_ver = VersionStats(version=Version(client_ver_str))
+    server_ver = VersionStats(version=Version(server_ver_str))
+
+    return is_client_server_compatible(client_ver, server_ver)