From 7908f78fa6ba620b15c08ffb57f19631a2fe99ce Mon Sep 17 00:00:00 2001 From: Pilou Date: Thu, 29 Mar 2018 19:54:48 +0200 Subject: [PATCH] module_common: handle None value for templar (#36651) * module_common: set required parameter templar Fix the following error (related to b455901): $ ./hacking/test-module -m ./lib/ansible/modules/system/ping.py -I ansible_python_interpreter=/usr/bin/python Traceback (most recent call last): File "./hacking/test-module", line 268, in main() File "./hacking/test-module", line 249, in main (modfile, modname, module_style) = boilerplate_module(options.module_path, options.module_args, interpreters, options.check, options.filename) File "./hacking/test-module", line 152, in boilerplate_module task_vars=task_vars File "ansible/lib/ansible/executor/module_common.py", line 910, in modify_module environment=environment) File "ansible/lib/ansible/executor/module_common.py", line 736, in _find_module_utils shebang, interpreter = _get_shebang(u'/usr/bin/python', task_vars, templar) File "ansible/lib/ansible/executor/module_common.py", line 452, in _get_shebang interpreter = templar.template(task_vars[interpreter_config].strip()) AttributeError: 'NoneType' object has no attribute 'template' * module_common.modify_module: templar is required --- hacking/test-module | 2 ++ lib/ansible/executor/module_common.py | 2 +- lib/ansible/plugins/action/__init__.py | 4 ++-- test/units/executor/module_common/test_modify_module.py | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hacking/test-module b/hacking/test-module index aecb6e9caf2..aa517500570 100755 --- a/hacking/test-module +++ b/hacking/test-module @@ -42,6 +42,7 @@ from ansible.parsing.splitter import parse_kv import ansible.executor.module_common as module_common import ansible.constants as C from ansible.module_utils._text import to_native, to_text +from ansible.template import Templar try: import json @@ -149,6 +150,7 @@ def boilerplate_module(modfile, args, interpreters, check, destfile): modname, modfile, complex_args, + Templar(loader=loader), task_vars=task_vars ) diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index 893feabd5b5..38a58ca2244 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -874,7 +874,7 @@ def _find_module_utils(module_name, b_module_data, module_path, module_args, tas return (b_module_data, module_style, shebang) -def modify_module(module_name, module_path, module_args, task_vars=None, templar=None, module_compression='ZIP_STORED', async_timeout=0, become=False, +def modify_module(module_name, module_path, module_args, templar, task_vars=None, module_compression='ZIP_STORED', async_timeout=0, become=False, become_method=None, become_user=None, become_password=None, become_flags=None, environment=None): """ Used to insert chunks of code into modules before transfer rather than diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 0e037135884..eb117f6752e 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -153,8 +153,8 @@ class ActionBase(with_metaclass(ABCMeta, object)): final_environment = dict() self._compute_environment_string(final_environment) - (module_data, module_style, module_shebang) = modify_module(module_name, module_path, module_args, - task_vars=task_vars, templar=self._templar, + (module_data, module_style, module_shebang) = modify_module(module_name, module_path, module_args, self._templar, + task_vars=task_vars, module_compression=self._play_context.module_compression, async_timeout=self._task.async_val, become=self._play_context.become, diff --git a/test/units/executor/module_common/test_modify_module.py b/test/units/executor/module_common/test_modify_module.py index 54113718299..147eda37fd8 100644 --- a/test/units/executor/module_common/test_modify_module.py +++ b/test/units/executor/module_common/test_modify_module.py @@ -28,8 +28,8 @@ def fake_old_module_open(mocker): mocker.patch('builtins.open', m) -def test_shebang(fake_old_module_open): - (data, style, shebang) = modify_module('fake_module', 'fake_path', {}) +def test_shebang(fake_old_module_open, templar): + (data, style, shebang) = modify_module('fake_module', 'fake_path', {}, templar) assert shebang == '#!/usr/bin/python' @@ -38,5 +38,5 @@ def test_shebang_task_vars(fake_old_module_open, templar): 'ansible_python_interpreter': '/usr/bin/python3' } - (data, style, shebang) = modify_module('fake_module', 'fake_path', {}, task_vars=task_vars, templar=templar) + (data, style, shebang) = modify_module('fake_module', 'fake_path', {}, templar, task_vars=task_vars) assert shebang == '#!/usr/bin/python3'