Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing azure event hub instance name (#52049)

pull/52145/head
Eduard van Valkenburg 2021-06-24 11:24:38 +02:00 committed by GitHub
parent 780d538bb0
commit e21325b975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
homeassistant/components/azure_event_hub/__init__.py
View File

@ -23,6 +23,7 @@ import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entityfilter import FILTER_SCHEMA
from homeassistant.helpers.event import async_call_later
from homeassistant.helpers.json import JSONEncoder
from homeassistant.helpers.typing import ConfigType
from .const import (
ADDITIONAL_ARGS,
@ -43,9 +44,9 @@ CONFIG_SCHEMA = vol.Schema(
{
DOMAIN: vol.Schema(
{
vol.Required(CONF_EVENT_HUB_INSTANCE_NAME): cv.string,
vol.Exclusive(CONF_EVENT_HUB_CON_STRING, "setup_methods"): cv.string,
vol.Exclusive(CONF_EVENT_HUB_NAMESPACE, "setup_methods"): cv.string,
vol.Optional(CONF_EVENT_HUB_INSTANCE_NAME): cv.string,
vol.Optional(CONF_EVENT_HUB_SAS_POLICY): cv.string,
vol.Optional(CONF_EVENT_HUB_SAS_KEY): cv.string,
vol.Optional(CONF_SEND_INTERVAL, default=5): cv.positive_int,
@ -61,20 +62,23 @@ CONFIG_SCHEMA = vol.Schema(
)
async def async_setup(hass, yaml_config):
async def async_setup(hass: HomeAssistant, yaml_config: ConfigType) -> bool:
"""Activate Azure EH component."""
config = yaml_config[DOMAIN]
if config.get(CONF_EVENT_HUB_CON_STRING):
client_args = {"conn_str": config[CONF_EVENT_HUB_CON_STRING]}
client_args = {
"conn_str": config[CONF_EVENT_HUB_CON_STRING],
"eventhub_name": config[CONF_EVENT_HUB_INSTANCE_NAME],
}
conn_str_client = True
else:
client_args = {
"fully_qualified_namespace": f"{config[CONF_EVENT_HUB_NAMESPACE]}.servicebus.windows.net",
"eventhub_name": config[CONF_EVENT_HUB_INSTANCE_NAME],
"credential": EventHubSharedKeyCredential(
policy=config[CONF_EVENT_HUB_SAS_POLICY],
key=config[CONF_EVENT_HUB_SAS_KEY],
),
"eventhub_name": config[CONF_EVENT_HUB_INSTANCE_NAME],
}
conn_str_client = False
@ -115,7 +119,7 @@ class AzureEventHub:
self._next_send_remover = None
self.shutdown = False
async def async_start(self):
async def async_start(self) -> None:
"""Start the recorder, suppress logging and register the callbacks and do the first send after five seconds, to capture the startup events."""
# suppress the INFO and below logging on the underlying packages, they are very verbose, even at INFO
logging.getLogger("uamqp").setLevel(logging.WARNING)
@ -128,7 +132,7 @@ class AzureEventHub:
# schedule the first send after 10 seconds to capture startup events, after that each send will schedule the next after the interval.
self._next_send_remover = async_call_later(self.hass, 10, self.async_send)
async def async_shutdown(self, _: Event):
async def async_shutdown(self, _: Event) -> None:
"""Shut down the AEH by queueing None and calling send."""
if self._next_send_remover:
self._next_send_remover()
@ -137,14 +141,13 @@ class AzureEventHub:
await self.queue.put((3, (time.monotonic(), None)))
await self.async_send(None)
async def async_listen(self, event: Event):
async def async_listen(self, event: Event) -> None:
"""Listen for new messages on the bus and queue them for AEH."""
await self.queue.put((2, (time.monotonic(), event)))
async def async_send(self, _):
async def async_send(self, _) -> None:
"""Write preprocessed events to eventhub, with retry."""
client = self._get_client()
async with client:
async with self._get_client() as client:
while not self.queue.empty():
data_batch, dequeue_count = await self.fill_batch(client)
_LOGGER.debug(
@ -160,14 +163,13 @@ class AzureEventHub:
finally:
for _ in range(dequeue_count):
self.queue.task_done()
await client.close()
if not self.shutdown:
self._next_send_remover = async_call_later(
self.hass, self._send_interval, self.async_send
)
async def fill_batch(self, client):
async def fill_batch(self, client) -> None:
"""Return a batch of events formatted for writing.
Uses get_nowait instead of await get, because the functions batches and doesn't wait for each single event, the send function is called.
@ -205,7 +207,7 @@ class AzureEventHub:
return event_batch, dequeue_count
def _event_to_filtered_event_data(self, event: Event):
def _event_to_filtered_event_data(self, event: Event) -> None:
"""Filter event states and create EventData object."""
state = event.data.get("new_state")
if (
@ -216,7 +218,7 @@ class AzureEventHub:
return None
return EventData(json.dumps(obj=state, cls=JSONEncoder).encode("utf-8"))
def _get_client(self):
def _get_client(self) -> EventHubProducerClient:
"""Get a Event Producer Client."""
if self._conn_str_client:
return EventHubProducerClient.from_connection_string(

2
homeassistant/components/azure_event_hub/manifest.json
View File

@ -2,7 +2,7 @@
"domain": "azure_event_hub",
"name": "Azure Event Hub",
"documentation": "https://www.home-assistant.io/integrations/azure_event_hub",
"requirements": ["azure-eventhub==5.1.0"],
"requirements": ["azure-eventhub==5.5.0"],
"codeowners": ["@eavanvalkenburg"],
"iot_class": "cloud_push"
}

2
requirements_all.txt
View File

@ -331,7 +331,7 @@ av==8.0.3
axis==44
# homeassistant.components.azure_event_hub
azure-eventhub==5.1.0
azure-eventhub==5.5.0
# homeassistant.components.azure_service_bus
azure-servicebus==0.50.3

2
requirements_test_all.txt
View File

@ -208,7 +208,7 @@ av==8.0.3
axis==44
# homeassistant.components.azure_event_hub
azure-eventhub==5.1.0
azure-eventhub==5.5.0
# homeassistant.components.homekit
base36==0.1.1