Use runtime_data in ialarm (#145178)

homeassistant/components/ialarm/__init__.py

@@ -6,18 +6,16 @@ import asyncio
 
 from pyialarm import IAlarm
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import IAlarmDataUpdateCoordinator
+from .coordinator import IAlarmConfigEntry, IAlarmDataUpdateCoordinator
 
 PLATFORMS = [Platform.ALARM_CONTROL_PANEL]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: IAlarmConfigEntry) -> bool:
     """Set up iAlarm config."""
     host: str = entry.data[CONF_HOST]
     port: int = entry.data[CONF_PORT]
@@ -32,20 +30,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = IAlarmDataUpdateCoordinator(hass, entry, ialarm, mac)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})
-
-    hass.data[DOMAIN][entry.entry_id] = {
-        DATA_COORDINATOR: coordinator,
-    }
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: IAlarmConfigEntry) -> bool:
     """Unload iAlarm config."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/ialarm/alarm_control_panel.py

@@ -7,26 +7,22 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntityFeature,
     AlarmControlPanelState,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import IAlarmDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import IAlarmConfigEntry, IAlarmDataUpdateCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: IAlarmConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a iAlarm alarm control panel based on a config entry."""
-    coordinator: IAlarmDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
-    async_add_entities([IAlarmPanel(coordinator)], False)
+    async_add_entities([IAlarmPanel(entry.runtime_data)], False)
 
 
 class IAlarmPanel(

homeassistant/components/ialarm/const.py

@@ -4,8 +4,6 @@ from pyialarm import IAlarm
 
 from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 
-DATA_COORDINATOR = "ialarm"
-
 DEFAULT_PORT = 18034
 
 DOMAIN = "ialarm"

homeassistant/components/ialarm/coordinator.py

@@ -19,14 +19,20 @@ from .const import DOMAIN, IALARM_TO_HASS
 
 _LOGGER = logging.getLogger(__name__)
 
+type IAlarmConfigEntry = ConfigEntry[IAlarmDataUpdateCoordinator]
+
 
 class IAlarmDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching iAlarm data."""
 
-    config_entry: ConfigEntry
+    config_entry: IAlarmConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: ConfigEntry, ialarm: IAlarm, mac: str
+        self,
+        hass: HomeAssistant,
+        config_entry: IAlarmConfigEntry,
+        ialarm: IAlarm,
+        mac: str,
     ) -> None:
         """Initialize global iAlarm data updater."""
         self.ialarm = ialarm