Merge branch 'datahub-project:master' into master

acryldata · May 9, 2024 · bc89773 · bc89773
2 parents 14ce5de + 3755a1e
commit bc89773
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
@@ -375,7 +375,7 @@ def _parse_into_dbt_node(self, node: Dict) -> DBTNode:
                     max_loaded_at = None
 
         columns = []
-        if "columns" in node:
+        if "columns" in node and node["columns"] is not None:
             # columns will be empty for ephemeral models
             columns = [
                 self._parse_into_dbt_column(column)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau.py
@@ -20,7 +20,7 @@
 import tableauserverclient as TSC
 from pydantic import root_validator, validator
 from pydantic.fields import Field
-from requests.adapters import ConnectionError, HTTPAdapter
+from requests.adapters import HTTPAdapter
 from tableauserverclient import (
     PersonalAccessTokenAuth,
     Server,
@@ -572,11 +572,11 @@ def close(self) -> None:
         try:
             if self.server is not None:
                 self.server.auth.sign_out()
-        except ConnectionError as err:
+        except Exception as ex:
             logger.warning(
                 "During graceful closing of Tableau source a sign-out call was tried but ended up with"
-                " a ConnectionError (%s). Continuing closing of the source",
-                err,
+                " an Exception (%s). Continuing closing of the source",
+                ex,
             )
             self.server = None
         super().close()