From 1db3d3c158bd23bee274816eda6461c66b20087f Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Sun, 1 Oct 2023 20:17:53 +0200
Subject: [PATCH] icon for commandline sensors (#101195)

* Add icon to schema for commandline sensor and binary_sensor

* Add icon tests
---
 homeassistant/components/command_line/__init__.py      | 2 ++
 homeassistant/components/command_line/binary_sensor.py | 3 +++
 tests/components/command_line/test_binary_sensor.py    | 4 ++++
 tests/components/command_line/test_sensor.py           | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/homeassistant/components/command_line/__init__.py b/homeassistant/components/command_line/__init__.py
index 6f536bf4744..5d057d40e1b 100644
--- a/homeassistant/components/command_line/__init__.py
+++ b/homeassistant/components/command_line/__init__.py
@@ -80,6 +80,7 @@ BINARY_SENSOR_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_COMMAND): cv.string,
         vol.Optional(CONF_NAME, default=BINARY_SENSOR_DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_ICON): cv.template,
         vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
         vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
         vol.Optional(CONF_DEVICE_CLASS): BINARY_SENSOR_DEVICE_CLASSES_SCHEMA,
@@ -119,6 +120,7 @@ SENSOR_SCHEMA = vol.Schema(
         vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
         vol.Optional(CONF_JSON_ATTRIBUTES): cv.ensure_list_csv,
         vol.Optional(CONF_NAME, default=SENSOR_DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_ICON): cv.template,
         vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
         vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
diff --git a/homeassistant/components/command_line/binary_sensor.py b/homeassistant/components/command_line/binary_sensor.py
index 1d6ee9046e8..3ccd0bd1503 100644
--- a/homeassistant/components/command_line/binary_sensor.py
+++ b/homeassistant/components/command_line/binary_sensor.py
@@ -16,6 +16,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import (
     CONF_COMMAND,
     CONF_DEVICE_CLASS,
+    CONF_ICON,
     CONF_NAME,
     CONF_PAYLOAD_OFF,
     CONF_PAYLOAD_ON,
@@ -86,6 +87,7 @@ async def async_setup_platform(
     device_class: BinarySensorDeviceClass | None = binary_sensor_config.get(
         CONF_DEVICE_CLASS
     )
+    icon: Template | None = binary_sensor_config.get(CONF_ICON)
     value_template: Template | None = binary_sensor_config.get(CONF_VALUE_TEMPLATE)
     command_timeout: int = binary_sensor_config[CONF_COMMAND_TIMEOUT]
     unique_id: str | None = binary_sensor_config.get(CONF_UNIQUE_ID)
@@ -100,6 +102,7 @@ async def async_setup_platform(
         CONF_UNIQUE_ID: unique_id,
         CONF_NAME: Template(name, hass),
         CONF_DEVICE_CLASS: device_class,
+        CONF_ICON: icon,
     }
 
     async_add_entities(
diff --git a/tests/components/command_line/test_binary_sensor.py b/tests/components/command_line/test_binary_sensor.py
index 9787728965e..360c78dd5a7 100644
--- a/tests/components/command_line/test_binary_sensor.py
+++ b/tests/components/command_line/test_binary_sensor.py
@@ -93,6 +93,9 @@ async def test_setup_integration_yaml(
                         "payload_on": "1.0",
                         "payload_off": "0",
                         "value_template": "{{ value | multiply(0.1) }}",
+                        "icon": (
+                            '{% if this.state=="on" %} mdi:on {% else %} mdi:off {% endif %}'
+                        ),
                     }
                 }
             ]
@@ -105,6 +108,7 @@ async def test_template(hass: HomeAssistant, load_yaml_integration: None) -> Non
     entity_state = hass.states.get("binary_sensor.test")
     assert entity_state
     assert entity_state.state == STATE_ON
+    assert entity_state.attributes.get("icon") == "mdi:on"
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/command_line/test_sensor.py b/tests/components/command_line/test_sensor.py
index da2bf1f6dd9..388d0345cad 100644
--- a/tests/components/command_line/test_sensor.py
+++ b/tests/components/command_line/test_sensor.py
@@ -93,6 +93,7 @@ async def test_setup_integration_yaml(
                         "command": "echo 50",
                         "unit_of_measurement": "in",
                         "value_template": "{{ value | multiply(0.1) }}",
+                        "icon": "mdi:console",
                     }
                 }
             ]
@@ -105,6 +106,7 @@ async def test_template(hass: HomeAssistant, load_yaml_integration: None) -> Non
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert float(entity_state.state) == 5
+    assert entity_state.attributes.get("icon") == "mdi:console"
 
 
 @pytest.mark.parametrize(