removed error text from header_data

apache · Oct 28, 2022 · 998e1e0 · 998e1e0
1 parent d29ee8c
commit 998e1e0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/superset/reports/commands/execute.py b/superset/reports/commands/execute.py
@@ -16,7 +16,6 @@
 # under the License.
 import json
 import logging
-import re
 from datetime import datetime, timedelta
 from typing import Any, List, Optional, Union
 from uuid import UUID
@@ -323,7 +322,6 @@ def _get_log_data(self) -> HeaderDataType:
             "chart_id": chart_id,
             "dashboard_id": dashboard_id,
             "owners": self._report_schedule.owners,
-            "error_text": None,
         }
         return log_data
 
@@ -355,7 +353,6 @@ def _get_notification_content(self) -> NotificationContent:
                 if not csv_data:
                     error_text = "Unexpected missing csv file"
             if error_text:
-                header_data["error_text"] = error_text
                 return NotificationContent(
                     name=self._report_schedule.name,
                     text=error_text,
@@ -435,13 +432,6 @@ def send_error(self, name: str, message: str) -> None:
         :raises: NotificationError
         """
         header_data = self._get_log_data()
-        error_parsing = re.search("Query Job SQL Follows", message)
-        if error_parsing:
-            error_index = error_parsing.span()
-            new_message = message[: error_index[0]]
-            header_data["error_text"] = new_message
-        else:
-            header_data["error_text"] = message
         logger.info(
             "header_data in notifications for alerts and reports %s, taskid, %s",
             header_data,

diff --git a/superset/utils/core.py b/superset/utils/core.py
@@ -197,7 +197,6 @@ class HeaderDataType(TypedDict):
     notification_source: Optional[str]
     chart_id: Optional[int]
     dashboard_id: Optional[int]
-    error_text: Optional[str]
 
 
 class DatasourceDict(TypedDict):

diff --git a/tests/integration_tests/reports/commands/execute_dashboard_report_tests.py b/tests/integration_tests/reports/commands/execute_dashboard_report_tests.py
@@ -110,4 +110,4 @@ def test_report_with_header_data(
         assert header_data.get("notification_format") == report_schedule.report_format
         assert header_data.get("notification_source") == ReportSourceFormat.DASHBOARD
         assert header_data.get("notification_type") == report_schedule.type
-        assert len(send_email_smtp_mock.call_args.kwargs["header_data"]) == 7
+        assert len(send_email_smtp_mock.call_args.kwargs["header_data"]) == 6
diff --git a/tests/unit_tests/notifications/email_tests.py b/tests/unit_tests/notifications/email_tests.py
@@ -41,7 +41,6 @@ def test_render_description_with_html() -> None:
             "notification_source": None,
             "chart_id": None,
             "dashboard_id": None,
-            "error_text": None,
         },
     )
     email_body = (