From a4b8b4f7c27ad9efa4752cec40170208cf12055d Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Thu, 1 Jun 2023 11:42:14 +0200 Subject: [PATCH] Add config entry only config schema to integrations a-r (#93899) --- homeassistant/components/discord/__init__.py | 4 +++- homeassistant/components/flux_led/__init__.py | 8 +++++++- homeassistant/components/google_assistant_sdk/__init__.py | 2 ++ homeassistant/components/google_mail/__init__.py | 4 +++- homeassistant/components/homekit_controller/__init__.py | 6 ++++-- homeassistant/components/mjpeg/__init__.py | 5 ++++- homeassistant/components/plex/__init__.py | 8 +++++++- homeassistant/components/ps4/__init__.py | 2 ++ homeassistant/components/pushbullet/__init__.py | 4 +++- homeassistant/components/pushover/__init__.py | 4 +++- 10 files changed, 38 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/discord/__init__.py b/homeassistant/components/discord/__init__.py index a52c079ac8e..be6907c4690 100644 --- a/homeassistant/components/discord/__init__.py +++ b/homeassistant/components/discord/__init__.py @@ -6,13 +6,15 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_API_TOKEN, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady -from homeassistant.helpers import discovery +from homeassistant.helpers import config_validation as cv, discovery from homeassistant.helpers.typing import ConfigType from .const import DATA_HASS_CONFIG, DOMAIN PLATFORMS = [Platform.NOTIFY] +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up the Discord component.""" diff --git a/homeassistant/components/flux_led/__init__.py b/homeassistant/components/flux_led/__init__.py index 94f50caa1a2..8f141564884 100644 --- a/homeassistant/components/flux_led/__init__.py +++ b/homeassistant/components/flux_led/__init__.py @@ -14,7 +14,11 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_STARTED, Platform from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryNotReady -from homeassistant.helpers import device_registry as dr, entity_registry as er +from homeassistant.helpers import ( + config_validation as cv, + device_registry as dr, + entity_registry as er, +) from homeassistant.helpers.dispatcher import ( async_dispatcher_connect, async_dispatcher_send, @@ -71,6 +75,8 @@ NAME_TO_WHITE_CHANNEL_TYPE: Final = { option.name.lower(): option for option in WhiteChannelType } +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + @callback def async_wifi_bulb_for_host( diff --git a/homeassistant/components/google_assistant_sdk/__init__.py b/homeassistant/components/google_assistant_sdk/__init__.py index 7a9ca70bf14..1542de35e01 100644 --- a/homeassistant/components/google_assistant_sdk/__init__.py +++ b/homeassistant/components/google_assistant_sdk/__init__.py @@ -44,6 +44,8 @@ SERVICE_SEND_TEXT_COMMAND_SCHEMA = vol.All( }, ) +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up Google Assistant SDK component.""" diff --git a/homeassistant/components/google_mail/__init__.py b/homeassistant/components/google_mail/__init__.py index a24d5c17874..c6053275a6e 100644 --- a/homeassistant/components/google_mail/__init__.py +++ b/homeassistant/components/google_mail/__init__.py @@ -7,7 +7,7 @@ from homeassistant.config_entries import ConfigEntry, ConfigEntryState from homeassistant.const import CONF_NAME, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady -from homeassistant.helpers import discovery +from homeassistant.helpers import config_validation as cv, discovery from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.config_entry_oauth2_flow import ( OAuth2Session, @@ -21,6 +21,8 @@ from .services import async_setup_services PLATFORMS = [Platform.NOTIFY, Platform.SENSOR] +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up the Google Mail platform.""" diff --git a/homeassistant/components/homekit_controller/__init__.py b/homeassistant/components/homekit_controller/__init__.py index ecd8113a2bb..93cc1d5a6ff 100644 --- a/homeassistant/components/homekit_controller/__init__.py +++ b/homeassistant/components/homekit_controller/__init__.py @@ -16,16 +16,18 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_IDENTIFIERS, EVENT_HOMEASSISTANT_STOP from homeassistant.core import Event, HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady -from homeassistant.helpers import device_registry as dr +from homeassistant.helpers import config_validation as cv, device_registry as dr from homeassistant.helpers.typing import ConfigType from .config_flow import normalize_hkid from .connection import HKDevice -from .const import KNOWN_DEVICES +from .const import DOMAIN, KNOWN_DEVICES from .utils import async_get_controller _LOGGER = logging.getLogger(__name__) +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Set up a HomeKit connection on a config entry.""" diff --git a/homeassistant/components/mjpeg/__init__.py b/homeassistant/components/mjpeg/__init__.py index 27131d9d18f..9492b595adb 100644 --- a/homeassistant/components/mjpeg/__init__.py +++ b/homeassistant/components/mjpeg/__init__.py @@ -2,10 +2,11 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant +from homeassistant.helpers import config_validation as cv from homeassistant.helpers.typing import ConfigType from .camera import MjpegCamera -from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, PLATFORMS +from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, DOMAIN, PLATFORMS from .util import filter_urllib3_logging __all__ = [ @@ -15,6 +16,8 @@ __all__ = [ "filter_urllib3_logging", ] +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up the MJPEG IP Camera integration.""" diff --git a/homeassistant/components/plex/__init__.py b/homeassistant/components/plex/__init__.py index 59ae14b8ca9..3c49c0112c0 100644 --- a/homeassistant/components/plex/__init__.py +++ b/homeassistant/components/plex/__init__.py @@ -18,7 +18,11 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_URL, CONF_VERIFY_SSL, EVENT_HOMEASSISTANT_STOP from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady -from homeassistant.helpers import device_registry as dr, entity_registry as er +from homeassistant.helpers import ( + config_validation as cv, + device_registry as dr, + entity_registry as er, +) from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.debounce import Debouncer from homeassistant.helpers.dispatcher import ( @@ -54,6 +58,8 @@ from .view import PlexImageView _LOGGER = logging.getLogger(__package__) +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + def is_plex_media_id(media_content_id): """Return whether the media_content_id is a valid Plex media_id.""" diff --git a/homeassistant/components/ps4/__init__.py b/homeassistant/components/ps4/__init__.py index 0f5c57c5e4c..30c7d475196 100644 --- a/homeassistant/components/ps4/__init__.py +++ b/homeassistant/components/ps4/__init__.py @@ -53,6 +53,8 @@ PS4_COMMAND_SCHEMA = vol.Schema( PLATFORMS = [Platform.MEDIA_PLAYER] +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + class PS4Data: """Init Data Class.""" diff --git a/homeassistant/components/pushbullet/__init__.py b/homeassistant/components/pushbullet/__init__.py index bed0e94ccd9..276842df56c 100644 --- a/homeassistant/components/pushbullet/__init__.py +++ b/homeassistant/components/pushbullet/__init__.py @@ -14,7 +14,7 @@ from homeassistant.const import ( ) from homeassistant.core import Event, HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady -from homeassistant.helpers import discovery +from homeassistant.helpers import config_validation as cv, discovery from homeassistant.helpers.typing import ConfigType from .api import PushBulletNotificationProvider @@ -24,6 +24,8 @@ PLATFORMS = [Platform.SENSOR] _LOGGER = logging.getLogger(__name__) +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up the pushbullet component.""" diff --git a/homeassistant/components/pushover/__init__.py b/homeassistant/components/pushover/__init__.py index 551e374fbb6..77a6ffbb1ba 100644 --- a/homeassistant/components/pushover/__init__.py +++ b/homeassistant/components/pushover/__init__.py @@ -7,13 +7,15 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady -from homeassistant.helpers import discovery +from homeassistant.helpers import config_validation as cv, discovery from homeassistant.helpers.typing import ConfigType from .const import CONF_USER_KEY, DATA_HASS_CONFIG, DOMAIN PLATFORMS = [Platform.NOTIFY] +CONFIG_SCHEMA = cv.no_yaml_config_schema(DOMAIN) + async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up the pushover component."""