Freeze config entry data (#32615)
* Freeze config entry data * Fix mutating entry.data * Fix config entry options tests
This commit is contained in:
1 parent
3318e65948
commit
d4615fd432
16 files changed
+71
-45
No files matched your search
@@ -52,9 +52,9 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType):
|
||||
# Check if host needs to be updated
|
||||
entry = entries[0]
|
||||
if entry.data[CONF_HOST] != host:
|
||||
entry.data[CONF_HOST] = host
|
||||
entry.title = format_title(host)
|
||||
hass.config_entries.async_update_entry(entry)
|
||||
hass.config_entries.async_update_entry(
|
||||
entry, title=format_title(host), data={**entry.data, CONF_HOST: host}
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@@ -568,7 +568,7 @@ async def async_setup_entry(hass, entry):
|
||||
|
||||
# If user didn't have configuration.yaml config, generate defaults
|
||||
if conf is None:
|
||||
conf = CONFIG_SCHEMA({DOMAIN: entry.data})[DOMAIN]
|
||||
conf = CONFIG_SCHEMA({DOMAIN: dict(entry.data)})[DOMAIN]
|
||||
elif any(key in conf for key in entry.data):
|
||||
_LOGGER.warning(
|
||||
"Data in your configuration entry is going to override your "
|
||||
|
||||
@@ -227,7 +227,7 @@ class PlexOptionsFlowHandler(config_entries.OptionsFlow):
|
||||
|
||||
def __init__(self, config_entry):
|
||||
"""Initialize Plex options flow."""
|
||||
self.options = copy.deepcopy(config_entry.options)
|
||||
self.options = copy.deepcopy(dict(config_entry.options))
|
||||
self.server_id = config_entry.data[CONF_SERVER_IDENTIFIER]
|
||||
|
||||
async def async_step_init(self, user_input=None):
|
||||
|
||||
@@ -158,13 +158,14 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||
if self._id.startswith("uuid:"):
|
||||
self._id = self._id[5:]
|
||||
|
||||
config_entry = await self.async_set_unique_id(ip_address)
|
||||
if config_entry:
|
||||
config_entry.data[CONF_ID] = self._id
|
||||
config_entry.data[CONF_MANUFACTURER] = self._manufacturer
|
||||
config_entry.data[CONF_MODEL] = self._model
|
||||
self.hass.config_entries.async_update_entry(config_entry)
|
||||
return self.async_abort(reason="already_configured")
|
||||
await self.async_set_unique_id(ip_address)
|
||||
self._abort_if_unique_id_configured(
|
||||
{
|
||||
CONF_ID: self._id,
|
||||
CONF_MANUFACTURER: self._manufacturer,
|
||||
CONF_MODEL: self._model,
|
||||
}
|
||||
)
|
||||
|
||||
self.context["title_placeholders"] = {"model": self._model}
|
||||
return await self.async_step_confirm()
|
||||
|
||||
@@ -109,8 +109,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
|
||||
entry.data[CONF_OAUTH_CLIENT_SECRET],
|
||||
entry.data[CONF_REFRESH_TOKEN],
|
||||
)
|
||||
entry.data[CONF_REFRESH_TOKEN] = token.refresh_token
|
||||
hass.config_entries.async_update_entry(entry)
|
||||
hass.config_entries.async_update_entry(
|
||||
entry, data={**entry.data, CONF_REFRESH_TOKEN: token.refresh_token}
|
||||
)
|
||||
|
||||
# Get devices and their current status
|
||||
devices = await api.devices(location_ids=[installed_app.location_id])
|
||||
@@ -304,8 +305,13 @@ class DeviceBroker:
|
||||
self._entry.data[CONF_OAUTH_CLIENT_ID],
|
||||
self._entry.data[CONF_OAUTH_CLIENT_SECRET],
|
||||
)
|
||||
self._entry.data[CONF_REFRESH_TOKEN] = self._token.refresh_token
|
||||
self._hass.config_entries.async_update_entry(self._entry)
|
||||
self._hass.config_entries.async_update_entry(
|
||||
self._entry,
|
||||
data={
|
||||
**self._entry.data,
|
||||
CONF_REFRESH_TOKEN: self._token.refresh_token,
|
||||
},
|
||||
)
|
||||
_LOGGER.debug(
|
||||
"Regenerated refresh token for installed app: %s",
|
||||
self._installed_app_id,
|
||||
|
||||
@@ -428,8 +428,9 @@ async def smartapp_update(hass: HomeAssistantType, req, resp, app):
|
||||
None,
|
||||
)
|
||||
if entry:
|
||||
entry.data[CONF_REFRESH_TOKEN] = req.refresh_token
|
||||
hass.config_entries.async_update_entry(entry)
|
||||
hass.config_entries.async_update_entry(
|
||||
entry, data={**entry.data, CONF_REFRESH_TOKEN: req.refresh_token}
|
||||
)
|
||||
|
||||
_LOGGER.debug(
|
||||
"Updated SmartApp '%s' under parent app '%s'", req.installed_app_id, app.app_id
|
||||
|
||||
@@ -196,7 +196,7 @@ class TransmissionClient:
|
||||
def add_options(self):
|
||||
"""Add options for entry."""
|
||||
if not self.config_entry.options:
|
||||
scan_interval = self.config_entry.data.pop(
|
||||
scan_interval = self.config_entry.data.get(
|
||||
CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
|
||||
)
|
||||
options = {CONF_SCAN_INTERVAL: scan_interval}
|
||||
|
||||
@@ -151,9 +151,10 @@ async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry):
|
||||
return False
|
||||
|
||||
# 'register'/save UDN
|
||||
config_entry.data["udn"] = device.udn
|
||||
hass.data[DOMAIN]["devices"][device.udn] = device
|
||||
hass.config_entries.async_update_entry(entry=config_entry, data=config_entry.data)
|
||||
hass.config_entries.async_update_entry(
|
||||
entry=config_entry, data={**config_entry.data, "udn": device.udn}
|
||||
)
|
||||
|
||||
# create device registry entry
|
||||
device_registry = await dr.async_get_registry(hass)
|
||||
|
||||
Reference in new issue
Block a user