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

Merge pull request #27632 from rallytime/bp-27539

Browse Source 
Back-port #27539 to 2015.8
This commit is contained in:
Mike Place 2015-10-02 13:28:39 -06:00
commit 83ae6a1432
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/boto_iam.py
View File

@ -360,7 +360,7 @@ def create_group(group_name, path=None, region=None, key=None, keyid=None,
'''
if not path:
path = '/'
if get_group(group_name, region, key, keyid, profile):
if get_group(group_name, region=region, key=key, keyid=keyid, profile=profile):
return True
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
@ -418,8 +418,8 @@ def add_user_to_group(user_name, group_name, region=None, key=None, keyid=None,
msg = 'Username : {0} does not exist.'
log.error(msg.format(user_name, group_name))
return False
if user_exists_in_group(user_name, group_name, region=None, key=None, keyid=None,
profile=None):
if user_exists_in_group(user_name, group_name, region=region, key=key, keyid=keyid,
profile=profile):
return True
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
@ -447,7 +447,7 @@ def user_exists_in_group(user_name, group_name, region=None, key=None, keyid=Non
salt myminion boto_iam.user_exists_in_group myuser mygroup
'''
group = get_group(group_name=group_name, region=region, key=key, keyid=keyid,
group = get_group(group_name, region=region, key=key, keyid=keyid,
profile=profile)
if group:
for _users in group['get_group_response']['get_group_result']['users']:
@ -505,7 +505,7 @@ def put_group_policy(group_name, policy_name, policy_json, region=None, key=None
salt myminion boto_iam.put_group_policy mygroup policyname policyrules
'''
group = get_group(group_name, region, key, keyid, profile)
group = get_group(group_name, region=region, key=key, keyid=keyid, profile=profile)
if not group:
log.error('Group {0} does not exist'.format(group_name))
return False

17
salt/states/boto_iam.py
View File

@ -363,7 +363,9 @@ def user_present(name, policies=None, policies_from_pillars=None, password=None,
The password for the new user. Must comply with account policy.
path (string)
The path of the user. Default is '/'
The path of the user. Default is '/'.
.. versionadded:: 2015.8.2
region (string)
Region to connect to.
@ -498,13 +500,16 @@ def _case_password(ret, name, password, region=None, key=None, keyid=None, profi
return ret
def group_present(name, policies=None, policies_from_pillars=None, users=None, region=None, key=None, keyid=None, profile=None):
def group_present(name, policies=None, policies_from_pillars=None, users=None, region=None, key=None, keyid=None, profile=None, path='/'):
'''
Ensure the IAM group is present
name (string)
The name of the new group.
path (string)
The path for the group, defaults to '/'
policies (dict)
A dict of IAM group policy documents.
@ -549,7 +554,7 @@ def group_present(name, policies=None, policies_from_pillars=None, users=None, r
ret['comment'] = 'IAM group {0} is set to be created.'.format(name)
ret['result'] = None
return ret
created = __salt__['boto_iam.create_group'](group_name=name, region=region, key=key, keyid=keyid, profile=profile)
created = __salt__['boto_iam.create_group'](group_name=name, path=path, region=region, key=key, keyid=keyid, profile=profile)
if not created:
ret['comment'] = 'Failed to create IAM group {0}.'.format(name)
ret['result'] = False
@ -591,7 +596,7 @@ def _case_group(ret, users, group_name, group_result, region, key, keyid, profil
ret['comment'] = 'User {0} is set to be added to group {1}.'.format(user, group_name)
ret['result'] = None
else:
__salt__['boto_iam.add_user_to_group'](user, group_name, region, key, keyid, profile)
addret = __salt__['boto_iam.add_user_to_group'](user, group_name, region=region, key=key, keyid=keyid, profile=profile)
ret['comment'] = os.linesep.join([ret['comment'], 'User {0} has been added to group {1}.'.format(user, group_name)])
ret['changes'][user] = group_name
for user in _users:
@ -600,8 +605,8 @@ def _case_group(ret, users, group_name, group_result, region, key, keyid, profil
ret['comment'] = os.linesep.join([ret['comment'], 'User {0} is set to be removed from group {1}.'.format(user, group_name)])
ret['result'] = None
else:
__salt__['boto_iam.remove_user_from_group'](group_name=group_name, user_name=user, region=region,
key=key, keyid=keyid, profile=profile)
remret = __salt__['boto_iam.remove_user_from_group'](group_name=group_name, user_name=user, region=region,
key=key, keyid=keyid, profile=profile)
ret['comment'] = os.linesep.join([ret['comment'], 'User {0} has been removed from group {1}.'.format(user, group_name)])
ret['changes'][user] = 'Removed from group {0}.'.format(group_name)
return ret