Improve cloud migration (#92520)

* Improve cloud migration

* Tweak

* Use entity_ids func

---------

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>

homeassistant/components/alexa/config.py

@@ -3,7 +3,7 @@ from abc import ABC, abstractmethod
 import asyncio
 import logging
 
-from homeassistant.core import CALLBACK_TYPE, callback
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.storage import Store
 
 from .const import DOMAIN
@@ -19,7 +19,7 @@ class AbstractConfig(ABC):
 
     _unsub_proactive_report: asyncio.Task[CALLBACK_TYPE] | None = None
 
-    def __init__(self, hass):
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize abstract config."""
         self.hass = hass
         self._store = None

homeassistant/components/cloud/alexa_config.py

@@ -199,14 +199,10 @@ class CloudAlexaConfig(alexa_config.AbstractConfig):
             # Don't migrate if there's a YAML config
             return
 
-        for state in self.hass.states.async_all():
-            async_expose_entity(
-                self.hass,
-                CLOUD_ALEXA,
-                state.entity_id,
-                self._should_expose_legacy(state.entity_id),
-            )
-        for entity_id in self._prefs.alexa_entity_configs:
+        for entity_id in {
+            *self.hass.states.async_entity_ids(),
+            *self._prefs.alexa_entity_configs,
+        }:
             async_expose_entity(
                 self.hass,
                 CLOUD_ALEXA,

homeassistant/components/cloud/google_config.py

@@ -175,23 +175,10 @@ class CloudGoogleConfig(AbstractConfig):
             # Don't migrate if there's a YAML config
             return
 
-        for state in self.hass.states.async_all():
-            entity_id = state.entity_id
-            async_expose_entity(
-                self.hass,
-                CLOUD_GOOGLE,
-                entity_id,
-                self._should_expose_legacy(entity_id),
-            )
-            if _2fa_disabled := (self._2fa_disabled_legacy(entity_id) is not None):
-                async_set_assistant_option(
-                    self.hass,
-                    CLOUD_GOOGLE,
-                    entity_id,
-                    PREF_DISABLE_2FA,
-                    _2fa_disabled,
-                )
-        for entity_id in self._prefs.google_entity_configs:
+        for entity_id in {
+            *self.hass.states.async_entity_ids(),
+            *self._prefs.google_entity_configs,
+        }:
             async_expose_entity(
                 self.hass,
                 CLOUD_GOOGLE,