From 6e4b5f31d4c446b16b6f0ee7fa09cc6b860dc32d Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 17 Oct 2024 19:41:33 +0200 Subject: [PATCH] Extend checks --- homeassistant/helpers/config_validation.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py index 66de8266122..2465d97079e 100644 --- a/homeassistant/helpers/config_validation.py +++ b/homeassistant/helpers/config_validation.py @@ -1390,6 +1390,9 @@ def _raise_on_templated_service( raise ValueError( f"Template in service data is not allowed! {domain}.{_service}:{key}" ) + if isinstance(val, (vol.All, vol.Any)): + for subval in val.validators: + raise_on_templated_service(domain, _service, subval) def raise_on_templated_service( @@ -1406,6 +1409,10 @@ def raise_on_templated_service( raise_on_templated_service(domain, _service, val) if isinstance(schema, (vol.Schema)): raise_on_templated_service(domain, _service, schema.schema) + if schema in (dynamic_template, template, template_complex): + raise ValueError( + f"Template in service data is not allowed! {domain}.{_service}" + ) def make_entity_service_schema(