valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dissect unnamed args and call them separately

Browse Source
This commit is contained in:
Bo Maryniuk 2017-03-08 15:02:31 +01:00
parent f10ae71a37
commit 25e3d5a6fd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/states/module.py
View File

@ -228,18 +228,22 @@ def _call_function(name, returner=None, **kwargs):
:return:
'''
argspec = salt.utils.args.get_function_argspec(__salt__[name])
func_args = dict(zip(argspec.args[-len(argspec.defaults):], argspec.defaults))
for funcset in kwargs.get('func_args', []):
func_args.update(funcset)
func_kw = dict(zip(argspec.args[-len(argspec.defaults or []):], argspec.defaults or []))
func_args = []
for funcset in kwargs.get('func_args') or {}:
if isinstance(funcset, dict):
func_kw.update(funcset)
else:
func_args.append(funcset)
missing = []
for arg in argspec.args:
if arg not in func_args:
if arg not in func_kw:
missing.append(arg)
if missing:
raise SaltInvocationError('Missing arguments: {0}'.format(', '.join(missing)))
mret = __salt__[name](**func_args)
mret = __salt__[name](*func_args, **func_kw)
if returner is not None:
returners = salt.loader.returners(__opts__, __salt__)
if returner in returners: