Handle ImplementationUnavailableError at Home Connect (#156105)

homeassistant/components/home_connect/__init__.py

@@ -12,10 +12,11 @@ import jwt
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import (
-    config_entry_oauth2_flow,
-    config_validation as cv,
-    issue_registry as ir,
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
+    OAuth2Session,
+    async_get_config_entry_implementation,
 )
 from homeassistant.helpers.entity_registry import RegistryEntry, async_migrate_entries
 from homeassistant.helpers.typing import ConfigType
@@ -48,13 +49,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistant, entry: HomeConnectConfigEntry) -> bool:
     """Set up Home Connect from a config entry."""
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
-        )
-    )
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
 
-    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
+    session = OAuth2Session(hass, entry, implementation)
 
     config_entry_auth = AsyncConfigEntryAuth(hass, session)
     try:

homeassistant/components/home_connect/strings.json

@@ -1236,6 +1236,9 @@
     "fetch_api_error": {
       "message": "Error obtaining data from the API: {error}"
     },
+    "oauth2_implementation_unavailable": {
+      "message": "OAuth2 implementation temporarily unavailable, will retry"
+    },
     "pause_program": {
       "message": "Error pausing program: {error}"
     },

tests/components/home_connect/test_init.py

@@ -25,6 +25,9 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
+)
 from script.hassfest.translations import RE_TRANSLATION_KEY
 
 from .conftest import (
@@ -111,6 +114,20 @@ async def test_token_refresh_success(
     )
 
 
+async def test_setup_implementation_unavailable(
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+) -> None:
+    """Test setup when OAuth2 implementation is unavailable."""
+
+    with patch(
+        "homeassistant.components.home_connect.async_get_config_entry_implementation",
+        side_effect=ImplementationUnavailableError,
+    ):
+        assert not await integration_setup(MagicMock())
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
 @pytest.mark.parametrize("token_expiration_time", [12345])
 @pytest.mark.parametrize(
     ("aioclient_mock_args", "expected_config_entry_state"),