From 301d642ad8ef531f70a4083ead6215cb2aae407f Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 5 May 2021 07:56:50 +0200
Subject: [PATCH] Clean up deprecation message & config schema from Cloudflare
 (#50079)

---
 .../components/cloudflare/__init__.py         | 43 ++-----------------
 tests/components/cloudflare/__init__.py       |  7 ---
 .../components/cloudflare/test_config_flow.py |  4 +-
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/homeassistant/components/cloudflare/__init__.py b/homeassistant/components/cloudflare/__init__.py
index abef32a4c5c..e461e34c9a2 100644
--- a/homeassistant/components/cloudflare/__init__.py
+++ b/homeassistant/components/cloudflare/__init__.py
@@ -10,11 +10,9 @@ from pycfdns.exceptions import (
     CloudflareConnectionException,
     CloudflareException,
 )
-import voluptuous as vol
 
-from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY, CONF_API_TOKEN, CONF_EMAIL, CONF_ZONE
+from homeassistant.const import CONF_API_TOKEN, CONF_ZONE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -31,43 +29,7 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.All(
-            cv.deprecated(CONF_EMAIL),
-            cv.deprecated(CONF_API_KEY),
-            cv.deprecated(CONF_ZONE),
-            cv.deprecated(CONF_RECORDS),
-            vol.Schema(
-                {
-                    vol.Optional(CONF_EMAIL): cv.string,
-                    vol.Optional(CONF_API_KEY): cv.string,
-                    vol.Optional(CONF_ZONE): cv.string,
-                    vol.Optional(CONF_RECORDS): vol.All(cv.ensure_list, [cv.string]),
-                }
-            ),
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-
-async def async_setup(hass: HomeAssistant, config: dict) -> bool:
-    """Set up the component."""
-    hass.data.setdefault(DOMAIN, {})
-
-    if len(hass.config_entries.async_entries(DOMAIN)) > 0:
-        return True
-
-    if DOMAIN in config and CONF_API_KEY in config[DOMAIN]:
-        persistent_notification.async_create(
-            hass,
-            "Cloudflare integration now requires an API Token. Please go to the integrations page to setup.",
-            "Cloudflare Setup",
-            "cloudflare_setup",
-        )
-
-    return True
+CONFIG_SCHEMA = cv.deprecated(DOMAIN)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -104,6 +66,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     update_interval = timedelta(minutes=DEFAULT_UPDATE_INTERVAL)
     undo_interval = async_track_time_interval(hass, update_records, update_interval)
 
+    hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         DATA_UNDO_UPDATE_INTERVAL: undo_interval,
     }
diff --git a/tests/components/cloudflare/__init__.py b/tests/components/cloudflare/__init__.py
index 60ce0f055d5..0e4e07b91cc 100644
--- a/tests/components/cloudflare/__init__.py
+++ b/tests/components/cloudflare/__init__.py
@@ -88,13 +88,6 @@ def _get_mock_cfupdate(
     return client
 
 
-def _patch_async_setup(return_value=True):
-    return patch(
-        "homeassistant.components.cloudflare.async_setup",
-        return_value=return_value,
-    )
-
-
 def _patch_async_setup_entry(return_value=True):
     return patch(
         "homeassistant.components.cloudflare.async_setup_entry",
diff --git a/tests/components/cloudflare/test_config_flow.py b/tests/components/cloudflare/test_config_flow.py
index abdd69269f5..00dbb5e47df 100644
--- a/tests/components/cloudflare/test_config_flow.py
+++ b/tests/components/cloudflare/test_config_flow.py
@@ -20,7 +20,6 @@ from . import (
     USER_INPUT,
     USER_INPUT_RECORDS,
     USER_INPUT_ZONE,
-    _patch_async_setup,
     _patch_async_setup_entry,
 )
 
@@ -58,7 +57,7 @@ async def test_user_form(hass, cfupdate_flow):
     assert result["step_id"] == "records"
     assert result["errors"] == {}
 
-    with _patch_async_setup() as mock_setup, _patch_async_setup_entry() as mock_setup_entry:
+    with _patch_async_setup_entry() as mock_setup_entry:
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             USER_INPUT_RECORDS,
@@ -76,7 +75,6 @@ async def test_user_form(hass, cfupdate_flow):
     assert result["result"]
     assert result["result"].unique_id == USER_INPUT_ZONE[CONF_ZONE]
 
-    assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1