From b3963293f3ec166e2fed7c5b23c09ecbda63a783 Mon Sep 17 00:00:00 2001
From: romsharon98 <rom.sharon98@gmail.com>
Date: Wed, 10 Apr 2024 13:31:41 +0300
Subject: [PATCH 1/6] add log for running callback

---
 airflow/models/taskinstance.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py
index 4e095e774355d..d4d7a468728a0 100644
--- a/airflow/models/taskinstance.py
+++ b/airflow/models/taskinstance.py
@@ -1235,9 +1235,11 @@ def _run_finished_callback(
         for callback in callbacks:
             log.info("Executing %s callback", callback.__name__)
             try:
+                callback_name = qualname(callback).split(".")[-1]
+                log.info("Executing %s callback", callback_name)
                 callback(context)
             except Exception:
-                log.exception("Error when executing %s callback", callback.__name__)  # type: ignore[attr-defined]
+                log.exception("Error when executing %s callback", callback_name)  # type: ignore[attr-defined]
 
 
 def _log_state(*, task_instance: TaskInstance | TaskInstancePydantic, lead_msg: str = "") -> None:

From eb876c9b879d25e66aefba7a7f05c06ba482aaf0 Mon Sep 17 00:00:00 2001
From: romsharon98 <rom.sharon98@gmail.com>
Date: Thu, 18 Apr 2024 16:20:57 +0300
Subject: [PATCH 2/6] revert

---
 airflow/models/taskinstance.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py
index d4d7a468728a0..4e095e774355d 100644
--- a/airflow/models/taskinstance.py
+++ b/airflow/models/taskinstance.py
@@ -1235,11 +1235,9 @@ def _run_finished_callback(
         for callback in callbacks:
             log.info("Executing %s callback", callback.__name__)
             try:
-                callback_name = qualname(callback).split(".")[-1]
-                log.info("Executing %s callback", callback_name)
                 callback(context)
             except Exception:
-                log.exception("Error when executing %s callback", callback_name)  # type: ignore[attr-defined]
+                log.exception("Error when executing %s callback", callback.__name__)  # type: ignore[attr-defined]
 
 
 def _log_state(*, task_instance: TaskInstance | TaskInstancePydantic, lead_msg: str = "") -> None:

From 83da6cef163ef0981d2a8500dfbd7cef47f7137e Mon Sep 17 00:00:00 2001
From: romsharon98 <rom.sharon98@gmail.com>
Date: Mon, 6 May 2024 13:17:22 +0300
Subject: [PATCH 3/6] fix W605

---
 airflow/providers/amazon/aws/hooks/eks.py | 2 +-
 pyproject.toml                            | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/airflow/providers/amazon/aws/hooks/eks.py b/airflow/providers/amazon/aws/hooks/eks.py
index 23fbd43330977..af71841691483 100644
--- a/airflow/providers/amazon/aws/hooks/eks.py
+++ b/airflow/providers/amazon/aws/hooks/eks.py
@@ -76,7 +76,7 @@ class NodegroupStates(Enum):
     NONEXISTENT = "NONEXISTENT"
 
 
-COMMAND = """
+COMMAND = r"""
             output=$({python_executable} -m airflow.providers.amazon.aws.utils.eks_get_token \
                 --cluster-name {eks_cluster_name} {args} 2>&1)
 
diff --git a/pyproject.toml b/pyproject.toml
index 4e878884ffe91..5c3043c93e9bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -132,8 +132,8 @@ dynamic = ["version", "optional-dependencies", "dependencies"]
 # START PROVIDER EXTRAS HERE
 #
 # airbyte, alibaba, amazon, apache.beam, apache.cassandra, apache.drill, apache.druid, apache.flink,
-# apache.hdfs, apache.hive, apache.impala, apache.kafka, apache.kylin, apache.livy, apache.pig,
-# apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
+# apache.hdfs, apache.hive, apache.iceberg, apache.impala, apache.kafka, apache.kylin, apache.livy,
+# apache.pig, apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
 # cncf.kubernetes, cohere, common.io, common.sql, databricks, datadog, dbt.cloud, dingding, discord,
 # docker, elasticsearch, exasol, fab, facebook, ftp, github, google, grpc, hashicorp, http, imap,
 # influxdb, jdbc, jenkins, microsoft.azure, microsoft.mssql, microsoft.psrp, microsoft.winrm, mongo,
@@ -405,9 +405,6 @@ combine-as-imports = true
 # All the modules which do not follow B028 yet: https://docs.astral.sh/ruff/rules/no-explicit-stacklevel/
 "helm_tests/airflow_aux/test_basic_helm_chart.py" = ["B028"]
 
-# https://github.com/apache/airflow/issues/39252
-"airflow/providers/amazon/aws/hooks/eks.py" = ["W605"]
-
 [tool.ruff.lint.flake8-tidy-imports]
 # Disallow all relative imports.
 ban-relative-imports = "all"

From 1fbed43538899ab271a5fbb29d70c23fe93c65a2 Mon Sep 17 00:00:00 2001
From: romsharon98 <rom.sharon98@gmail.com>
Date: Mon, 6 May 2024 13:42:20 +0300
Subject: [PATCH 4/6] revert other changes

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5c3043c93e9bc..07fa48ce27bf5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -132,7 +132,7 @@ dynamic = ["version", "optional-dependencies", "dependencies"]
 # START PROVIDER EXTRAS HERE
 #
 # airbyte, alibaba, amazon, apache.beam, apache.cassandra, apache.drill, apache.druid, apache.flink,
-# apache.hdfs, apache.hive, apache.iceberg, apache.impala, apache.kafka, apache.kylin, apache.livy,
+# apache.hdfs, apache.hive, apache.impala, apache.kafka, apache.kylin, apache.livy,
 # apache.pig, apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
 # cncf.kubernetes, cohere, common.io, common.sql, databricks, datadog, dbt.cloud, dingding, discord,
 # docker, elasticsearch, exasol, fab, facebook, ftp, github, google, grpc, hashicorp, http, imap,

From 605614f06e2dbcefaac65f1b4b5ee8fd5ab0c9d2 Mon Sep 17 00:00:00 2001
From: romsharon98 <rom.sharon98@gmail.com>
Date: Mon, 6 May 2024 13:44:24 +0300
Subject: [PATCH 5/6] revert other changes

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 07fa48ce27bf5..f9bc572deff16 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -132,7 +132,7 @@ dynamic = ["version", "optional-dependencies", "dependencies"]
 # START PROVIDER EXTRAS HERE
 #
 # airbyte, alibaba, amazon, apache.beam, apache.cassandra, apache.drill, apache.druid, apache.flink,
-# apache.hdfs, apache.hive, apache.impala, apache.kafka, apache.kylin, apache.livy,
+# apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
 # apache.pig, apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
 # cncf.kubernetes, cohere, common.io, common.sql, databricks, datadog, dbt.cloud, dingding, discord,
 # docker, elasticsearch, exasol, fab, facebook, ftp, github, google, grpc, hashicorp, http, imap,

From e428b86f63bde969b449ccb67f13bd2b7e5763bf Mon Sep 17 00:00:00 2001
From: romsharon98 <rom.sharon98@gmail.com>
Date: Mon, 6 May 2024 13:46:09 +0300
Subject: [PATCH 6/6] revert other changes

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f9bc572deff16..6b6a274c775ba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -132,8 +132,8 @@ dynamic = ["version", "optional-dependencies", "dependencies"]
 # START PROVIDER EXTRAS HERE
 #
 # airbyte, alibaba, amazon, apache.beam, apache.cassandra, apache.drill, apache.druid, apache.flink,
+# apache.hdfs, apache.hive, apache.impala, apache.kafka, apache.kylin, apache.livy, apache.pig,
 # apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
-# apache.pig, apache.pinot, apache.spark, apprise, arangodb, asana, atlassian.jira, celery, cloudant,
 # cncf.kubernetes, cohere, common.io, common.sql, databricks, datadog, dbt.cloud, dingding, discord,
 # docker, elasticsearch, exasol, fab, facebook, ftp, github, google, grpc, hashicorp, http, imap,
 # influxdb, jdbc, jenkins, microsoft.azure, microsoft.mssql, microsoft.psrp, microsoft.winrm, mongo,
