From f37951249f3293ee8c50bf9717bc293fa0ba79a6 Mon Sep 17 00:00:00 2001 From: John Westcott IV Date: Mon, 25 Apr 2022 15:32:48 -0400 Subject: [PATCH] Adding options fqcn (ansible.builtin.) to playbook identification --- .../tests/data/ansible_utils/playbooks/valid/import_fqcn.yml | 2 ++ .../tests/data/ansible_utils/playbooks/valid/include_fqcn.yml | 2 ++ awx/main/utils/ansible.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 awx/main/tests/data/ansible_utils/playbooks/valid/import_fqcn.yml create mode 100644 awx/main/tests/data/ansible_utils/playbooks/valid/include_fqcn.yml diff --git a/awx/main/tests/data/ansible_utils/playbooks/valid/import_fqcn.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/import_fqcn.yml new file mode 100644 index 0000000000..958d135f76 --- /dev/null +++ b/awx/main/tests/data/ansible_utils/playbooks/valid/import_fqcn.yml @@ -0,0 +1,2 @@ +--- +- ansible.builtin.import_playbook: foo diff --git a/awx/main/tests/data/ansible_utils/playbooks/valid/include_fqcn.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/include_fqcn.yml new file mode 100644 index 0000000000..38dd26ea43 --- /dev/null +++ b/awx/main/tests/data/ansible_utils/playbooks/valid/include_fqcn.yml @@ -0,0 +1,2 @@ +--- +- ansible.builtin.include: foo diff --git a/awx/main/utils/ansible.py b/awx/main/utils/ansible.py index ece2553151..64530c5300 100644 --- a/awx/main/utils/ansible.py +++ b/awx/main/utils/ansible.py @@ -17,7 +17,7 @@ logger = logging.getLogger('awx.main.utils.ansible') __all__ = ['skip_directory', 'could_be_playbook', 'could_be_inventory'] -valid_playbook_re = re.compile(r'^\s*?-?\s*?(?:hosts|include|import_playbook):\s*?.*?$') +valid_playbook_re = re.compile(r'^\s*?-?\s*?(?:hosts|(ansible\.builtin\.)?include|(ansible\.builtin\.)?import_playbook):\s*?.*?$') valid_inventory_re = re.compile(r'^[a-zA-Z0-9_.=\[\]]')