From 8f9167abbeda5d7e7c3243bf6677c4e0b4d781c3 Mon Sep 17 00:00:00 2001 From: Simone Chemelli Date: Wed, 27 Aug 2025 15:46:57 +0200 Subject: [PATCH] Followup async_migrate_entry fix for Alexa Devices (#151231) --- homeassistant/components/alexa_devices/__init__.py | 6 +++--- tests/components/alexa_devices/test_init.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/alexa_devices/__init__.py b/homeassistant/components/alexa_devices/__init__.py index 7a267579f98..7a4641bc51f 100644 --- a/homeassistant/components/alexa_devices/__init__.py +++ b/homeassistant/components/alexa_devices/__init__.py @@ -5,7 +5,7 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers import aiohttp_client, config_validation as cv from homeassistant.helpers.typing import ConfigType -from .const import _LOGGER, COUNTRY_DOMAINS, DOMAIN +from .const import _LOGGER, CONF_LOGIN_DATA, COUNTRY_DOMAINS, DOMAIN from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator from .services import async_setup_services @@ -51,9 +51,9 @@ async def async_migrate_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> country = entry.data[CONF_COUNTRY] domain = COUNTRY_DOMAINS.get(country, country) - # Save domain and remove country + # Add site to login data new_data = entry.data.copy() - new_data.update({"site": f"https://www.amazon.{domain}"}) + new_data[CONF_LOGIN_DATA]["site"] = f"https://www.amazon.{domain}" hass.config_entries.async_update_entry( entry, data=new_data, version=1, minor_version=2 diff --git a/tests/components/alexa_devices/test_init.py b/tests/components/alexa_devices/test_init.py index e809f002321..7055f8482cc 100644 --- a/tests/components/alexa_devices/test_init.py +++ b/tests/components/alexa_devices/test_init.py @@ -58,4 +58,7 @@ async def test_migrate_entry( assert len(hass.config_entries.async_entries(DOMAIN)) == 1 assert config_entry.state is ConfigEntryState.LOADED assert config_entry.minor_version == 2 - assert config_entry.data["site"] == f"https://www.amazon.{TEST_COUNTRY}" + assert ( + config_entry.data[CONF_LOGIN_DATA]["site"] + == f"https://www.amazon.{TEST_COUNTRY}" + )