Remove IP / mDNS validation in airq integration setup (#106326)
Original design relied on aioairq.AirQ.__init__ checking if the input was a valid IP address or an mDNS of a very specific structure, and raising an InvalidInput otherwise. Now, aioairq==0.3.2 removes said check completely following a user's request to allow arbitrary host name and DNS entries. In the config flow, "cannot_connect" covers the cases of misspelled inputs now, which previously were covered by a dedicated "invalid_input"pull/106463/head
parent
d6d8e914bc
commit
1031e416be
|
@ -4,7 +4,7 @@ from __future__ import annotations
|
||||||
import logging
|
import logging
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from aioairq import AirQ, InvalidAuth, InvalidInput
|
from aioairq import AirQ, InvalidAuth
|
||||||
from aiohttp.client_exceptions import ClientConnectionError
|
from aiohttp.client_exceptions import ClientConnectionError
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
|
@ -42,15 +42,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||||
errors: dict[str, str] = {}
|
errors: dict[str, str] = {}
|
||||||
|
|
||||||
session = async_get_clientsession(self.hass)
|
session = async_get_clientsession(self.hass)
|
||||||
try:
|
|
||||||
airq = AirQ(user_input[CONF_IP_ADDRESS], user_input[CONF_PASSWORD], session)
|
airq = AirQ(user_input[CONF_IP_ADDRESS], user_input[CONF_PASSWORD], session)
|
||||||
except InvalidInput:
|
|
||||||
_LOGGER.debug(
|
|
||||||
"%s does not appear to be a valid IP address or mDNS name",
|
|
||||||
user_input[CONF_IP_ADDRESS],
|
|
||||||
)
|
|
||||||
errors["base"] = "invalid_input"
|
|
||||||
else:
|
|
||||||
try:
|
try:
|
||||||
await airq.validate()
|
await airq.validate()
|
||||||
except ClientConnectionError:
|
except ClientConnectionError:
|
||||||
|
@ -69,17 +61,13 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||||
)
|
)
|
||||||
errors["base"] = "invalid_auth"
|
errors["base"] = "invalid_auth"
|
||||||
else:
|
else:
|
||||||
_LOGGER.debug(
|
_LOGGER.debug("Successfully connected to %s", user_input[CONF_IP_ADDRESS])
|
||||||
"Successfully connected to %s", user_input[CONF_IP_ADDRESS]
|
|
||||||
)
|
|
||||||
|
|
||||||
device_info = await airq.fetch_device_info()
|
device_info = await airq.fetch_device_info()
|
||||||
await self.async_set_unique_id(device_info["id"])
|
await self.async_set_unique_id(device_info["id"])
|
||||||
self._abort_if_unique_id_configured()
|
self._abort_if_unique_id_configured()
|
||||||
|
|
||||||
return self.async_create_entry(
|
return self.async_create_entry(title=device_info["name"], data=user_input)
|
||||||
title=device_info["name"], data=user_input
|
|
||||||
)
|
|
||||||
|
|
||||||
return self.async_show_form(
|
return self.async_show_form(
|
||||||
step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
|
step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
|
||||||
|
|
|
@ -7,5 +7,5 @@
|
||||||
"integration_type": "hub",
|
"integration_type": "hub",
|
||||||
"iot_class": "local_polling",
|
"iot_class": "local_polling",
|
||||||
"loggers": ["aioairq"],
|
"loggers": ["aioairq"],
|
||||||
"requirements": ["aioairq==0.3.1"]
|
"requirements": ["aioairq==0.3.2"]
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,7 +185,7 @@ aio-geojson-usgs-earthquakes==0.2
|
||||||
aio-georss-gdacs==0.8
|
aio-georss-gdacs==0.8
|
||||||
|
|
||||||
# homeassistant.components.airq
|
# homeassistant.components.airq
|
||||||
aioairq==0.3.1
|
aioairq==0.3.2
|
||||||
|
|
||||||
# homeassistant.components.airzone_cloud
|
# homeassistant.components.airzone_cloud
|
||||||
aioairzone-cloud==0.3.6
|
aioairzone-cloud==0.3.6
|
||||||
|
|
|
@ -164,7 +164,7 @@ aio-geojson-usgs-earthquakes==0.2
|
||||||
aio-georss-gdacs==0.8
|
aio-georss-gdacs==0.8
|
||||||
|
|
||||||
# homeassistant.components.airq
|
# homeassistant.components.airq
|
||||||
aioairq==0.3.1
|
aioairq==0.3.2
|
||||||
|
|
||||||
# homeassistant.components.airzone_cloud
|
# homeassistant.components.airzone_cloud
|
||||||
aioairzone-cloud==0.3.6
|
aioairzone-cloud==0.3.6
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
"""Test the air-Q config flow."""
|
"""Test the air-Q config flow."""
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
from aioairq import DeviceInfo, InvalidAuth, InvalidInput
|
from aioairq import DeviceInfo, InvalidAuth
|
||||||
from aiohttp.client_exceptions import ClientConnectionError
|
from aiohttp.client_exceptions import ClientConnectionError
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
@ -80,21 +80,6 @@ async def test_form_cannot_connect(hass: HomeAssistant) -> None:
|
||||||
assert result2["errors"] == {"base": "cannot_connect"}
|
assert result2["errors"] == {"base": "cannot_connect"}
|
||||||
|
|
||||||
|
|
||||||
async def test_form_invalid_input(hass: HomeAssistant) -> None:
|
|
||||||
"""Test we handle cannot connect error."""
|
|
||||||
result = await hass.config_entries.flow.async_init(
|
|
||||||
DOMAIN, context={"source": config_entries.SOURCE_USER}
|
|
||||||
)
|
|
||||||
|
|
||||||
with patch("aioairq.AirQ.validate", side_effect=InvalidInput):
|
|
||||||
result2 = await hass.config_entries.flow.async_configure(
|
|
||||||
result["flow_id"], TEST_USER_DATA | {CONF_IP_ADDRESS: "invalid_ip"}
|
|
||||||
)
|
|
||||||
|
|
||||||
assert result2["type"] == FlowResultType.FORM
|
|
||||||
assert result2["errors"] == {"base": "invalid_input"}
|
|
||||||
|
|
||||||
|
|
||||||
async def test_duplicate_error(hass: HomeAssistant) -> None:
|
async def test_duplicate_error(hass: HomeAssistant) -> None:
|
||||||
"""Test that errors are shown when duplicates are added."""
|
"""Test that errors are shown when duplicates are added."""
|
||||||
MockConfigEntry(
|
MockConfigEntry(
|
||||||
|
|
Loading…
Reference in New Issue