From 830c897f213d0ed6f56ff3d52c94dfe407f0636b Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Mon, 23 Mar 2026 21:26:56 +0200 Subject: [PATCH 1/2] Fix conf import to common.compat in `ElasticsearchTaskHandler` --- providers/elasticsearch/pyproject.toml | 2 +- .../src/airflow/providers/elasticsearch/log/es_task_handler.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/elasticsearch/pyproject.toml b/providers/elasticsearch/pyproject.toml index cbfb6576ade9b..68e06a21feec5 100644 --- a/providers/elasticsearch/pyproject.toml +++ b/providers/elasticsearch/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.12.0", + "apache-airflow-providers-common-compat>=1.12.0", # use next version "apache-airflow-providers-common-sql>=1.32.0", "elasticsearch>=8.10,<9", ] diff --git a/providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py b/providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py index f063749e523bc..a6ce2df705a1e 100644 --- a/providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py +++ b/providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py @@ -41,8 +41,8 @@ from elasticsearch.exceptions import NotFoundError import airflow.logging_config as alc -from airflow.configuration import conf from airflow.models.dagrun import DagRun +from airflow.providers.common.compat.sdk import conf from airflow.providers.elasticsearch.log.es_json_formatter import ElasticsearchJSONFormatter from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit, resolve_nested from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS, AIRFLOW_V_3_2_PLUS From 40e028b7ebd9114b2cca30617bc1d97a126a6401 Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Mon, 23 Mar 2026 22:47:52 +0200 Subject: [PATCH 2/2] Update providers/elasticsearch/pyproject.toml Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> --- providers/elasticsearch/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/elasticsearch/pyproject.toml b/providers/elasticsearch/pyproject.toml index 68e06a21feec5..cbfb6576ade9b 100644 --- a/providers/elasticsearch/pyproject.toml +++ b/providers/elasticsearch/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.12.0", # use next version + "apache-airflow-providers-common-compat>=1.12.0", "apache-airflow-providers-common-sql>=1.32.0", "elasticsearch>=8.10,<9", ]