Improved error handling for oauth2 configuration in tesla_fleet integration (home-assistant#156219)

Author: wmoss

homeassistant/components/tesla_fleet/__init__.py

@@ -23,6 +23,7 @@
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -61,6 +62,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
 
     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
     except ValueError as e:
         # Remove invalid implementation from config entry then raise AuthFailed
         hass.config_entries.async_update_entry(

homeassistant/components/tesla_fleet/strings.json

@@ -609,6 +609,9 @@
     "no_cable": {
       "message": "Charge cable will lock automatically when connected"
     },
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    },
     "update_failed": {
       "message": "{endpoint} data request failed: {message}"
     }

tests/components/tesla_fleet/test_init.py

@@ -35,6 +35,9 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
+)
 
 from . import setup_platform
 from .conftest import create_config_entry
@@ -561,3 +564,20 @@ async def test_vehicle_with_location_scope(
     assert VehicleDataEndpoint.DRIVE_STATE in endpoints
     assert VehicleDataEndpoint.VEHICLE_STATE in endpoints
     assert VehicleDataEndpoint.VEHICLE_CONFIG in endpoints
+
+
+async def test_oauth_implementation_not_available(
+    hass: HomeAssistant,
+    normal_config_entry: MockConfigEntry,
+) -> None:
+    """Test that unavailable OAuth implementation raises ConfigEntryNotReady."""
+    normal_config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.tesla_fleet.async_get_config_entry_implementation",
+        side_effect=ImplementationUnavailableError,
+    ):
+        await hass.config_entries.async_setup(normal_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert normal_config_entry.state is ConfigEntryState.SETUP_RETRY