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.

Sign up for GitHub

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

Jump to bottom

Add jittered_backoff to the iam_policy & iam_policy_info modules to handle AWS rate limiting #324

Merged
merged 4 commits into from
Dec 10, 2020
Merged

Add jittered_backoff to the iam_policy & iam_policy_info modules to handle AWS rate limiting #324

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24227d8
Add exponential_backoff to handle AWS rate limiting
marknet15 Dec 9, 2020
146d267
Fix for failing test
marknet15 Dec 9, 2020
b87450a
PR feedback
marknet15 Dec 10, 2020
72df8b1
Add changelog fragment
marknet15 Dec 10, 2020
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
14 changes: 13 additions & 1 deletion plugins/modules/iam_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
pass

from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies, AWSRetry
from ansible.module_utils.six import string_types


Expand Down Expand Up @@ -235,15 +235,19 @@ class UserPolicy(Policy):
def _iam_type():
return 'user'

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _list(self, name):
return self.client.list_user_policies(UserName=name)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _get(self, name, policy_name):
return self.client.get_user_policy(UserName=name, PolicyName=policy_name)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _put(self, name, policy_name, policy_doc):
return self.client.put_user_policy(UserName=name, PolicyName=policy_name, PolicyDocument=policy_doc)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _delete(self, name, policy_name):
return self.client.delete_user_policy(UserName=name, PolicyName=policy_name)

Expand All @@ -254,15 +258,19 @@ class RolePolicy(Policy):
def _iam_type():
return 'role'

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _list(self, name):
return self.client.list_role_policies(RoleName=name)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _get(self, name, policy_name):
return self.client.get_role_policy(RoleName=name, PolicyName=policy_name)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _put(self, name, policy_name, policy_doc):
return self.client.put_role_policy(RoleName=name, PolicyName=policy_name, PolicyDocument=policy_doc)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _delete(self, name, policy_name):
return self.client.delete_role_policy(RoleName=name, PolicyName=policy_name)

Expand All @@ -273,15 +281,19 @@ class GroupPolicy(Policy):
def _iam_type():
return 'group'

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _list(self, name):
return self.client.list_group_policies(GroupName=name)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _get(self, name, policy_name):
return self.client.get_group_policy(GroupName=name, PolicyName=policy_name)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _put(self, name, policy_name, policy_doc):
return self.client.put_group_policy(GroupName=name, PolicyName=policy_name, PolicyDocument=policy_doc)

@AWSRetry.exponential_backoff(retries=10, delay=3, backoff=1.5)
def _delete(self, name, policy_name):
return self.client.delete_group_policy(GroupName=name, PolicyName=policy_name)

Expand Down