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

rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list.

Browse source 
Refs #28269
This commit is contained in:
rallytime 2015-11-11 09:45:35 -07:00
parent 356bf2987d
commit 07482211eb
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/states/rabbitmq_user.py
View file

@ -56,13 +56,12 @@ def _check_perms_changes(name, newperms, runas=None, existing=None):
return False
perm_need_change = False
for vhost_perms in newperms:
for vhost, perms in vhost_perms.iteritems():
if vhost in existing:
if perms != existing[vhost]:
perm_need_change = True
else:
for vhost, perms in newperms.iteritems():
if vhost in existing:
if perms != existing[vhost]:
perm_need_change = True
else:
perm_need_change = True
return perm_need_change
@ -171,7 +170,7 @@ def present(name,
{'old': tags,
'new': new_tags}})
try:
existing_perms = __salt__['rabbitmq.list_user_permissions'](name, runas=runas)[0]
existing_perms = __salt__['rabbitmq.list_user_permissions'](name, runas=runas)
except CommandExecutionError as err:
ret['comment'] = 'Error: {0}'.format(err)
return ret

2
tests/unit/states/rabbitmq_user_test.py
View file

@ -39,7 +39,7 @@ class RabbitmqUserTestCase(TestCase):
name = 'foo'
passwd = 'password'
tag = 'user'
perms = [{'/': ['.*', '.*']}]
perms = {'/': ['.*', '.*']}
ret = {'name': name,
'changes': {},