Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2794 from castrapel/max_retry_iam 

Set Max Retries + Add metrics to IAM handler
This commit is contained in:
Curtis 2019-05-21 13:08:47 -07:00 committed by GitHub
parent 3c6799d736 1423ac0d98
commit de65d363fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lemur/plugins/lemur_aws/iam.py
View File

@ -24,7 +24,7 @@ def retry_throttled(exception):
if exception.response["Error"]["Code"] == "NoSuchEntity": if exception.response["Error"]["Code"] == "NoSuchEntity":
return False return False
metrics.send("iam_retry", "counter", 1) metrics.send("iam_retry", "counter", 1, metric_tags={"exception": str(exception)})
return True return True
@ -52,7 +52,7 @@ def create_arn_from_cert(account_number, region, certificate_name):
@sts_client("iam") @sts_client("iam")
@retry(retry_on_exception=retry_throttled, wait_fixed=2000) @retry(retry_on_exception=retry_throttled, wait_fixed=2000, stop_max_attempt_number=25)
def upload_cert(name, body, private_key, path, cert_chain=None, **kwargs): def upload_cert(name, body, private_key, path, cert_chain=None, **kwargs):
""" """
Upload a certificate to AWS Upload a certificate to AWS
@ -72,6 +72,7 @@ def upload_cert(name, body, private_key, path, cert_chain=None, **kwargs):
else: else:
name = name + "-" + path.strip("/") name = name + "-" + path.strip("/")
metrics.send("upload_cert", "counter", 1, metric_tags={"name": name, "path": path})
try: try:
if cert_chain: if cert_chain:
return client.upload_server_certificate( return client.upload_server_certificate(
@ -94,7 +95,7 @@ def upload_cert(name, body, private_key, path, cert_chain=None, **kwargs):
@sts_client("iam") @sts_client("iam")
@retry(retry_on_exception=retry_throttled, wait_fixed=2000) @retry(retry_on_exception=retry_throttled, wait_fixed=2000, stop_max_attempt_number=25)
def delete_cert(cert_name, **kwargs): def delete_cert(cert_name, **kwargs):
""" """
Delete a certificate from AWS Delete a certificate from AWS
@ -103,6 +104,7 @@ def delete_cert(cert_name, **kwargs):
:return: :return:
""" """
client = kwargs.pop("client") client = kwargs.pop("client")
metrics.send("delete_cert", "counter", 1, metric_tags={"cert_name": cert_name})
try: try:
client.delete_server_certificate(ServerCertificateName=cert_name) client.delete_server_certificate(ServerCertificateName=cert_name)
except botocore.exceptions.ClientError as e: except botocore.exceptions.ClientError as e:
@ -111,7 +113,7 @@ def delete_cert(cert_name, **kwargs):
@sts_client("iam") @sts_client("iam")
@retry(retry_on_exception=retry_throttled, wait_fixed=2000) @retry(retry_on_exception=retry_throttled, wait_fixed=2000, stop_max_attempt_number=25)
def get_certificate(name, **kwargs): def get_certificate(name, **kwargs):
""" """
Retrieves an SSL certificate. Retrieves an SSL certificate.
@ -119,13 +121,14 @@ def get_certificate(name, **kwargs):
:return: :return:
""" """
client = kwargs.pop("client") client = kwargs.pop("client")
metrics.send("get_certificate", "counter", 1, metric_tags={"name": name})
return client.get_server_certificate(ServerCertificateName=name)[ return client.get_server_certificate(ServerCertificateName=name)[
"ServerCertificate" "ServerCertificate"
] ]
@sts_client("iam") @sts_client("iam")
@retry(retry_on_exception=retry_throttled, wait_fixed=2000) @retry(retry_on_exception=retry_throttled, wait_fixed=2000, stop_max_attempt_number=25)
def get_certificates(**kwargs): def get_certificates(**kwargs):
""" """
Fetches one page of certificate objects for a given account. Fetches one page of certificate objects for a given account.
@ -133,6 +136,7 @@ def get_certificates(**kwargs):
:return: :return:
""" """
client = kwargs.pop("client") client = kwargs.pop("client")
metrics.send("get_certificates", "counter", 1)
return client.list_server_certificates(**kwargs) return client.list_server_certificates(**kwargs)
@ -142,6 +146,12 @@ def get_all_certificates(**kwargs):
""" """
certificates = [] certificates = []
account_number = kwargs.get("account_number") account_number = kwargs.get("account_number")
metrics.send(
"get_all_certificates",
"counter",
1,
metric_tags={"account_number": account_number},
)
while True: while True:
response = get_certificates(**kwargs) response = get_certificates(**kwargs)