a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

python-2.4's -m is severely limited. 

Extract the module and invoke it as a script to work around python-2.4's
lack of features.
pull/4420/head
Toshio Kuratomi 2016-04-10 21:14:53 -07:00
parent b571ecdfec
commit 452034564c
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/ansible/executor/module_common.py
View File

@ -89,6 +89,8 @@ ZIPLOADER_TEMPLATE = u'''%(shebang)s
import os import os
import sys import sys
import base64 import base64
import shutil
import zipfile
import tempfile import tempfile
import subprocess import subprocess
@ -106,14 +108,14 @@ except ImportError:
ZIPDATA = """%(zipdata)s""" ZIPDATA = """%(zipdata)s"""
def invoke_module(module_path, json_params): def invoke_module(module, modlib_path, json_params):
pythonpath = os.environ.get('PYTHONPATH') pythonpath = os.environ.get('PYTHONPATH')
if pythonpath: if pythonpath:
os.environ['PYTHONPATH'] = ':'.join((module_path, pythonpath)) os.environ['PYTHONPATH'] = ':'.join((modlib_path, pythonpath))
else: else:
os.environ['PYTHONPATH'] = module_path os.environ['PYTHONPATH'] = modlib_path
p = subprocess.Popen(['%(interpreter)s', '-m', 'ansible.module_exec.%(ansible_module)s.__main__'], env=os.environ, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) p = subprocess.Popen(['%(interpreter)s', module], env=os.environ, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
(stdout, stderr) = p.communicate(json_params) (stdout, stderr) = p.communicate(json_params)
if not isinstance(stderr, (bytes, unicode)): if not isinstance(stderr, (bytes, unicode)):
@ -141,7 +143,6 @@ def debug(command, zipped_mod, json_params):
# print the path to the code. This is an easy way for people to look # print the path to the code. This is an easy way for people to look
# at the code on the remote machine for debugging it in that # at the code on the remote machine for debugging it in that
# environment # environment
import zipfile
z = zipfile.ZipFile(zipped_mod) z = zipfile.ZipFile(zipped_mod)
for filename in z.namelist(): for filename in z.namelist():
if filename.startswith('/'): if filename.startswith('/'):
@ -166,7 +167,7 @@ def debug(command, zipped_mod, json_params):
# Execute the exploded code instead of executing the module from the # Execute the exploded code instead of executing the module from the
# embedded ZIPDATA. This allows people to easily run their modified # embedded ZIPDATA. This allows people to easily run their modified
# code on the remote machine to see how changes will affect it. # code on the remote machine to see how changes will affect it.
exitcode = invoke_module(basedir, json_params) exitcode = invoke_module(os.path.join(basedir, 'ansible_module_%(ansible_module)s.py'), basedir, json_params)
elif command == 'excommunicate': elif command == 'excommunicate':
# This attempts to run the module in-process (by importing a main # This attempts to run the module in-process (by importing a main
@ -193,23 +194,25 @@ if __name__ == '__main__':
ZIPLOADER_PARAMS = %(params)s ZIPLOADER_PARAMS = %(params)s
try: try:
temp_fd, temp_path = tempfile.mkstemp(prefix='ansible_') temp_path = tempfile.mkdtemp(prefix='ansible_')
os.write(temp_fd, base64.b64decode(ZIPDATA)) zipped_mod = os.path.join(temp_path, 'ansible_modlib.zip')
os.close(temp_fd) modlib = open(zipped_mod, 'wb')
modlib.write(base64.b64decode(ZIPDATA))
modlib.close()
if len(sys.argv) == 2: if len(sys.argv) == 2:
exitcode = debug(sys.argv[1], temp_path, ZIPLOADER_PARAMS) exitcode = debug(sys.argv[1], zipped_mod, ZIPLOADER_PARAMS)
else: else:
exitcode = invoke_module(temp_path, ZIPLOADER_PARAMS) z = zipfile.ZipFile(zipped_mod)
module = os.path.join(temp_path, 'ansible_module_%(ansible_module)s.py')
f = open(module, 'wb')
f.write(z.read('ansible_module_%(ansible_module)s.py'))
f.close()
exitcode = invoke_module(module, zipped_mod, ZIPLOADER_PARAMS)
finally: finally:
try: try:
try: shutil.rmtree(temp_path)
os.close(temp_fd) except OSError:
except OSError: # tempdir creation probably failed
# Already closed
pass
os.remove(temp_path)
except NameError:
# mkstemp failed
pass pass
sys.exit(exitcode) sys.exit(exitcode)
''' '''
@ -397,10 +400,8 @@ def _find_snippet_imports(module_name, module_data, module_path, module_args, ta
zf = zipfile.ZipFile(zipoutput, mode='w', compression=compression_method) zf = zipfile.ZipFile(zipoutput, mode='w', compression=compression_method)
zf.writestr('ansible/__init__.py', b''.join((b"__version__ = '", to_bytes(__version__), b"'\n"))) zf.writestr('ansible/__init__.py', b''.join((b"__version__ = '", to_bytes(__version__), b"'\n")))
zf.writestr('ansible/module_utils/__init__.py', b'') zf.writestr('ansible/module_utils/__init__.py', b'')
zf.writestr('ansible/module_exec/__init__.py', b'')
zf.writestr('ansible/module_exec/%s/__init__.py' % module_name, b"") zf.writestr('ansible_module_%s.py' % module_name, module_data)
zf.writestr('ansible/module_exec/%s/__main__.py' % module_name, module_data)
snippet_data = dict() snippet_data = dict()
recursive_finder(module_data, snippet_names, snippet_data, zf) recursive_finder(module_data, snippet_names, snippet_data, zf)