From 200eb9a63d1ea7da8389c8b7ab7cd18d95d682b4 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sun, 9 Feb 2025 17:33:05 +0100 Subject: [PATCH] Explicitly pass in the config_entry in minecraft_server coordinator (#138086) explicitly pass in the config_entry in coordinator --- .../components/minecraft_server/__init__.py | 11 ++--------- .../components/minecraft_server/coordinator.py | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/minecraft_server/__init__.py b/homeassistant/components/minecraft_server/__init__.py index f1392ea488a..55bf96a7b89 100644 --- a/homeassistant/components/minecraft_server/__init__.py +++ b/homeassistant/components/minecraft_server/__init__.py @@ -10,14 +10,7 @@ import dns.rdataclass import dns.rdatatype from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ( - CONF_ADDRESS, - CONF_HOST, - CONF_NAME, - CONF_PORT, - CONF_TYPE, - Platform, -) +from homeassistant.const import CONF_ADDRESS, CONF_HOST, CONF_PORT, CONF_TYPE, Platform from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers import device_registry as dr, entity_registry as er @@ -58,7 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: raise ConfigEntryNotReady(f"Initialization failed: {error}") from error # Create coordinator instance. - coordinator = MinecraftServerCoordinator(hass, entry.data[CONF_NAME], api) + coordinator = MinecraftServerCoordinator(hass, entry, api) await coordinator.async_config_entry_first_refresh() # Store coordinator instance. diff --git a/homeassistant/components/minecraft_server/coordinator.py b/homeassistant/components/minecraft_server/coordinator.py index 37eeb9f2ac2..f66e4acf214 100644 --- a/homeassistant/components/minecraft_server/coordinator.py +++ b/homeassistant/components/minecraft_server/coordinator.py @@ -5,6 +5,8 @@ from __future__ import annotations from datetime import timedelta import logging +from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_NAME from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed @@ -23,13 +25,21 @@ _LOGGER = logging.getLogger(__name__) class MinecraftServerCoordinator(DataUpdateCoordinator[MinecraftServerData]): """Minecraft Server data update coordinator.""" - def __init__(self, hass: HomeAssistant, name: str, api: MinecraftServer) -> None: + config_entry: ConfigEntry + + def __init__( + self, + hass: HomeAssistant, + config_entry: ConfigEntry, + api: MinecraftServer, + ) -> None: """Initialize coordinator instance.""" self._api = api super().__init__( hass=hass, - name=name, + name=config_entry.data[CONF_NAME], + config_entry=config_entry, logger=_LOGGER, update_interval=SCAN_INTERVAL, )