Fix logic around cloud_mode and ge_cloud_mode. (#6550)

great_expectations/data_context/data_context/base_data_context.py

@@ -190,10 +190,8 @@ def __init__(
             None
         """
         # Chetan - 20221208 - not formally deprecating these values until a future date
-        if cloud_config is not None or ge_cloud_config is not None:
-            cloud_config = cloud_config or ge_cloud_config
-        if cloud_mode is not False or ge_cloud_mode is not False:
-            cloud_mode = cloud_mode or ge_cloud_mode
+        cloud_config = cloud_config if cloud_config is not None else ge_cloud_config
+        cloud_mode = True if cloud_mode or ge_cloud_mode else False
 
         project_data_context_config: DataContextConfig = (
             BaseDataContext.get_or_create_data_context_config(project_config)

great_expectations/data_context/data_context/cloud_data_context.py

@@ -83,12 +83,19 @@ def __init__(
         self._cloud_mode = True  # property needed for backward compatibility
 
         # Chetan - 20221208 - not formally deprecating these values until a future date
-        if cloud_base_url is not None or ge_cloud_base_url is not None:
-            cloud_base_url = cloud_base_url or ge_cloud_base_url
-        if cloud_access_token is not None or ge_cloud_access_token is not None:
-            cloud_access_token = cloud_access_token or ge_cloud_access_token
-        if cloud_organization_id is not None or ge_cloud_organization_id is not None:
-            cloud_organization_id = cloud_organization_id or ge_cloud_organization_id
+        cloud_base_url = (
+            cloud_base_url if cloud_base_url is not None else ge_cloud_base_url
+        )
+        cloud_access_token = (
+            cloud_access_token
+            if cloud_access_token is not None
+            else ge_cloud_access_token
+        )
+        cloud_organization_id = (
+            cloud_organization_id
+            if cloud_organization_id is not None
+            else ge_cloud_organization_id
+        )
 
         self._cloud_config = self.get_cloud_config(
             cloud_base_url=cloud_base_url,

great_expectations/data_context/data_context/data_context.py

@@ -237,14 +237,20 @@ def __init__(
         ge_cloud_organization_id: Optional[str] = None,
     ) -> None:
         # Chetan - 20221208 - not formally deprecating these values until a future date
-        if cloud_base_url is not None or ge_cloud_base_url is not None:
-            cloud_base_url = cloud_base_url or ge_cloud_base_url
-        if cloud_access_token is not None or ge_cloud_access_token is not None:
-            cloud_access_token = cloud_access_token or ge_cloud_access_token
-        if cloud_organization_id is not None or ge_cloud_organization_id is not None:
-            cloud_organization_id = cloud_organization_id or ge_cloud_organization_id
-        if cloud_mode is not False or ge_cloud_mode is not False:
-            cloud_mode = cloud_mode or ge_cloud_mode
+        cloud_base_url = (
+            cloud_base_url if cloud_base_url is not None else ge_cloud_base_url
+        )
+        cloud_access_token = (
+            cloud_access_token
+            if cloud_access_token is not None
+            else ge_cloud_access_token
+        )
+        cloud_organization_id = (
+            cloud_organization_id
+            if cloud_organization_id is not None
+            else ge_cloud_organization_id
+        )
+        cloud_mode = True if cloud_mode or ge_cloud_mode else False
 
         self._sources: _SourceFactories = _SourceFactories(self)
         self._cloud_mode = cloud_mode

great_expectations/util.py

@@ -1802,14 +1802,16 @@ def get_context(
     )
 
     # Chetan - 20221208 - not formally deprecating these values until a future date
-    if cloud_base_url is not None or ge_cloud_base_url is not None:
-        cloud_base_url = cloud_base_url or ge_cloud_base_url
-    if cloud_access_token is not None or ge_cloud_access_token is not None:
-        cloud_access_token = cloud_access_token or ge_cloud_access_token
-    if cloud_organization_id is not None or ge_cloud_organization_id is not None:
-        cloud_organization_id = cloud_organization_id or ge_cloud_organization_id
-    if cloud_mode is not None or ge_cloud_mode is not None:
-        cloud_mode = cloud_mode or ge_cloud_mode
+    cloud_base_url = cloud_base_url if cloud_base_url is not None else ge_cloud_base_url
+    cloud_access_token = (
+        cloud_access_token if cloud_access_token is not None else ge_cloud_access_token
+    )
+    cloud_organization_id = (
+        cloud_organization_id
+        if cloud_organization_id is not None
+        else ge_cloud_organization_id
+    )
+    cloud_mode = cloud_mode if cloud_mode is not None else ge_cloud_mode
 
     # First, check for ge_cloud conditions