Add support for hiddev on USB (#2548)

* Use Alpine 3.13

* Update builder.yml

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,10 +10,20 @@ inputs:
         This issue form is for reporting bugs with **supported** setups only!
 
         If you have a feature or enhancement request, please use the [feature request][fr] section of our [Community Forum][fr].
+
         [fr]: https://community.home-assistant.io/c/feature-requests
+  - type: textarea
+    attributes:
+      label: Describe the issue you are experiencing
+      required: true
+      description: Provide a clear and concise description of what the bug is.
+  - type: description
+    attributes:
+      value: |
+        ## Environment
   - type: input
     attributes:
-      label: What is the version of the Supervisor used?
+      label: What is the used version of the Supervisor?
       required: true
       placeholder: supervisor-
       description: >
@@ -40,7 +50,7 @@ inputs:
     attributes:
       label: What is the version of your installed operating system?
       required: true
-      placeholder: 5.10
+      placeholder: "5.11"
       description: Can be found in the Supervisor panel -> System tab.
   - type: input
     attributes:
@@ -50,11 +60,10 @@ inputs:
       description: >
         Can be found in the Supervisor panel -> System tab. Starts with
         `core-....`.
-  - type: textarea
+  - type: description
     attributes:
-      label: Describe the issue you are experiencing
-      required: true
-      description: Provide a clear and concise description of what the bug is.
+      value: |
+        # Details
   - type: textarea
     attributes:
       label: Steps to reproduce the issue
@@ -73,6 +82,15 @@ inputs:
       required: false
       description: >
         The Supervisor logs can be found in the Supervisor panel -> System tab.
+      value: |
+        ```txt
+        # Put your logs below this line
+
+        ```
+  - type: description
+    attributes:
+      value: |
+        ## Additional information
   - type: description
     attributes:
       value: |

.github/workflows/builder.yml

@@ -35,7 +35,7 @@ on:
 env:
   BUILD_NAME: supervisor
   BUILD_TYPE: supervisor
-  WHEELS_TAG: 3.8-alpine3.12
+  WHEELS_TAG: 3.8-alpine3.13
 
 jobs:
   init:
@@ -97,7 +97,7 @@ jobs:
           wheels-host: ${{ secrets.WHEELS_HOST }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           wheels-user: wheels
-          apk: "build-base;libffi-dev;openssl-dev"
+          apk: "build-base;libffi-dev;openssl-dev;cargo"
           skip-binary: aiohttp
           requirements: "requirements.txt"
 

.github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -47,7 +47,7 @@ jobs:
           pip install -r requirements.txt -r requirements_tests.txt
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -74,7 +74,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -118,7 +118,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -130,7 +130,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -162,7 +162,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -194,7 +194,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -206,7 +206,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -235,7 +235,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -247,7 +247,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -279,7 +279,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -311,7 +311,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -323,7 +323,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -355,7 +355,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |
@@ -409,7 +409,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: venv
           key: |

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3.0.15
+      - uses: actions/stale@v3.0.16
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 60

build.json

@@ -1,11 +1,11 @@
 {
   "image": "homeassistant/{arch}-hassio-supervisor",
   "build_from": {
-    "aarch64": "homeassistant/aarch64-base-python:3.8-alpine3.12",
-    "armhf": "homeassistant/armhf-base-python:3.8-alpine3.12",
-    "armv7": "homeassistant/armv7-base-python:3.8-alpine3.12",
-    "amd64": "homeassistant/amd64-base-python:3.8-alpine3.12",
-    "i386": "homeassistant/i386-base-python:3.8-alpine3.12"
+    "aarch64": "homeassistant/aarch64-base-python:3.8-alpine3.13",
+    "armhf": "homeassistant/armhf-base-python:3.8-alpine3.13",
+    "armv7": "homeassistant/armv7-base-python:3.8-alpine3.13",
+    "amd64": "homeassistant/amd64-base-python:3.8-alpine3.13",
+    "i386": "homeassistant/i386-base-python:3.8-alpine3.13"
   },
   "labels": {
     "io.hass.type": "supervisor"

requirements.txt

@@ -2,12 +2,12 @@ aiohttp==3.7.3
 async_timeout==3.0.1
 atomicwrites==1.4.0
 attrs==20.3.0
-awesomeversion==21.2.0
+awesomeversion==21.2.2
 brotli==1.0.9
 cchardet==2.1.7
 colorlog==4.7.2
 cpe==1.2.1
-cryptography==3.3.1
+cryptography==3.4.3
 debugpy==1.2.1
 docker==4.4.1
 gitpython==3.1.12

requirements_tests.txt

@@ -3,7 +3,7 @@ codecov==2.1.11
 coverage==5.4
 flake8-docstrings==1.5.0
 flake8==3.8.4
-pre-commit==2.10.0
+pre-commit==2.10.1
 pydocstyle==5.1.1
 pylint==2.6.0
 pytest-aiohttp==0.3.0
@@ -11,4 +11,4 @@ pytest-asyncio==0.12.0 # NB!: Versions over 0.12.0 breaks pytest-aiohttp (https:
 pytest-cov==2.11.1
 pytest-timeout==1.4.2
 pytest==6.2.2
-pyupgrade==2.9.0
+pyupgrade==2.10.0

supervisor/addons/__init__.py

@@ -276,17 +276,18 @@ class AddonManager(CoreSysAttributes):
 
         # Update instance
         last_state: AddonState = addon.state
+        old_image = addon.image
         try:
             await addon.instance.update(store.version, store.image)
-
-            # Cleanup
-            with suppress(DockerError):
-                await addon.instance.cleanup()
         except DockerError as err:
             raise AddonsError() from err
-        else:
-            self.data.update(store)
-            _LOGGER.info("Add-on '%s' successfully updated", slug)
+
+        _LOGGER.info("Add-on '%s' successfully updated", slug)
+        self.data.update(store)
+
+        # Cleanup
+        with suppress(DockerError):
+            await addon.instance.cleanup(old_image=old_image)
 
         # Setup/Fix AppArmor profile
         await addon.install_apparmor()

supervisor/addons/options.py

@@ -317,7 +317,7 @@ class UiOptions(CoreSysAttributes):
             else:
                 ui_node["options"] = [
                     (device.by_id or device.path).as_posix()
-                    for device in self.sys_hardware.devices()
+                    for device in self.sys_hardware.devices
                 ]
 
         ui_schema.append(ui_node)

supervisor/api/__init__.py

@@ -348,6 +348,7 @@ class RestAPI(CoreSysAttributes):
                 web.post(
                     "/addons/{addon}/options/validate", api_addons.options_validate
                 ),
+                web.get("/addons/{addon}/options/config", api_addons.options_config),
                 web.post("/addons/{addon}/rebuild", api_addons.rebuild),
                 web.get("/addons/{addon}/logs", api_addons.logs),
                 web.get("/addons/{addon}/icon", api_addons.icon),

supervisor/api/addons.py

@@ -102,7 +102,7 @@ from ..const import (
 )
 from ..coresys import CoreSysAttributes
 from ..docker.stats import DockerStats
-from ..exceptions import APIError
+from ..exceptions import APIError, APIForbidden
 from ..validate import docker_ports
 from .utils import api_process, api_process_raw, api_validate
 
@@ -343,6 +343,19 @@ class APIAddons(CoreSysAttributes):
 
         return data
 
+    @api_process
+    async def options_config(self, request: web.Request) -> None:
+        """Validate user options for add-on."""
+        slug: str = request.match_info.get("addon")
+        if slug != "self":
+            raise APIForbidden("This can be only read by the Add-on itself!")
+
+        addon = self._extract_addon_installed(request)
+        try:
+            return addon.schema(addon.options)
+        except vol.Invalid:
+            raise APIError("Invalid configuration data for the add-on") from None
+
     @api_process
     async def security(self, request: web.Request) -> None:
         """Store security options for add-on."""
@@ -472,14 +485,6 @@ class APIAddons(CoreSysAttributes):
         await asyncio.shield(addon.write_stdin(data))
 
 
-def _pretty_devices(addon: AnyAddon) -> List[str]:
-    """Return a simplified device list."""
-    dev_list = addon.devices
-    if not dev_list:
-        return []
-    return [row.split(":")[0] for row in dev_list]
-
-
 def _pretty_services(addon: AnyAddon) -> List[str]:
     """Return a simplified services role list."""
     return [f"{name}:{access}" for name, access in addon.services_role.items()]

supervisor/api/info.py

@@ -15,6 +15,7 @@ from ..const import (
     ATTR_LOGGING,
     ATTR_MACHINE,
     ATTR_OPERATING_SYSTEM,
+    ATTR_STATE,
     ATTR_SUPERVISOR,
     ATTR_SUPPORTED,
     ATTR_SUPPORTED_ARCH,
@@ -42,6 +43,7 @@ class APIInfo(CoreSysAttributes):
             ATTR_FEATURES: self.sys_host.features,
             ATTR_MACHINE: self.sys_machine,
             ATTR_ARCH: self.sys_arch.default,
+            ATTR_STATE: self.sys_core.state,
             ATTR_SUPPORTED_ARCH: self.sys_arch.supported,
             ATTR_SUPPORTED: self.sys_core.supported,
             ATTR_CHANNEL: self.sys_updater.channel,

supervisor/api/panel/entrypoint.js

@@ -1,9 +1,9 @@
 
 try {
-  new Function("import('/api/hassio/app/frontend_latest/entrypoint.249906fa.js')")();
+  new Function("import('/api/hassio/app/frontend_latest/entrypoint.e0293e95.js')")();
 } catch (err) {
   var el = document.createElement('script');
-  el.src = '/api/hassio/app/frontend_es5/entrypoint.9d919a57.js';
+  el.src = '/api/hassio/app/frontend_es5/entrypoint.f68c0ea3.js';
   document.body.appendChild(el);
 }
   

supervisor/api/panel/frontend_es5/chunk.0876b9858ed4d082cd4b.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.0876b9858ed4d082cd4b.js","sources":["webpack://home-assistant-frontend/chunk.0876b9858ed4d082cd4b.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.712a551bcc67f5a1a334.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.712a551bcc67f5a1a334.js","sources":["webpack://home-assistant-frontend/chunk.712a551bcc67f5a1a334.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.768ed82875b14c3ff85a.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.768ed82875b14c3ff85a.js","sources":["webpack://home-assistant-frontend/chunk.768ed82875b14c3ff85a.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.9dc17414f87d7bb5ab31.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.9dc17414f87d7bb5ab31.js","sources":["webpack://home-assistant-frontend/chunk.9dc17414f87d7bb5ab31.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/entrypoint.9d919a57.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"entrypoint.9d919a57.js","sources":["webpack://home-assistant-frontend/entrypoint.9d919a57.js"],"mappings":";AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/entrypoint.f68c0ea3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entrypoint.f68c0ea3.js","sources":["webpack://home-assistant-frontend/entrypoint.f68c0ea3.js"],"mappings":";AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/manifest.json

@@ -1,3 +1,3 @@
 {
-  "entrypoint.js": "/api/hassio/app/frontend_es5/entrypoint.9d919a57.js"
+  "entrypoint.js": "/api/hassio/app/frontend_es5/entrypoint.f68c0ea3.js"
 }

supervisor/api/panel/frontend_latest/chunk.477a2bd9ce20ceb52eda.js.map

@@ -1 +1 @@
-{"version":3,"file":"chunk.cc8b34896f064fac6b42.js","sources":["webpack://home-assistant-frontend/chunk.cc8b34896f064fac6b42.js"],"mappings":"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","sourceRoot":""}
+{"version":3,"file":"chunk.477a2bd9ce20ceb52eda.js","sources":["webpack://home-assistant-frontend/chunk.477a2bd9ce20ceb52eda.js"],"mappings":"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","sourceRoot":""}

supervisor/api/panel/frontend_latest/chunk.51b86ecee92937d60b05.js.map

@@ -1 +1 @@
-{"version":3,"file":"chunk.84bb4ce87457156316bb.js","sources":["webpack://home-assistant-frontend/chunk.84bb4ce87457156316bb.js"],"mappings":"AAAA;AA2OA;;;;AAIA;;;AAGA;;;;;AAKA;AACA;AACA;;;;AAIA;AACA;;AAIA;;AAEA;;;AAGA;;AAGA;AACA;;AAEA;;;;AAKA;AACA;;;AAGA;;AAGA;AACA;;AAEA;;;;AAKA;AACA;;;;;AAKA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;;;;;;;AAOA;AACA;AACA;;;AAGA;AACA;AACA;;;;;AA3FA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkJA","sourceRoot":""}
+{"version":3,"file":"chunk.51b86ecee92937d60b05.js","sources":["webpack://home-assistant-frontend/chunk.51b86ecee92937d60b05.js"],"mappings":"AAAA;AAmPA;;;;AAIA;;;AAGA;;;;;AAKA;AACA;AACA;;;;AAIA;AACA;;AAIA;;AAEA;;;AAGA;;AAGA;AACA;;AAEA;;;;AAKA;AACA;;;AAGA;;AAGA;AACA;;AAEA;;;;AAKA;AACA;;;;;AAKA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;;;;;;;AAOA;AACA;AACA;;;AAGA;AACA;AACA;;;;;AA3FA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkJA","sourceRoot":""}

supervisor/api/panel/frontend_latest/manifest.json

@@ -1,3 +1,3 @@
 {
-  "entrypoint.js": "/api/hassio/app/frontend_latest/entrypoint.249906fa.js"
+  "entrypoint.js": "/api/hassio/app/frontend_latest/entrypoint.e0293e95.js"
 }

supervisor/api/security.py

@@ -51,6 +51,7 @@ OBSERVER_CHECK = re.compile(
 ADDONS_API_BYPASS = re.compile(
     r"^(?:"
     r"|/addons/self/(?!security|update)[^/]+"
+    r"|/addons/self/options/config"
     r"|/info"
     r"|/hardware/trigger"
     r"|/services.*"

supervisor/docker/stats.py

@@ -14,7 +14,9 @@ class DockerStats:
         self._blk_write = 0
 
         try:
-            self._memory_usage = stats["memory_stats"]["usage"]
+            self._memory_usage = (
+                stats["memory_stats"]["usage"] - stats["memory_stats"]["stats"]["cache"]
+            )
             self._memory_limit = stats["memory_stats"]["limit"]
         except KeyError:
             self._memory_usage = 0

supervisor/hardware/policy.py

@@ -9,14 +9,38 @@ from .data import Device
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
-_GROUP_CGROUPS: Dict[PolicyGroup, List[int]] = {
-    PolicyGroup.UART: [204, 188, 166, 244],
-    PolicyGroup.GPIO: [254, 245],
-    PolicyGroup.VIDEO: [239, 29, 81, 251, 242, 226],
-    PolicyGroup.AUDIO: [116],
-    PolicyGroup.USB: [189],
+# fmt: off
+
+_CGROUPS: Dict[PolicyGroup, List[int]] = {
+    PolicyGroup.UART: [
+        204,  # ttyAMA / ttySAC
+        188,  # ttyUSB
+        166,  # ttyACM
+        244   # ttyAML
+    ],
+    PolicyGroup.GPIO: [
+        254,  # gpiochip
+        245   # gpiomem
+    ],
+    PolicyGroup.VIDEO: [
+        239,
+        29,
+        81,
+        251,
+        242,
+        226
+    ],
+    PolicyGroup.AUDIO: [
+        116   # /dev/snd (sound)
+    ],
+    PolicyGroup.USB: [
+        189,  # /dev/bus/usb (usb)
+        180   # hiddev (usbmisc)
+    ],
 }
 
+# fmt: on
+
 
 class HwPolicy(CoreSysAttributes):
     """Handle Hardware policy / cgroups."""
@@ -27,11 +51,11 @@ class HwPolicy(CoreSysAttributes):
 
     def is_match_cgroup(self, group: PolicyGroup, device: Device) -> bool:
         """Return true if device is in cgroup Policy."""
-        return device.cgroups_major in _GROUP_CGROUPS.get(group, [])
+        return device.cgroups_major in _CGROUPS.get(group, [])
 
     def get_cgroups_rules(self, group: PolicyGroup) -> List[str]:
         """Generate cgroups rules for a policy group."""
-        return [f"c {dev}:* rwm" for dev in _GROUP_CGROUPS.get(group, [])]
+        return [f"c {dev}:* rwm" for dev in _CGROUPS.get(group, [])]
 
     def get_cgroups_rule(self, device: Device) -> str:
         """Generate a cgroups rule for given device."""

supervisor/jobs/decorator.py

@@ -99,8 +99,9 @@ class Job:
             and self._coresys.core.state != CoreState.RUNNING
         ):
             _LOGGER.warning(
-                "'%s' blocked from execution, system is not running",
+                "'%s' blocked from execution, system is not running - %s",
                 self._method.__qualname__,
+                self._coresys.core.state,
             )
             return False
 

supervisor/supervisor.py

@@ -125,6 +125,14 @@ class Supervisor(CoreSysAttributes):
             _LOGGER.warning("Version %s is already installed", version)
             return
 
+        # First update own AppArmor
+        try:
+            await self.update_apparmor()
+        except SupervisorError as err:
+            _LOGGER.critical("Abort update because of an issue with AppArmor!")
+            raise SupervisorUpdateError() from err
+
+        # Update container
         _LOGGER.info("Update Supervisor to version %s", version)
         try:
             await self.instance.install(
@@ -144,8 +152,6 @@ class Supervisor(CoreSysAttributes):
             self.sys_config.version = version
             self.sys_config.save_data()
 
-        with suppress(SupervisorError):
-            await self.update_apparmor()
         self.sys_create_task(self.sys_core.stop())
 
     @Job(conditions=[JobCondition.RUNNING], on_condition=SupervisorJobError)

tests/addons/test_options.py

@@ -252,3 +252,50 @@ def test_ui_simple_device_schema(coresys):
         ]
     )
     assert data[-1]["type"] == "select"
+
+
+def test_ui_simple_device_schema_no_filter(coresys):
+    """Test with simple schema without filter."""
+    for device in (
+        Device(
+            "ttyACM0",
+            Path("/dev/ttyACM0"),
+            Path("/sys/bus/usb/002"),
+            "tty",
+            [],
+            {"ID_VENDOR": "xy"},
+        ),
+        Device(
+            "ttyUSB0",
+            Path("/dev/ttyUSB0"),
+            Path("/sys/bus/usb/001"),
+            "tty",
+            [Path("/dev/ttyS1"), Path("/dev/serial/by-id/xyx")],
+            {"ID_VENDOR": "xy"},
+        ),
+        Device("ttyS0", Path("/dev/ttyS0"), Path("/sys/bus/usb/003"), "tty", [], {}),
+        Device(
+            "video1",
+            Path("/dev/video1"),
+            Path("/sys/bus/usb/004"),
+            "misc",
+            [],
+            {"ID_VENDOR": "xy"},
+        ),
+    ):
+        coresys.hardware.update_device(device)
+
+    data = UiOptions(coresys)(
+        {
+            "name": "str",
+            "password": "password",
+            "fires": "bool",
+            "alias": "str?",
+            "input": "device",
+        },
+    )
+
+    assert sorted(data[-1]["options"]) == sorted(
+        ["/dev/serial/by-id/xyx", "/dev/ttyACM0", "/dev/ttyS0", "/dev/video1"]
+    )
+    assert data[-1]["type"] == "select"