mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
debug now validates its params
simplified var handling made default message the same as in pre 2.0 fixes #13532
This commit is contained in:
parent
f3bedbae29
commit
d73562902b
1 changed files with 20 additions and 15 deletions
|
@ -20,40 +20,45 @@ __metaclass__ = type
|
||||||
from ansible.plugins.action import ActionBase
|
from ansible.plugins.action import ActionBase
|
||||||
from ansible.utils.boolean import boolean
|
from ansible.utils.boolean import boolean
|
||||||
from ansible.utils.unicode import to_unicode
|
from ansible.utils.unicode import to_unicode
|
||||||
|
from ansible.errors import AnsibleUndefinedVariable
|
||||||
|
|
||||||
class ActionModule(ActionBase):
|
class ActionModule(ActionBase):
|
||||||
''' Print statements during execution '''
|
''' Print statements during execution '''
|
||||||
|
|
||||||
TRANSFERS_FILES = False
|
TRANSFERS_FILES = False
|
||||||
|
VALID_ARGS = set(['msg', 'var'])
|
||||||
|
|
||||||
def run(self, tmp=None, task_vars=None):
|
def run(self, tmp=None, task_vars=None):
|
||||||
if task_vars is None:
|
if task_vars is None:
|
||||||
task_vars = dict()
|
task_vars = dict()
|
||||||
|
|
||||||
|
for arg in self._task.args:
|
||||||
|
if arg not in self.VALID_ARGS:
|
||||||
|
return {"failed": True, "msg": "'%s' is not a valid option in debug" % arg}
|
||||||
|
|
||||||
|
if 'msg' in self._task.args and 'var' in self._task.args:
|
||||||
|
return {"failed": True, "msg": "'msg' and 'var' are incompatible options"}
|
||||||
|
|
||||||
result = super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
if 'msg' in self._task.args:
|
if 'msg' in self._task.args:
|
||||||
if 'fail' in self._task.args and boolean(self._task.args['fail']):
|
result['msg'] = self._task.args['msg']
|
||||||
result['failed'] = True
|
|
||||||
result['msg'] = self._task.args['msg']
|
elif 'var' in self._task.args:
|
||||||
else:
|
try:
|
||||||
result['msg'] = self._task.args['msg']
|
results = self._templar.template(self._task.args['var'], convert_bare=True, fail_on_undefined=True)
|
||||||
# FIXME: move the LOOKUP_REGEX somewhere else
|
if results == self._task.args['var']:
|
||||||
elif 'var' in self._task.args: # and not utils.LOOKUP_REGEX.search(self._task.args['var']):
|
raise AnsibleUndefinedVariable
|
||||||
results = self._templar.template(self._task.args['var'], convert_bare=True, fail_on_undefined=False)
|
except AnsibleUndefinedVariable:
|
||||||
|
results = "VARIABLE IS NOT DEFINED!"
|
||||||
|
|
||||||
if type(self._task.args['var']) in (list, dict):
|
if type(self._task.args['var']) in (list, dict):
|
||||||
# If var is a list or dict, use the type as key to display
|
# If var is a list or dict, use the type as key to display
|
||||||
result[to_unicode(type(self._task.args['var']))] = results
|
result[to_unicode(type(self._task.args['var']))] = results
|
||||||
else:
|
else:
|
||||||
# If var name is same as result, try to template it
|
|
||||||
if results == self._task.args['var']:
|
|
||||||
try:
|
|
||||||
results = self._templar.template("{{" + results + "}}", convert_bare=True, fail_on_undefined=True)
|
|
||||||
except:
|
|
||||||
results = "VARIABLE IS NOT DEFINED!"
|
|
||||||
result[self._task.args['var']] = results
|
result[self._task.args['var']] = results
|
||||||
else:
|
else:
|
||||||
result['msg'] = 'here we are'
|
result['msg'] = 'Hello world!'
|
||||||
|
|
||||||
# force flag to make debug output module always verbose
|
# force flag to make debug output module always verbose
|
||||||
result['_ansible_verbose_always'] = True
|
result['_ansible_verbose_always'] = True
|
||||||
|
|
Loading…
Reference in a new issue