External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12102 from john-westcott-iv/allow_fqcn

Browse Source 
Respect optional fully qualified collection name (ansible.builtin.) for playbook identification
This commit is contained in:
Jessica Steurer
2022-06-07 16:44:36 -03:00
committed by GitHub
parent 309178e4e2 f37951249f
commit f5102ed24d
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tests/data/ansible_utils/playbooks/valid/import_fqcn.yml Normal file
View File

@@ -0,0 +1,2 @@
---
- ansible.builtin.import_playbook: foo

2
awx/main/tests/data/ansible_utils/playbooks/valid/include_fqcn.yml Normal file
View File

@@ -0,0 +1,2 @@
---
- ansible.builtin.include: foo

2
awx/main/utils/ansible.py
View File

@@ -17,7 +17,7 @@ logger = logging.getLogger('awx.main.utils.ansible')
__all__ = ['skip_directory', 'could_be_playbook', 'could_be_inventory'] __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_.=\[\]]') valid_inventory_re = re.compile(r'^[a-zA-Z0-9_.=\[\]]')