From cef47889b55585435353916636d2415ea372572b Mon Sep 17 00:00:00 2001 From: Helight Date: Sun, 15 Nov 2026 18:44:15 +0100 Subject: [PATCH] fix(docker): the offer of an engine reads the server's container under a name of its own The task's vars named it devbox_docker_found, which an earlier task registers; a registered result outranks a task's vars, so applying a node failed when Docker was installed. A test refuses task vars named as a registered result. --- plugins/docker/tasks/engine.yml | 6 +++--- tests/test_task_names.py | 37 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 tests/test_task_names.py diff --git a/plugins/docker/tasks/engine.yml b/plugins/docker/tasks/engine.yml index e7ef63f..b944c78 100644 --- a/plugins/docker/tasks/engine.yml +++ b/plugins/docker/tasks/engine.yml @@ -110,9 +110,9 @@ aliases: host: "{{ [''] if devbox_docker_here else [] }}" vars: - devbox_docker_found: "{{ (devbox_docker_server.stdout ~ '|').split('|') if devbox_docker_server.rc == 0 else ['', ''] }}" + devbox_docker_container: "{{ (devbox_docker_server.stdout ~ '|').split('|') if devbox_docker_server.rc == 0 else ['', ''] }}" devbox_docker_here: >- {{ (devbox_apply_from | default('')) | length > 0 - and (devbox_apply_from | default('')) in devbox_docker_found[0].split() }} - devbox_docker_local: "{{ devbox_docker_here and '/var/run/docker.sock' in devbox_docker_found[1].split() }}" + and (devbox_apply_from | default('')) in devbox_docker_container[0].split() }} + devbox_docker_local: "{{ devbox_docker_here and '/var/run/docker.sock' in devbox_docker_container[1].split() }}" diff --git a/tests/test_task_names.py b/tests/test_task_names.py new file mode 100644 index 0000000..3c42dd1 --- /dev/null +++ b/tests/test_task_names.py @@ -0,0 +1,37 @@ +"""A variable a task registers outranks the vars of a later task with the +same name, so a task's vars never take the name of a registered result.""" +from pathlib import Path +import unittest + +try: + import yaml +except ImportError: + yaml = None + +ROOT = Path(__file__).resolve().parents[1] + + +def tasks(node): + """Every task in a list of tasks, blocks opened.""" + for task in node or []: + if not isinstance(task, dict): + continue + yield task + for key in ('block', 'rescue', 'always'): + yield from tasks(task.get(key)) + + +@unittest.skipUnless(yaml, 'needs PyYAML: install provision/requirements.txt') +class TaskNames(unittest.TestCase): + def test_no_task_vars_take_the_name_of_a_registered_result(self): + files = list(ROOT.glob('plugins/*/tasks/*.yml')) + list(ROOT.glob('provision/ansible/roles/*/tasks/*.yml')) + self.assertTrue(files) + clashes = [] + for path in files: + listed = list(tasks(yaml.safe_load(path.read_text()))) + registered = {task['register'] for task in listed if 'register' in task} + for task in listed: + for name in (task.get('vars') or {}): + if name in registered: + clashes.append(f"{path.relative_to(ROOT)}: {task.get('name')}: {name}") + self.assertEqual(clashes, [])