This is an automated email from the ASF dual-hosted git repository.
eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 7747b7b0211 Fix failing mypy check on `main` (#44191)
7747b7b0211 is described below
commit 7747b7b021133ea6e43bfc696fb7a6c75643275f
Author: Kaxil Naik <[email protected]>
AuthorDate: Tue Nov 19 16:52:47 2024 +0000
Fix failing mypy check on `main` (#44191)
Failure on main:
```
providers/src/airflow/providers/apache/spark/hooks/spark_submit.py:525:
error:
Module "airflow.security.kerberos" has no attribute
"get_kerberos_principle";
maybe "get_kerberos_principal"? [attr-defined]
from airflow.security.kerberos import (
^
providers/src/airflow/providers/apache/spark/hooks/spark_submit.py:525:
error:
Name "get_kerberos_principal" already defined (possibly by an import)
[no-redef]
from airflow.security.kerberos import (
^
Found 2 errors in 1 file (checked 3337 source files)
Error 1 returned
```
---
.../airflow/providers/apache/spark/hooks/spark_submit.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/providers/src/airflow/providers/apache/spark/hooks/spark_submit.py
b/providers/src/airflow/providers/apache/spark/hooks/spark_submit.py
index 1aab2dc0ea7..9889cf94735 100644
--- a/providers/src/airflow/providers/apache/spark/hooks/spark_submit.py
+++ b/providers/src/airflow/providers/apache/spark/hooks/spark_submit.py
@@ -519,14 +519,14 @@ class SparkSubmitHook(BaseHook, LoggingMixin):
def _resolve_kerberos_principal(self, principal: str | None) -> str:
"""Resolve kerberos principal."""
# todo: remove try/exception when min airflow version is 3.0
- try:
- from airflow.security.kerberos import get_kerberos_principal #
type: ignore[attr-defined]
- except ImportError:
- from airflow.security.kerberos import (
- get_kerberos_principle as get_kerberos_principal, # type:
ignore[attr-defined]
- )
+ from airflow.security import kerberos
- return get_kerberos_principal(principal)
+ try:
+ func = kerberos.get_kerberos_principal
+ except AttributeError:
+ # Fallback for older versions of Airflow
+ func = kerberos.get_kerberos_principle # type:
ignore[attr-defined]
+ return func(principal)
def submit(self, application: str = "", **kwargs: Any) -> None:
"""
