Skip to content
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

Default client in KafkaBaseHook #40284

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Default client in KafkaBaseHook #40284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d374ed9
Default client in KafkaBaseHook
riccardoforzan Jun 17, 2024
7412068
Optimize imports
riccardoforzan Jun 17, 2024
7974ad5
Fix test client hook
riccardoforzan Jun 17, 2024
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
4 changes: 2 additions & 2 deletions airflow/providers/apache/kafka/hooks/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ def get_ui_field_behaviour(cls) -> dict[str, Any]:
},
}

def _get_client(self, config):
raise NotImplementedError
def _get_client(self, config) -> Any:
return AdminClient(config)

@cached_property
def get_conn(self) -> Any:
Expand Down
5 changes: 1 addition & 4 deletions airflow/providers/apache/kafka/hooks/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from typing import Any, Sequence

from confluent_kafka import KafkaException
from confluent_kafka.admin import AdminClient, NewTopic
from confluent_kafka.admin import NewTopic

from airflow.providers.apache.kafka.hooks.base import KafkaBaseHook

Expand All @@ -34,9 +34,6 @@ class KafkaAdminClientHook(KafkaBaseHook):
def __init__(self, kafka_config_id=KafkaBaseHook.default_conn_name) -> None:
super().__init__(kafka_config_id=kafka_config_id)

def _get_client(self, config) -> AdminClient:
return AdminClient(config)

def create_topic(
self,
topics: Sequence[Sequence[Any]],
Expand Down
8 changes: 4 additions & 4 deletions tests/providers/apache/kafka/hooks/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_get_conn(self):
assert isinstance(self.hook.get_conn, AdminClient)

@patch(
"airflow.providers.apache.kafka.hooks.client.AdminClient",
"airflow.providers.apache.kafka.hooks.base.AdminClient",
)
def test_create_topic(self, admin_client):
mock_f = MagicMock()
Expand All @@ -68,7 +68,7 @@ def test_create_topic(self, admin_client):
mock_f.result.assert_called_once()

@patch(
"airflow.providers.apache.kafka.hooks.client.AdminClient",
"airflow.providers.apache.kafka.hooks.base.AdminClient",
)
def test_create_topic_error(self, admin_client):
mock_f = MagicMock()
Expand All @@ -82,7 +82,7 @@ def test_create_topic_error(self, admin_client):
self.hook.create_topic(topics=[("topic_name", 0, 1)])

@patch(
"airflow.providers.apache.kafka.hooks.client.AdminClient",
"airflow.providers.apache.kafka.hooks.base.AdminClient",
)
def test_create_topic_warning(self, admin_client, caplog):
mock_f = MagicMock()
Expand All @@ -99,7 +99,7 @@ def test_create_topic_warning(self, admin_client, caplog):
assert "The topic topic_name already exists" in caplog.text

@patch(
"airflow.providers.apache.kafka.hooks.client.AdminClient",
"airflow.providers.apache.kafka.hooks.base.AdminClient",
)
def test_delete_topic(self, admin_client):
mock_f = MagicMock()
Expand Down