Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PR #1636/75ba63be backport][stable-5] iam_role: drop deprecation #1638

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/iam_role_purge_policy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- iam_role - Drop deprecation warning, because the standard value for purge parametes is ``true`` (https://github.com/ansible-collections/community.aws/pull/1636).
10 changes: 2 additions & 8 deletions plugins/modules/iam_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
purge_policies:
description:
- When I(purge_policies=true) any managed policies not listed in I(managed_policies) will be detatched.
- By default I(purge_policies=true). In a release after 2022-06-01 this will be changed to I(purge_policies=false).
type: bool
aliases: ['purge_policy', 'purge_managed_policies']
default: true
state:
description:
- Create or remove the IAM role.
Expand Down Expand Up @@ -448,8 +448,6 @@ def create_or_update_role(module, client):
purge_tags = module.params.get('purge_tags')
tags = ansible_dict_to_boto3_tag_list(module.params.get('tags')) if module.params.get('tags') else None
purge_policies = module.params.get('purge_policies')
if purge_policies is None:
purge_policies = True
managed_policies = module.params.get('managed_policies')
if managed_policies:
# Attempt to list the policies early so we don't leave things behind if we can't find them.
Expand Down Expand Up @@ -665,7 +663,7 @@ def main():
boundary=dict(type='str', aliases=['boundary_policy_arn']),
create_instance_profile=dict(type='bool', default=True),
delete_instance_profile=dict(type='bool', default=False),
purge_policies=dict(type='bool', aliases=['purge_policy', 'purge_managed_policies']),
purge_policies=dict(default=True, type='bool', aliases=['purge_policy', 'purge_managed_policies']),
tags=dict(type='dict', aliases=['resource_tags']),
purge_tags=dict(type='bool', default=True),
wait=dict(type='bool', default=True),
Expand All @@ -676,10 +674,6 @@ def main():
required_if=[('state', 'present', ['assume_role_policy_document'])],
supports_check_mode=True)

if module.params.get('purge_policies') is None:
module.deprecate('After 2022-06-01 the default value of purge_policies will change from true to false.'
' To maintain the existing behaviour explicitly set purge_policies=true', date='2022-06-01', collection_name='community.aws')

if module.params.get('boundary'):
if module.params.get('create_instance_profile'):
module.fail_json(msg="When using a boundary policy, `create_instance_profile` must be set to `false`.")
Expand Down