From 45acd56861f3e498d919b751534b12005d0256ca Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:00:59 +0100
Subject: [PATCH] Remove YAML auth setup support from home_connect (#108072)
---
.../components/home_connect/__init__.py | 61 +------------------
.../home_connect/test_config_flow.py | 19 +++---
2 files changed, 11 insertions(+), 69 deletions(-)
diff --git a/homeassistant/components/home_connect/__init__.py b/homeassistant/components/home_connect/__init__.py
index 7377c4b60d0..79303725249 100644
--- a/homeassistant/components/home_connect/__init__.py
+++ b/homeassistant/components/home_connect/__init__.py
@@ -7,25 +7,14 @@ import logging
from requests import HTTPError
import voluptuous as vol
-from homeassistant.components.application_credentials import (
- ClientCredential,
- async_import_client_credential,
-)
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
- ATTR_DEVICE_ID,
- CONF_CLIENT_ID,
- CONF_CLIENT_SECRET,
- CONF_DEVICE,
- Platform,
-)
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.const import ATTR_DEVICE_ID, CONF_DEVICE, Platform
+from homeassistant.core import HomeAssistant
from homeassistant.helpers import (
config_entry_oauth2_flow,
config_validation as cv,
device_registry as dr,
)
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.typing import ConfigType
from homeassistant.util import Throttle
@@ -51,20 +40,7 @@ _LOGGER = logging.getLogger(__name__)
SCAN_INTERVAL = timedelta(minutes=1)
-CONFIG_SCHEMA = vol.Schema(
- vol.All(
- cv.deprecated(DOMAIN),
- {
- DOMAIN: vol.Schema(
- {
- vol.Required(CONF_CLIENT_ID): cv.string,
- vol.Required(CONF_CLIENT_SECRET): cv.string,
- }
- )
- },
- ),
- extra=vol.ALLOW_EXTRA,
-)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
SERVICE_SETTING_SCHEMA = vol.Schema(
{
@@ -118,37 +94,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
"""Set up Home Connect component."""
hass.data[DOMAIN] = {}
- if DOMAIN in config:
- await async_import_client_credential(
- hass,
- DOMAIN,
- ClientCredential(
- config[DOMAIN][CONF_CLIENT_ID],
- config[DOMAIN][CONF_CLIENT_SECRET],
- ),
- )
- _LOGGER.warning(
- "Configuration of Home Connect integration in YAML is deprecated and "
- "will be removed in a future release; Your existing OAuth "
- "Application Credentials have been imported into the UI "
- "automatically and can be safely removed from your "
- "configuration.yaml file"
- )
- async_create_issue(
- hass,
- HOMEASSISTANT_DOMAIN,
- f"deprecated_yaml_{DOMAIN}",
- breaks_in_ha_version="2024.2.0",
- is_fixable=False,
- issue_domain=DOMAIN,
- severity=IssueSeverity.WARNING,
- translation_key="deprecated_yaml",
- translation_placeholders={
- "domain": DOMAIN,
- "integration_title": "Home Connect",
- },
- )
-
async def _async_service_program(call, method):
"""Execute calls to services taking a program."""
program = call.data[ATTR_PROGRAM]
diff --git a/tests/components/home_connect/test_config_flow.py b/tests/components/home_connect/test_config_flow.py
index 9cd45f18270..209100c71b2 100644
--- a/tests/components/home_connect/test_config_flow.py
+++ b/tests/components/home_connect/test_config_flow.py
@@ -3,12 +3,15 @@ from http import HTTPStatus
from unittest.mock import patch
from homeassistant import config_entries, data_entry_flow, setup
+from homeassistant.components.application_credentials import (
+ ClientCredential,
+ async_import_client_credential,
+)
from homeassistant.components.home_connect.const import (
DOMAIN,
OAUTH2_AUTHORIZE,
OAUTH2_TOKEN,
)
-from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_entry_oauth2_flow
@@ -26,16 +29,10 @@ async def test_full_flow(
current_request_with_host: None,
) -> None:
"""Check full flow."""
- assert await setup.async_setup_component(
- hass,
- "home_connect",
- {
- "home_connect": {
- CONF_CLIENT_ID: CLIENT_ID,
- CONF_CLIENT_SECRET: CLIENT_SECRET,
- },
- "http": {"base_url": "https://example.com"},
- },
+ assert await setup.async_setup_component(hass, "home_connect", {})
+
+ await async_import_client_credential(
+ hass, DOMAIN, ClientCredential(CLIENT_ID, CLIENT_SECRET)
)
result = await hass.config_entries.flow.async_init(