Skip to content

Use ValueError for conflicting Git connection key arguments #70538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Miretpl merged 1 commit into from
Aug 4, 2026
Merged

Use ValueError for conflicting Git connection key arguments #70538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion generated/known_airflow_exceptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ providers/fab/src/airflow/providers/fab/auth_manager/models/db.py::1
providers/fab/src/airflow/providers/fab/www/extensions/init_security.py::1
providers/facebook/src/airflow/providers/facebook/ads/hooks/ads.py::2
providers/git/src/airflow/providers/git/bundles/git.py::5
providers/git/src/airflow/providers/git/hooks/git.py::1
providers/git/tests/unit/git/bundles/test_git.py::1
providers/github/src/airflow/providers/github/operators/github.py::2
providers/github/src/airflow/providers/github/sensors/github.py::3
Expand Down
4 changes: 2 additions & 2 deletions providers/git/src/airflow/providers/git/hooks/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from urllib.parse import quote as urlquote

from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.common.compat.sdk import AirflowException, BaseHook
from airflow.providers.common.compat.sdk import BaseHook

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -113,7 +113,7 @@ def __init__(
self.env: dict[str, str] = {}

if self.key_file and self.private_key:
raise AirflowException("Both 'key_file' and 'private_key' cannot be provided at the same time")
raise ValueError("Both 'key_file' and 'private_key' cannot be provided at the same time")

if host_key_checking_defaulted and self._uses_ssh_transport_options():
warnings.warn(
Expand Down
3 changes: 1 addition & 2 deletions providers/git/tests/unit/git/hooks/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.models import Connection
from airflow.providers.common.compat.sdk import AirflowException
from airflow.providers.git.hooks.git import GitHook

from tests_common.test_utils.config import conf_vars
Expand Down Expand Up @@ -204,7 +203,7 @@ def test_given_both_private_key_and_key_file(self, create_connection_without_db)
)

with pytest.raises(
AirflowException, match="Both 'key_file' and 'private_key' cannot be provided at the same time"
ValueError, match="Both 'key_file' and 'private_key' cannot be provided at the same time"
):
GitHook(git_conn_id=CONN_BOTH_PATH_INLINE)

Expand Down
Loading