fix alert executor

apache · Dec 9, 2022 · 77d32e5 · 77d32e5
1 parent fdc2698
commit 77d32e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/superset/reports/commands/alert.py b/superset/reports/commands/alert.py
@@ -25,7 +25,7 @@
 from celery.exceptions import SoftTimeLimitExceeded
 from flask_babel import lazy_gettext as _
 
-from superset import app, jinja_context
+from superset import app, jinja_context, security_manager
 from superset.commands.base import BaseCommand
 from superset.reports.commands.exceptions import (
     AlertQueryError,
@@ -149,10 +149,11 @@ def _execute_query(self) -> pd.DataFrame:
                 rendered_sql, ALERT_SQL_LIMIT
             )
 
-            user = get_executor(
+            _, username = get_executor(
                 executor_types=app.config["ALERT_REPORTS_EXECUTE_AS"],
                 model=self._report_schedule,
             )
+            user = security_manager.find_user(username)
             with override_user(user):
                 start = default_timer()
                 df = self._report_schedule.database.get_df(sql=limited_rendered_sql)

diff --git a/tests/integration_tests/reports/alert_tests.py b/tests/integration_tests/reports/alert_tests.py
@@ -32,19 +32,19 @@
 @pytest.mark.parametrize(
     "owner_names,creator_name,config,expected_result",
     [
-        (["gamma"], None, [ExecutorType.SELENIUM], (ExecutorType.SELENIUM, "admin")),
-        (["gamma"], None, [ExecutorType.OWNER], (ExecutorType.OWNER, "gamma")),
+        (["gamma"], None, [ExecutorType.SELENIUM], "admin"),
+        (["gamma"], None, [ExecutorType.OWNER], "gamma"),
         (
             ["alpha", "gamma"],
             "gamma",
             [ExecutorType.CREATOR_OWNER],
-            (ExecutorType.CREATOR_OWNER, "gamma"),
+            "gamma",
         ),
         (
             ["alpha", "gamma"],
             "alpha",
             [ExecutorType.CREATOR_OWNER],
-            (ExecutorType.CREATOR_OWNER, "alpha"),
+            "alpha",
         ),
         (
             ["alpha", "gamma"],
@@ -96,7 +96,7 @@ def test_execute_query_as_report_executor(
         )
         with cm:
             command.run()
-            assert override_user_mock.call_args[0][0] == expected_result
+            assert override_user_mock.call_args[0][0].username == expected_result
 
         app.config["ALERT_REPORTS_EXECUTE_AS"] = original_config