starred/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-08-24 10:13:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename instead of delete-guarding for user unique_id migration

Browse Source 
Migrating to a user-defined unique_id only needs a registry rename, which
preserves the entry's history and settings. Do that rename directly instead of
reusing the delete-capable legacy migration helper and guarding around it: on a
target collision keep the generated id, never deleting anything in the user path.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
farmio
2026-08-12 20:38:07 +02:00
co-authored by Claude Opus 4.8
parent a114c90259
commit 4f59e9726c
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
homeassistant/components/knx/entity.py
+25 -18
View File
@@ -203,26 +203,33 @@ class KnxYamlEntity(_KnxEntityBase):
async_migrate_yaml_unique_id(
knx_module.hass, platform, legacy_unique_id, new_unique_id
)
if user_unique_id := entity_config.get(CONF_UNIQUE_ID):
if (user_unique_id := entity_config.get(CONF_UNIQUE_ID)) and (
user_unique_id != new_unique_id
):
ent_reg = er.async_get(knx_module.hass)
if ent_reg.async_get_entity_id(
platform, DOMAIN, user_unique_id
) and ent_reg.async_get_entity_id(platform, DOMAIN, new_unique_id):
# The user id already belongs to a different entity. Migrating
# would delete this entity's registry entry (history, settings),
# so keep the generated id - the duplicate surfaces at add time.
_LOGGER.warning(
"Configured `unique_id: %s` for %s entity '%s' is already in"
" use; keeping the generated unique id instead",
user_unique_id,
platform,
entity_config[CONF_NAME],
)
else:
async_migrate_yaml_unique_id(
knx_module.hass, platform, new_unique_id, user_unique_id
)
generated_entity_id = ent_reg.async_get_entity_id(
platform, DOMAIN, new_unique_id
)
if generated_entity_id is None:
# new entity, or already migrated on an earlier run
new_unique_id = user_unique_id
else:
try:
# rename the existing entry, preserving history and settings
ent_reg.async_update_entity(
generated_entity_id, new_unique_id=user_unique_id
)
except ValueError:
# id already belongs to another entity - keep the generated one
_LOGGER.warning(
"Configured `unique_id: %s` for %s entity '%s' is already"
" in use; keeping the generated unique id instead",
user_unique_id,
platform,
entity_config[CONF_NAME],
)
else:
new_unique_id = user_unique_id
self._knx_module = knx_module
self._attr_name = entity_config[CONF_NAME] or None
self._attr_unique_id = new_unique_id