From 0200ccb586d69586feccf34325053447d677da5a Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Wed, 4 Sep 2024 03:26:18 +1000 Subject: [PATCH] Add location on include_tasks fail inside include (#83876) (#83883) Adds the datastore details to the parser error when attempting to include tasks that contain include_tasks without a filename set. This change will now display the exact location of the include_tasks that failed like any normal syntax error. (cherry picked from commit 1503805b703787aba06111f67e7dc564e3420cad) --- .../fragments/83874-include-parse-error-location.yml | 4 ++++ lib/ansible/playbook/task_include.py | 2 +- .../targets/include_import/null_filename/tasks.yml | 5 +++++ test/integration/targets/include_import/runme.sh | 6 ++++++ .../targets/include_import/test_null_include_filename.yml | 7 +++++++ 5 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/83874-include-parse-error-location.yml create mode 100644 test/integration/targets/include_import/null_filename/tasks.yml create mode 100644 test/integration/targets/include_import/test_null_include_filename.yml diff --git a/changelogs/fragments/83874-include-parse-error-location.yml b/changelogs/fragments/83874-include-parse-error-location.yml new file mode 100644 index 00000000000..3c9a3df5180 --- /dev/null +++ b/changelogs/fragments/83874-include-parse-error-location.yml @@ -0,0 +1,4 @@ +bugfixes: + - >- + include_tasks - Display location when attempting to load a task list where ``include_*`` did not specify any value - + https://github.com/ansible/ansible/issues/83874 diff --git a/lib/ansible/playbook/task_include.py b/lib/ansible/playbook/task_include.py index 1ace5fdebe1..4f354cae5fc 100644 --- a/lib/ansible/playbook/task_include.py +++ b/lib/ansible/playbook/task_include.py @@ -74,7 +74,7 @@ class TaskInclude(Task): if not task.args.get('_raw_params'): task.args['_raw_params'] = task.args.pop('file', None) if not task.args['_raw_params']: - raise AnsibleParserError('No file specified for %s' % task.action) + raise AnsibleParserError('No file specified for %s' % task.action, obj=data) apply_attrs = task.args.get('apply', {}) if apply_attrs and task.action not in C._ACTION_INCLUDE_TASKS: diff --git a/test/integration/targets/include_import/null_filename/tasks.yml b/test/integration/targets/include_import/null_filename/tasks.yml new file mode 100644 index 00000000000..e86b28e154f --- /dev/null +++ b/test/integration/targets/include_import/null_filename/tasks.yml @@ -0,0 +1,5 @@ +- name: ping task + ansible.builtin.ping: + +- name: invalid include_task definition + ansible.builtin.include_tasks: diff --git a/test/integration/targets/include_import/runme.sh b/test/integration/targets/include_import/runme.sh index 12ee15b1476..b01947abb5e 100755 --- a/test/integration/targets/include_import/runme.sh +++ b/test/integration/targets/include_import/runme.sh @@ -148,3 +148,9 @@ test "$(grep out.txt -ce 'In imported role')" = 3 # https://github.com/ansible/ansible/issues/73657 ansible-playbook issue73657.yml 2>&1 | tee issue73657.out test "$(grep -c 'SHOULD_NOT_EXECUTE' issue73657.out)" = 0 + +# https://github.com/ansible/ansible/issues/83874 +ansible-playbook test_null_include_filename.yml 2>&1 | tee test_null_include_filename.out +test "$(grep -c 'ERROR! No file specified for ansible.builtin.include_tasks' test_null_include_filename.out)" = 1 +test "$(grep -c 'The error appears to be in '\''.*/include_import/null_filename/tasks.yml'\'': line 4, column 3.*' test_null_include_filename.out)" = 1 +test "$(grep -c '\- name: invalid include_task definition' test_null_include_filename.out)" = 1 diff --git a/test/integration/targets/include_import/test_null_include_filename.yml b/test/integration/targets/include_import/test_null_include_filename.yml new file mode 100644 index 00000000000..9b5c823ef47 --- /dev/null +++ b/test/integration/targets/include_import/test_null_include_filename.yml @@ -0,0 +1,7 @@ +- name: Test include failure with invalid included include_task + hosts: localhost + gather_facts: false + + tasks: + - ansible.builtin.include_tasks: + file: null_filename/tasks.yml