Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes #827 

some ansible collections write their own module classes derived from
ansible.module_utils.basic.AnsibleModule, thus lacking that import
in the plugin file. NewStylePlanner was unable to detect these plugins
as Ansiballz.

This commit extends the search pattern for NewStylePlanner to also
detect ansible_collections imports.
This commit is contained in:
Philippe Kueck 2021-07-01 11:21:33 +02:00
parent 36f3e3b28c
commit a2dcedabda
No known key found for this signature in database
GPG Key ID: E10E57D62DB57A3B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible_mitogen/planner.py
View File

@ -41,6 +41,7 @@ import json
import logging import logging
import os import os
import random import random
import re
from ansible.executor import module_common from ansible.executor import module_common
from ansible.collections.list import list_collection_dirs from ansible.collections.list import list_collection_dirs
@ -297,11 +298,11 @@ class NewStylePlanner(ScriptPlanner):
preprocessing the module. preprocessing the module.
""" """
runner_name = 'NewStyleRunner' runner_name = 'NewStyleRunner'
marker = b'from ansible.module_utils.' MARKER = re.compile(b'from ansible(?:_collections|\.module_utils)\.')
@classmethod @classmethod
def detect(cls, path, source): def detect(cls, path, source):
return cls.marker in source return cls.MARKER.search(source) != None
def _get_interpreter(self): def _get_interpreter(self):
return None, None return None, None