Portainer fix ephemeral coordinator ID (home-assistant#155056)

Author: erwindouna

homeassistant/components/portainer/binary_sensor.py

@@ -142,5 +142,5 @@ def available(self) -> bool:
     def is_on(self) -> bool | None:
         """Return true if the binary sensor is on."""
         return self.entity_description.state_fn(
-            self.coordinator.data[self.endpoint_id].containers[self.device_id]
+            self.coordinator.data[self.endpoint_id].containers[self.device_name]
         )

homeassistant/components/portainer/button.py

@@ -95,12 +95,7 @@ def __init__(
         self.entity_description = entity_description
         super().__init__(device_info, coordinator, via_device)
 
-        device_identifier = (
-            self._device_info.names[0].replace("/", " ").strip()
-            if self._device_info.names
-            else None
-        )
-        self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{device_identifier}_{entity_description.key}"
+        self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{self.device_name}_{entity_description.key}"
 
     async def async_press(self) -> None:
         """Trigger the Portainer button press service."""

homeassistant/components/portainer/coordinator.py

@@ -144,7 +144,10 @@ async def _async_update_data(self) -> dict[int, PortainerCoordinatorData]:
                 id=endpoint.id,
                 name=endpoint.name,
                 endpoint=endpoint,
-                containers={container.id: container for container in containers},
+                containers={
+                    container.names[0].replace("/", " ").strip(): container
+                    for container in containers
+                },
                 docker_version=docker_version,
                 docker_info=docker_info,
             )

homeassistant/components/portainer/sensor.py

@@ -212,7 +212,7 @@ def available(self) -> bool:
     def native_value(self) -> StateType:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(
-            self.coordinator.data[self.endpoint_id].containers[self.device_id]
+            self.coordinator.data[self.endpoint_id].containers[self.device_name]
         )
 
 

homeassistant/components/portainer/switch.py

@@ -123,7 +123,7 @@ def __init__(
     def is_on(self) -> bool | None:
         """Return the state of the device."""
         return self.entity_description.is_on_fn(
-            self.coordinator.data[self.endpoint_id].containers[self.device_id]
+            self.coordinator.data[self.endpoint_id].containers[self.device_name]
         )
 
     async def async_turn_on(self, **kwargs: Any) -> None: