ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

fixes issues where iam_policy incorrected reported changed

Browse source
This commit is contained in:
Michael Baydoun 2016-07-18 13:10:59 +00:00 committed by Matt Clay
parent 906b457bf1
commit 3818cc2b95
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/cloud/amazon/iam_policy.py
View file

@ -137,6 +137,7 @@ def user_action(module, iam, name, policy_name, skip, pdoc, state):
current_policies = [cp for cp in iam.get_all_user_policies(name). current_policies = [cp for cp in iam.get_all_user_policies(name).
list_user_policies_result. list_user_policies_result.
policy_names] policy_names]
pol = ""
for pol in current_policies: for pol in current_policies:
''' '''
urllib is needed here because boto returns url encoded strings instead urllib is needed here because boto returns url encoded strings instead
@ -144,14 +145,13 @@ def user_action(module, iam, name, policy_name, skip, pdoc, state):
if urllib.unquote(iam.get_user_policy(name, pol). if urllib.unquote(iam.get_user_policy(name, pol).
get_user_policy_result.policy_document) == pdoc: get_user_policy_result.policy_document) == pdoc:
policy_match = True policy_match = True
if policy_match: break
msg=("The policy document you specified already exists "
"under the name %s." % pol)
if state == 'present': if state == 'present':
# If policy document does not already exist (either it's changed # If policy document does not already exist (either it's changed
# or the policy is not present) or if we're not skipping dupes then # or the policy is not present) or if we're not skipping dupes then
# make the put call. Note that the put call does a create or update. # make the put call. Note that the put call does a create or update.
if not policy_match or not skip: if (not policy_match or not skip) and pol != name:
changed = True changed = True
iam.put_user_policy(name, policy_name, pdoc) iam.put_user_policy(name, policy_name, pdoc)
elif state == 'absent': elif state == 'absent':
@ -189,18 +189,18 @@ def role_action(module, iam, name, policy_name, skip, pdoc, state):
module.fail_json(msg=e.message) module.fail_json(msg=e.message)
try: try:
pol = ""
for pol in current_policies: for pol in current_policies:
if urllib.unquote(iam.get_role_policy(name, pol). if urllib.unquote(iam.get_role_policy(name, pol).
get_role_policy_result.policy_document) == pdoc: get_role_policy_result.policy_document) == pdoc:
policy_match = True policy_match = True
if policy_match: break
msg=("The policy document you specified already exists "
"under the name %s." % pol)
if state == 'present': if state == 'present':
# If policy document does not already exist (either it's changed # If policy document does not already exist (either it's changed
# or the policy is not present) or if we're not skipping dupes then # or the policy is not present) or if we're not skipping dupes then
# make the put call. Note that the put call does a create or update. # make the put call. Note that the put call does a create or update.
if not policy_match or not skip: if (not policy_match or not skip) and pol != name:
changed = True changed = True
iam.put_role_policy(name, policy_name, pdoc) iam.put_role_policy(name, policy_name, pdoc)
elif state == 'absent': elif state == 'absent':
@ -234,6 +234,7 @@ def group_action(module, iam, name, policy_name, skip, pdoc, state):
current_policies = [cp for cp in iam.get_all_group_policies(name). current_policies = [cp for cp in iam.get_all_group_policies(name).
list_group_policies_result. list_group_policies_result.
policy_names] policy_names]
pol = ""
for pol in current_policies: for pol in current_policies:
if urllib.unquote(iam.get_group_policy(name, pol). if urllib.unquote(iam.get_group_policy(name, pol).
get_group_policy_result.policy_document) == pdoc: get_group_policy_result.policy_document) == pdoc:
@ -241,11 +242,12 @@ def group_action(module, iam, name, policy_name, skip, pdoc, state):
if policy_match: if policy_match:
msg=("The policy document you specified already exists " msg=("The policy document you specified already exists "
"under the name %s." % pol) "under the name %s." % pol)
break
if state == 'present': if state == 'present':
# If policy document does not already exist (either it's changed # If policy document does not already exist (either it's changed
# or the policy is not present) or if we're not skipping dupes then # or the policy is not present) or if we're not skipping dupes then
# make the put call. Note that the put call does a create or update. # make the put call. Note that the put call does a create or update.
if not policy_match or not skip: if (not policy_match or not skip) and pol != name:
changed = True changed = True
iam.put_group_policy(name, policy_name, pdoc) iam.put_group_policy(name, policy_name, pdoc)
elif state == 'absent': elif state == 'absent':