saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

2 salt-key fixes

Browse source 
This fixes the following two issues:

1. Default values were not properly being pulled from the argspec.
2. Minion IDs with `=` in them were not handled properly as they were
   assumed to be keyword args.
This commit is contained in:
Erik Johnson 2018-08-03 14:25:16 -05:00
parent d4bb3a0963
commit 7ac10f9eac
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/key.py
View file

@ -35,7 +35,7 @@ import salt.utils.user
# pylint: disable=import-error,no-name-in-module,redefined-builtin
from salt.ext import six
from salt.ext.six.moves import input
from salt.ext.six.moves import input, zip_longest
# pylint: enable=import-error,no-name-in-module,redefined-builtin
# Import third party libs
@ -156,15 +156,24 @@ class KeyCLI(object):
self.auth = low
def _get_args_kwargs(self, fun, args=None):
argspec = salt.utils.args.get_function_argspec(fun)
if args is None:
argspec = salt.utils.args.get_function_argspec(fun)
args = []
if argspec.args:
for arg in argspec.args:
args.append(self.opts.get(arg))
args, kwargs = salt.minion.load_args_and_kwargs(
fun,
args)
# Iterate in reverse order to ensure we get the correct default
# value for the positional argument.
for arg, default in zip_longest(reversed(argspec.args),
reversed(argspec.defaults or ())):
args.append(self.opts.get(arg, default))
# Reverse the args so that they are in the correct order
args = args[::-1]
if argspec.keywords is None:
kwargs = {}
else:
args, kwargs = salt.minion.load_args_and_kwargs(
fun,
args)
return args, kwargs
def _run_cmd(self, cmd, args=None):