From de628602c2c8dd1dd4f3ee7cf88c579e1e216e3c Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Mon, 4 May 2020 05:28:32 -0700 Subject: [PATCH] Remove `certificate` configuration variable from roomba (#35162) * Remove certificate option from roomba * Fix roomba test * Add back certificate with deprecated flag * Remove invalidation_version --- homeassistant/components/roomba/__init__.py | 22 ++++++++++--------- .../components/roomba/config_flow.py | 4 ---- homeassistant/components/roomba/manifest.json | 2 +- homeassistant/components/roomba/strings.json | 1 - requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/roomba/test_config_flow.py | 4 ---- 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/roomba/__init__.py b/homeassistant/components/roomba/__init__.py index 28092f96477..a9efa1f24ab 100644 --- a/homeassistant/components/roomba/__init__.py +++ b/homeassistant/components/roomba/__init__.py @@ -40,15 +40,18 @@ def _has_all_unique_bilds(value): return value -DEVICE_SCHEMA = vol.Schema( - { - vol.Required(CONF_HOST): str, - vol.Required(CONF_BLID): str, - vol.Required(CONF_PASSWORD): str, - vol.Optional(CONF_CERT, default=DEFAULT_CERT): str, - vol.Optional(CONF_CONTINUOUS, default=DEFAULT_CONTINUOUS): bool, - vol.Optional(CONF_DELAY, default=DEFAULT_DELAY): int, - }, +DEVICE_SCHEMA = vol.All( + cv.deprecated(CONF_CERT), + vol.Schema( + { + vol.Required(CONF_HOST): str, + vol.Required(CONF_BLID): str, + vol.Required(CONF_PASSWORD): str, + vol.Optional(CONF_CERT, default=DEFAULT_CERT): str, + vol.Optional(CONF_CONTINUOUS, default=DEFAULT_CONTINUOUS): bool, + vol.Optional(CONF_DELAY, default=DEFAULT_DELAY): int, + }, + ), ) @@ -92,7 +95,6 @@ async def async_setup_entry(hass, config_entry): address=config_entry.data[CONF_HOST], blid=config_entry.data[CONF_BLID], password=config_entry.data[CONF_PASSWORD], - cert_name=config_entry.data[CONF_CERT], continuous=config_entry.options[CONF_CONTINUOUS], delay=config_entry.options[CONF_DELAY], ) diff --git a/homeassistant/components/roomba/config_flow.py b/homeassistant/components/roomba/config_flow.py index e323150fba3..cffbb3de4c9 100644 --- a/homeassistant/components/roomba/config_flow.py +++ b/homeassistant/components/roomba/config_flow.py @@ -11,11 +11,9 @@ from homeassistant.core import callback from . import CannotConnect, async_connect_or_timeout, async_disconnect_or_timeout from .const import ( CONF_BLID, - CONF_CERT, CONF_CONTINUOUS, CONF_DELAY, CONF_NAME, - DEFAULT_CERT, DEFAULT_CONTINUOUS, DEFAULT_DELAY, ROOMBA_SESSION, @@ -27,7 +25,6 @@ DATA_SCHEMA = vol.Schema( vol.Required(CONF_HOST): str, vol.Required(CONF_BLID): str, vol.Required(CONF_PASSWORD): str, - vol.Optional(CONF_CERT, default=DEFAULT_CERT): str, vol.Optional(CONF_CONTINUOUS, default=DEFAULT_CONTINUOUS): bool, vol.Optional(CONF_DELAY, default=DEFAULT_DELAY): int, } @@ -45,7 +42,6 @@ async def validate_input(hass: core.HomeAssistant, data): address=data[CONF_HOST], blid=data[CONF_BLID], password=data[CONF_PASSWORD], - cert_name=data[CONF_CERT], continuous=data[CONF_CONTINUOUS], delay=data[CONF_DELAY], ) diff --git a/homeassistant/components/roomba/manifest.json b/homeassistant/components/roomba/manifest.json index b9e521ffc12..45fe9133bca 100644 --- a/homeassistant/components/roomba/manifest.json +++ b/homeassistant/components/roomba/manifest.json @@ -3,7 +3,7 @@ "name": "iRobot Roomba", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/roomba", - "requirements": ["roombapy==1.5.2"], + "requirements": ["roombapy==1.5.3"], "dependencies": [], "codeowners": ["@pschmitt", "@cyr-ius", "@shenxn"] } diff --git a/homeassistant/components/roomba/strings.json b/homeassistant/components/roomba/strings.json index c15c5f5893a..3dc904f2b94 100644 --- a/homeassistant/components/roomba/strings.json +++ b/homeassistant/components/roomba/strings.json @@ -8,7 +8,6 @@ "host": "Hostname or IP Address", "blid": "BLID", "password": "Password", - "certificate": "Certificate", "continuous": "Continuous", "delay": "Delay" } diff --git a/requirements_all.txt b/requirements_all.txt index 92a2d367a9e..f2fc3fc3cbe 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1840,7 +1840,7 @@ rocketchat-API==0.6.1 roku==4.1.0 # homeassistant.components.roomba -roombapy==1.5.2 +roombapy==1.5.3 # homeassistant.components.rova rova==0.1.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index e64011750c9..8a870158e0b 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -719,7 +719,7 @@ ring_doorbell==0.6.0 roku==4.1.0 # homeassistant.components.roomba -roombapy==1.5.2 +roombapy==1.5.3 # homeassistant.components.yamaha rxv==0.6.0 diff --git a/tests/components/roomba/test_config_flow.py b/tests/components/roomba/test_config_flow.py index 0941586f788..197ad56f415 100644 --- a/tests/components/roomba/test_config_flow.py +++ b/tests/components/roomba/test_config_flow.py @@ -4,7 +4,6 @@ from roomba import RoombaConnectionError from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.roomba.const import ( CONF_BLID, - CONF_CERT, CONF_CONTINUOUS, CONF_DELAY, DOMAIN, @@ -20,7 +19,6 @@ VALID_YAML_CONFIG = { CONF_HOST: "1.2.3.4", CONF_BLID: "blid", CONF_PASSWORD: "password", - CONF_CERT: "/etc/ssl/certs/ca-certificates.crt", CONF_CONTINUOUS: True, CONF_DELAY: 1, } @@ -69,7 +67,6 @@ async def test_form(hass): assert result2["result"].unique_id == "blid" assert result2["data"] == { CONF_BLID: "blid", - CONF_CERT: "/etc/ssl/certs/ca-certificates.crt", CONF_CONTINUOUS: True, CONF_DELAY: 1, CONF_HOST: "1.2.3.4", @@ -131,7 +128,6 @@ async def test_form_import(hass): assert result["title"] == "imported_roomba" assert result["data"] == { CONF_BLID: "blid", - CONF_CERT: "/etc/ssl/certs/ca-certificates.crt", CONF_CONTINUOUS: True, CONF_DELAY: 1, CONF_HOST: "1.2.3.4",