From 93f976f6e4528ff573ac8083baebe3985bc3a1ee Mon Sep 17 00:00:00 2001
From: Pere Miquel Brull <peremiquelbrull@gmail.com>
Date: Sat, 8 Jun 2024 12:07:58 +0200
Subject: [PATCH] FIX - e2e test for pydantic v2 (#16576)

* FIX - e2e test for pydantic v2

* FIX - e2e test for pydantic v2

* FIX - e2e test for pydantic v2
---
 ingestion/src/metadata/ingestion/models/lf_tags_model.py    | 6 +++---
 .../metadata/ingestion/source/dashboard/metabase/client.py  | 2 +-
 .../metadata/ingestion/source/dashboard/redash/metadata.py  | 2 +-
 .../src/metadata/ingestion/source/database/dbt/metadata.py  | 5 ++---
 .../tests/cli_e2e/dashboard/quicksight/quicksight.yaml      | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ingestion/src/metadata/ingestion/models/lf_tags_model.py b/ingestion/src/metadata/ingestion/models/lf_tags_model.py
index 91484ab4796..21e46266aa2 100644
--- a/ingestion/src/metadata/ingestion/models/lf_tags_model.py
+++ b/ingestion/src/metadata/ingestion/models/lf_tags_model.py
@@ -28,6 +28,6 @@ class LFTagsOnColumnsItem(BaseModel):
 
 
 class LFTags(BaseModel):
-    LFTagOnDatabase: Optional[List[TagItem]]
-    LFTagsOnTable: Optional[List[TagItem]]
-    LFTagsOnColumns: Optional[List[LFTagsOnColumnsItem]]
+    LFTagOnDatabase: Optional[List[TagItem]] = None
+    LFTagsOnTable: Optional[List[TagItem]] = None
+    LFTagsOnColumns: Optional[List[LFTagsOnColumnsItem]] = None
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/metabase/client.py b/ingestion/src/metadata/ingestion/source/dashboard/metabase/client.py
index 2e6fe4c03b7..72226f24595 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/metabase/client.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/metabase/client.py
@@ -77,7 +77,7 @@ class MetabaseClient:
         self.config = config
         session_token = self._get_metabase_session()
         client_config: ClientConfig = ClientConfig(
-            base_url=str(self.config.hostPort),
+            base_url=str(self.config.hostPort)[:-1],  # remove trailing slash
             api_version=API_VERSION,
             auth_header=AUTHORIZATION_HEADER,
             auth_token=lambda: (NO_ACCESS_TOKEN, 0),
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/redash/metadata.py b/ingestion/src/metadata/ingestion/source/dashboard/redash/metadata.py
index 38fecebb7f9..56efb094a8e 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/redash/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/redash/metadata.py
@@ -274,7 +274,7 @@ class RedashSource(DashboardServiceSource):
                     continue
                 yield Either(
                     right=CreateChartRequest(
-                        name=EntittName(widgets["id"]),
+                        name=EntityName(widgets["id"]),
                         displayName=chart_display_name
                         if visualization and visualization["query"]
                         else "",
diff --git a/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py b/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py
index 4ace8500eec..4fcc458e116 100644
--- a/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py
@@ -445,9 +445,8 @@ class DbtSource(DbtServiceSource):
                                 rawSql=SqlQuery(dbt_raw_query)
                                 if dbt_raw_query
                                 else None,
-                                sql=SqlQuery(dbt_compiled_query)
-                                if dbt_compiled_query
-                                else None,
+                                # SQL Is a required param for the DataModel
+                                sql=SqlQuery(dbt_compiled_query or dbt_raw_query),
                                 columns=self.parse_data_model_columns(
                                     manifest_node, catalog_node
                                 ),
diff --git a/ingestion/tests/cli_e2e/dashboard/quicksight/quicksight.yaml b/ingestion/tests/cli_e2e/dashboard/quicksight/quicksight.yaml
index eca741fcadd..192371d8689 100644
--- a/ingestion/tests/cli_e2e/dashboard/quicksight/quicksight.yaml
+++ b/ingestion/tests/cli_e2e/dashboard/quicksight/quicksight.yaml
@@ -6,7 +6,7 @@ source:
       type: QuickSight
       awsConfig:
         awsRegion: $E2E_QUICKSIGHT_REGION
-      awsAccountId: $E2E_QUICKSIGHT_AWS_ACCOUNTID
+      awsAccountId: "$E2E_QUICKSIGHT_AWS_ACCOUNTID"
       identityType: IAM
   sourceConfig:
     config: