acryl-datahub 1.2.0.6rc1__py3-none-any.whl → 1.2.0.7rc1__py3-none-any.whl

datahub/upgrade/upgrade.py

@@ -45,6 +45,7 @@ class ServerVersionStats(BaseModel):
     latest: Optional[VersionStats] = None
     current_server_type: Optional[str] = None
     current_server_default_cli_version: Optional[VersionStats] = None
+    is_cloud_server: Optional[bool] = None
 
 
 class ClientVersionStats(BaseModel):
@@ -145,7 +146,9 @@ async def get_server_config(gms_url: str, token: Optional[str]) -> RestServiceCo
 
 async def get_server_version_stats(
     server: Optional[DataHubGraph] = None,
-) -> Tuple[Optional[str], Optional[Version], Optional[str], Optional[datetime]]:
+) -> Tuple[
+    Optional[str], Optional[Version], Optional[str], Optional[datetime], Optional[bool]
+]:
     import aiohttp
 
     server_config: Optional[RestServiceConfig] = None
@@ -167,11 +170,13 @@ async def get_server_version_stats(
     server_version: Optional[Version] = None
     current_server_default_cli_version = None
     current_server_release_date = None
+    is_cloud_server: Optional[bool] = None
     if server_config:
         server_version_string = server_config.service_version
         commit_hash = server_config.commit_hash
         server_type = server_config.server_type
         current_server_default_cli_version = server_config.default_cli_version
+        is_cloud_server = server_config.is_datahub_cloud
         if server_type == "quickstart" and commit_hash:
             async with aiohttp.ClientSession(
                 headers={"Accept": "application/vnd.github.v3+json"}
@@ -191,6 +196,7 @@ async def get_server_version_stats(
         server_version,
         current_server_default_cli_version,
         current_server_release_date,
+        is_cloud_server,
     )
 
 
@@ -236,6 +242,7 @@ async def _retrieve_version_stats(
         current_server_version,
         current_server_default_cli_version,
         current_server_release_date,
+        is_cloud_server,
     ) = results[2]
 
     server_version_stats = None
@@ -255,6 +262,7 @@ async def _retrieve_version_stats(
                 else None
             ),
             current_server_type=current_server_type,
+            is_cloud_server=is_cloud_server,
         )
 
     if client_version_stats and server_version_stats:
@@ -353,7 +361,11 @@ def _maybe_print_upgrade_message(
             else None
         )
         client_server_compat = 0
-        if version_stats.server.current_server_type != "cloud":
+        # Skip version compatibility checks for cloud servers (serverEnv="cloud")
+        # Cloud servers use different versioning schemes between server and CLI
+        is_cloud = version_stats.server.is_cloud_server
+
+        if not is_cloud:
             client_server_compat = is_client_server_compatible(
                 version_stats.client.current, version_stats.server.current
             )