Always set MASK_SECRETS_IN_LOGS to True while rendering task instance…

…s not executed
apache · May 4, 2022 · d176a30 · d176a30
1 parent eda76cf
commit d176a30
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py
@@ -2163,7 +2163,10 @@ def get_rendered_template_fields(self, session: Session = NEW_SESSION) -> None:
 
         try:
             # Task was never executed. Initialize RenderedTaskInstanceFields
-            # to render template and mask secrets.
+            # to render template and mask secrets. Set MASK_SECRETS_IN_LOGS
+            # to True to enable masking similar to task run.
+            original_value = settings.MASK_SECRETS_IN_LOGS
+            settings.MASK_SECRETS_IN_LOGS = True
             rendered_task_instance = RenderedTaskInstanceFields(self)
             rendered_fields = rendered_task_instance.rendered_fields
             if rendered_fields:
@@ -2176,6 +2179,8 @@ def get_rendered_template_fields(self, session: Session = NEW_SESSION) -> None:
                 "started running, please use 'airflow tasks render' for debugging the "
                 "rendering of template_fields."
             ) from e
+        finally:
+            settings.MASK_SECRETS_IN_LOGS = original_value
 
     @provide_session
     def get_rendered_k8s_spec(self, session=NEW_SESSION):

diff --git a/tests/www/views/test_views_rendered.py b/tests/www/views/test_views_rendered.py
@@ -182,7 +182,7 @@ def test_user_defined_filter_and_macros_raise_error(admin_client, create_dag_run
 
 
 @pytest.mark.usefixtures("patch_app")
-def test_rendered_template_secret(*args, admin_client, create_dag_run, task_secret):
+def test_rendered_template_secret(admin_client, create_dag_run, task_secret):
     """Test that the Rendered View masks values retrieved from secret variables."""
     Variable.set("my_secret", "foo")
     Variable.set("spam", "egg")
@@ -196,12 +196,12 @@ def test_rendered_template_secret(*args, admin_client, create_dag_run, task_secr
         ti.refresh_from_task(task_secret)
         assert ti.state == TaskInstanceState.QUEUED
 
-    url = f'rendered-templates?task_id=task_secret&dag_id=testdag&execution_date={quote_plus(str(DEFAULT_DATE))}'
+    date = {quote_plus(str(DEFAULT_DATE))}
+    url = f'rendered-templates?task_id=task_secret&dag_id=testdag&execution_date={date}'
 
-    with mock.patch('airflow.settings.MASK_SECRETS_IN_LOGS', True):
-        resp = admin_client.get(url, follow_redirects=True)
-        check_content_in_response(
-            'echo</span> *** <span class="o">&amp;&amp;</span> <span class="nb">echo</span> egg', resp
-        )
-        ti.refresh_from_task(task_secret)
-        assert ti.state == TaskInstanceState.QUEUED
+    resp = admin_client.get(url, follow_redirects=True)
+    check_content_in_response(
+        'echo</span> *** <span class="o">&amp;&amp;</span> <span class="nb">echo</span> egg', resp
+    )
+    ti.refresh_from_task(task_secret)
+    assert ti.state == TaskInstanceState.QUEUED