From f643f76f1f39041a31e8f3290c1ec1a87df50add Mon Sep 17 00:00:00 2001
From: Michael <35783820+mib1185@users.noreply.github.com>
Date: Sat, 8 Feb 2025 22:03:40 +0100
Subject: [PATCH] Explicitly pass in the config_entry in upnp coordinator
 (#137885)

explicitly pass in the config_entry in coordinator
---
 homeassistant/components/upnp/__init__.py      | 9 +++------
 homeassistant/components/upnp/binary_sensor.py | 2 +-
 homeassistant/components/upnp/coordinator.py   | 7 +++++++
 homeassistant/components/upnp/sensor.py        | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/upnp/__init__.py b/homeassistant/components/upnp/__init__.py
index aacb7538b61..757cad221b5 100644
--- a/homeassistant/components/upnp/__init__.py
+++ b/homeassistant/components/upnp/__init__.py
@@ -8,7 +8,6 @@ from datetime import timedelta
 from async_upnp_client.exceptions import UpnpConnectionError
 
 from homeassistant.components import ssdp
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -28,7 +27,7 @@ from .const import (
     IDENTIFIER_SERIAL_NUMBER,
     LOGGER,
 )
-from .coordinator import UpnpDataUpdateCoordinator
+from .coordinator import UpnpConfigEntry, UpnpDataUpdateCoordinator
 from .device import async_create_device, get_preferred_location
 
 NOTIFICATION_ID = "upnp_notification"
@@ -37,9 +36,6 @@ NOTIFICATION_TITLE = "UPnP/IGD Setup"
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 
-type UpnpConfigEntry = ConfigEntry[UpnpDataUpdateCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool:
     """Set up UPnP/IGD device from a config entry."""
     LOGGER.debug("Setting up config entry: %s", entry.entry_id)
@@ -176,6 +172,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool
     update_interval = timedelta(seconds=DEFAULT_SCAN_INTERVAL)
     coordinator = UpnpDataUpdateCoordinator(
         hass,
+        config_entry=entry,
         device=device,
         device_entry=device_entry,
         update_interval=update_interval,
@@ -193,7 +190,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool:
     """Unload a UPnP/IGD device from a config entry."""
     LOGGER.debug("Unloading config entry: %s", entry.entry_id)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/upnp/binary_sensor.py b/homeassistant/components/upnp/binary_sensor.py
index fb32946bf7d..1576cccac6a 100644
--- a/homeassistant/components/upnp/binary_sensor.py
+++ b/homeassistant/components/upnp/binary_sensor.py
@@ -13,8 +13,8 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import UpnpConfigEntry, UpnpDataUpdateCoordinator
 from .const import LOGGER, WAN_STATUS
+from .coordinator import UpnpConfigEntry, UpnpDataUpdateCoordinator
 from .entity import UpnpEntity, UpnpEntityDescription
 
 
diff --git a/homeassistant/components/upnp/coordinator.py b/homeassistant/components/upnp/coordinator.py
index 37ff700bfe2..03e4c53f143 100644
--- a/homeassistant/components/upnp/coordinator.py
+++ b/homeassistant/components/upnp/coordinator.py
@@ -6,6 +6,7 @@ from datetime import datetime, timedelta
 
 from async_upnp_client.exceptions import UpnpCommunicationError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -13,15 +14,20 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 from .const import LOGGER
 from .device import Device
 
+type UpnpConfigEntry = ConfigEntry[UpnpDataUpdateCoordinator]
+
 
 class UpnpDataUpdateCoordinator(
     DataUpdateCoordinator[dict[str, str | datetime | int | float | None]]
 ):
     """Define an object to update data from UPNP device."""
 
+    config_entry: UpnpConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: UpnpConfigEntry,
         device: Device,
         device_entry: DeviceEntry,
         update_interval: timedelta,
@@ -34,6 +40,7 @@ class UpnpDataUpdateCoordinator(
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=device.name,
             update_interval=update_interval,
         )
diff --git a/homeassistant/components/upnp/sensor.py b/homeassistant/components/upnp/sensor.py
index aae2f8308c1..c0e77315f77 100644
--- a/homeassistant/components/upnp/sensor.py
+++ b/homeassistant/components/upnp/sensor.py
@@ -20,7 +20,6 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import UpnpConfigEntry
 from .const import (
     BYTES_RECEIVED,
     BYTES_SENT,
@@ -38,6 +37,7 @@ from .const import (
     ROUTER_UPTIME,
     WAN_STATUS,
 )
+from .coordinator import UpnpConfigEntry
 from .entity import UpnpEntity, UpnpEntityDescription