[CX-16591] Fix regex to work with impersonated clusters like airflow_…

…scheduler_ddavydov (apache#42)
rajatsri28 · Apr 14, 2020 · a68e2b3 · a68e2b3
1 parent 8ed2c72
commit a68e2b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/airflow/models/dag.py b/airflow/models/dag.py
@@ -1490,7 +1490,7 @@ def get_local_fileloc(self):
             # the path the webserver uses when it tries to trigger a DAG does not match the
             # existing scheduler path and the DAG can not be found.
             # Also, fix for render code on UI by changing "/code" in views.py
-            path_regex = "airflow_scheduler-.-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[" \
+            path_regex = "airflow_scheduler.*-.-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[" \
                          "0-9a-f]{12}/runs/.*/sandbox/airflow_home"
             path_split = re.split(path_regex, self.fileloc)[1]
             return os.environ.get("AIRFLOW_HOME") + path_split

diff --git a/airflow/version.py b/airflow/version.py
@@ -18,5 +18,5 @@
 # under the License.
 #
 
-version = '1.10.4+twtr7'
+version = '1.10.4+twtr8'