From 46f0855e372593ae56a1433ca9d26ee67016f5f5 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Thu, 4 Apr 2024 22:44:46 +0200 Subject: [PATCH] [#2489] Fixed remaining references to previous macro arguments. Some pieces of documentation and tests still referenced the previous arguments for the `lineage_run_id` and `lineage_parent_id` macros. Signed-off-by: Fabio Manganiello --- integration/airflow/README.md | 2 +- integration/airflow/openlineage/airflow/macros.py | 4 ++-- .../airflow/tests/integration/tests/airflow/dags/dbt_dag.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/airflow/README.md b/integration/airflow/README.md index 5c4006c7bf..c6f307e0bf 100644 --- a/integration/airflow/README.md +++ b/integration/airflow/README.md @@ -243,7 +243,7 @@ t1 = DataProcPySparkOperator( job_name=job_name, dataproc_pyspark_properties={ 'spark.driver.extraJavaOptions': - f"-javaagent:{jar}={os.environ.get('OPENLINEAGE_URL')}/api/v1/namespaces/{os.getenv('OPENLINEAGE_NAMESPACE', 'default')}/jobs/{job_name}/runs/{{{{macros.OpenLineagePlugin.lineage_run_id(task, task_instance)}}}}?api_key={os.environ.get('OPENLINEAGE_API_KEY')}" + f"-javaagent:{jar}={os.environ.get('OPENLINEAGE_URL')}/api/v1/namespaces/{os.getenv('OPENLINEAGE_NAMESPACE', 'default')}/jobs/{job_name}/runs/{{{{macros.OpenLineagePlugin.lineage_run_id(task_instance)}}}}?api_key={os.environ.get('OPENLINEAGE_API_KEY')}" dag=dag) ``` diff --git a/integration/airflow/openlineage/airflow/macros.py b/integration/airflow/openlineage/airflow/macros.py index 0e16b1ab5b..9d16b8e584 100644 --- a/integration/airflow/openlineage/airflow/macros.py +++ b/integration/airflow/openlineage/airflow/macros.py @@ -18,7 +18,7 @@ def lineage_run_id(task_instance: "TaskInstance"): PythonOperator( task_id='render_template', python_callable=my_task_function, - op_args=['{{ lineage_run_id(task, task_instance) }}'], # lineage_run_id macro invoked + op_args=['{{ lineage_run_id(task_instance) }}'], # lineage_run_id macro invoked provide_context=False, dag=dag ) @@ -41,7 +41,7 @@ def lineage_parent_id(task_instance: "TaskInstance"): PythonOperator( task_id='render_template', python_callable=my_task_function, - op_args=['{{ lineage_parent_id(task, task_instance) }}'], # macro invoked + op_args=['{{ lineage_parent_id(task_instance) }}'], # macro invoked provide_context=False, dag=dag ) diff --git a/integration/airflow/tests/integration/tests/airflow/dags/dbt_dag.py b/integration/airflow/tests/integration/tests/airflow/dags/dbt_dag.py index 9ea796dff5..3903e9d4df 100644 --- a/integration/airflow/tests/integration/tests/airflow/dags/dbt_dag.py +++ b/integration/airflow/tests/integration/tests/airflow/dags/dbt_dag.py @@ -8,7 +8,7 @@ from airflow.utils.dates import days_ago from airflow.version import version as AIRFLOW_VERSION -PLUGIN_MACRO = "{{ macros.OpenLineagePlugin.lineage_parent_id(task, task_instance) }}" +PLUGIN_MACRO = "{{ macros.OpenLineagePlugin.lineage_parent_id(task_instance) }}" PROJECT_DIR = "/opt/data/dbt/testproject"