From f4b124f5f15f3df7474ed76027db2ddf0f318193 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:17:38 +0200
Subject: [PATCH] Fix invalid schemas (#120450)

---
 homeassistant/components/elkm1/__init__.py    |  2 +-
 .../components/mobile_app/webhook.py          | 24 ++++++++++---------
 homeassistant/components/ombi/__init__.py     | 22 +++++++++--------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py
index fff40b6ad73..b66a4ce2ed8 100644
--- a/homeassistant/components/elkm1/__init__.py
+++ b/homeassistant/components/elkm1/__init__.py
@@ -171,8 +171,8 @@ DEVICE_SCHEMA = vol.All(
             vol.Optional(CONF_THERMOSTAT, default={}): DEVICE_SCHEMA_SUBDOMAIN,
             vol.Optional(CONF_ZONE, default={}): DEVICE_SCHEMA_SUBDOMAIN,
         },
-        _host_validator,
     ),
+    _host_validator,
 )
 
 CONFIG_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/mobile_app/webhook.py b/homeassistant/components/mobile_app/webhook.py
index e7cccd0f151..e93b4c5ea99 100644
--- a/homeassistant/components/mobile_app/webhook.py
+++ b/homeassistant/components/mobile_app/webhook.py
@@ -406,18 +406,20 @@ async def webhook_render_template(
 
 @WEBHOOK_COMMANDS.register("update_location")
 @validate_schema(
-    vol.Schema(
+    vol.All(
         cv.key_dependency(ATTR_GPS, ATTR_GPS_ACCURACY),
-        {
-            vol.Optional(ATTR_LOCATION_NAME): cv.string,
-            vol.Optional(ATTR_GPS): cv.gps,
-            vol.Optional(ATTR_GPS_ACCURACY): cv.positive_int,
-            vol.Optional(ATTR_BATTERY): cv.positive_int,
-            vol.Optional(ATTR_SPEED): cv.positive_int,
-            vol.Optional(ATTR_ALTITUDE): vol.Coerce(float),
-            vol.Optional(ATTR_COURSE): cv.positive_int,
-            vol.Optional(ATTR_VERTICAL_ACCURACY): cv.positive_int,
-        },
+        vol.Schema(
+            {
+                vol.Optional(ATTR_LOCATION_NAME): cv.string,
+                vol.Optional(ATTR_GPS): cv.gps,
+                vol.Optional(ATTR_GPS_ACCURACY): cv.positive_int,
+                vol.Optional(ATTR_BATTERY): cv.positive_int,
+                vol.Optional(ATTR_SPEED): cv.positive_int,
+                vol.Optional(ATTR_ALTITUDE): vol.Coerce(float),
+                vol.Optional(ATTR_COURSE): cv.positive_int,
+                vol.Optional(ATTR_VERTICAL_ACCURACY): cv.positive_int,
+            },
+        ),
     )
 )
 async def webhook_update_location(
diff --git a/homeassistant/components/ombi/__init__.py b/homeassistant/components/ombi/__init__.py
index 719efdc8ae3..a4cbe39f3e0 100644
--- a/homeassistant/components/ombi/__init__.py
+++ b/homeassistant/components/ombi/__init__.py
@@ -61,16 +61,18 @@ SUBMIT_TV_REQUEST_SERVICE_SCHEMA = vol.Schema(
 
 CONFIG_SCHEMA = vol.Schema(
     {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_HOST): cv.string,
-                vol.Required(CONF_USERNAME): cv.string,
-                vol.Exclusive(CONF_API_KEY, "auth"): cv.string,
-                vol.Exclusive(CONF_PASSWORD, "auth"): cv.string,
-                vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-                vol.Optional(CONF_URLBASE, default=DEFAULT_URLBASE): urlbase,
-                vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
-            },
+        DOMAIN: vol.All(
+            vol.Schema(
+                {
+                    vol.Required(CONF_HOST): cv.string,
+                    vol.Required(CONF_USERNAME): cv.string,
+                    vol.Exclusive(CONF_API_KEY, "auth"): cv.string,
+                    vol.Exclusive(CONF_PASSWORD, "auth"): cv.string,
+                    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                    vol.Optional(CONF_URLBASE, default=DEFAULT_URLBASE): urlbase,
+                    vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
+                }
+            ),
             cv.has_at_least_one_key("auth"),
         )
     },