evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow configuration_url to be removed/nullified from device registry (#58564)

Browse source 
* Allow configuration_url to be removed from device registry

* Add test

* Check for None before stringifying and url parsing

* Add type to dict to remove mypy error on assigning None
This commit is contained in:
Jesse Hills 2021-10-28 23:11:54 +13:00 • committed by GitHub
parent 6a3c23d02a
commit ea028e38d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
homeassistant/helpers/entity_platform.py
View file

@ -458,7 +458,9 @@ class EntityPlatform:
device_id = None
if config_entry_id is not None and device_info is not None:
processed_dev_info = {"config_entry_id": config_entry_id}
processed_dev_info: dict[str, str | None] = {
"config_entry_id": config_entry_id
}
for key in (
"connections",
"default_manufacturer",
@ -477,18 +479,21 @@ class EntityPlatform:
processed_dev_info[key] = device_info[key] # type: ignore[misc]
if "configuration_url" in device_info:
configuration_url = str(device_info["configuration_url"])
if urlparse(configuration_url).scheme in [
"http",
"https",
"homeassistant",
]:
processed_dev_info["configuration_url"] = configuration_url
if device_info["configuration_url"] is None:
processed_dev_info["configuration_url"] = None
else:
_LOGGER.warning(
"Ignoring invalid device configuration_url '%s'",
configuration_url,
)
configuration_url = str(device_info["configuration_url"])
if urlparse(configuration_url).scheme in [
"http",
"https",
"homeassistant",
]:
processed_dev_info["configuration_url"] = configuration_url
else:
_LOGGER.warning(
"Ignoring invalid device configuration_url '%s'",
configuration_url,
)
try:
device = device_registry.async_get_or_create(**processed_dev_info) # type: ignore[arg-type]