From f2fa01fa094e114df8cefdc6f32ec48a4eb3b9e4 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Fri, 27 Nov 2020 13:28:01 +0100 Subject: [PATCH] lint fixups --- plugins/modules/aws_kms.py | 10 +++++----- plugins/modules/aws_kms_info.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/modules/aws_kms.py b/plugins/modules/aws_kms.py index 88b48e88314..481cac496f7 100644 --- a/plugins/modules/aws_kms.py +++ b/plugins/modules/aws_kms.py @@ -796,14 +796,14 @@ def update_key_rotation(connection, module, key, enable_key_rotation): return False except is_boto3_error_code('AccessDeniedException'): pass - except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e: + except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e: # pylint: disable=duplicate-except module.fail_json_aws(e, msg="Unable to get current key rotation status") try: - if enable_key_rotation: - connection.enable_key_rotation(KeyId=key_id) - else: - connection.disable_key_rotation(KeyId=key_id) + if enable_key_rotation: + connection.enable_key_rotation(KeyId=key_id) + else: + connection.disable_key_rotation(KeyId=key_id) except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e: module.fail_json_aws(e, msg="Failed to enable/disable key rotation") return True diff --git a/plugins/modules/aws_kms_info.py b/plugins/modules/aws_kms_info.py index 09b5223f504..a0d77726207 100644 --- a/plugins/modules/aws_kms_info.py +++ b/plugins/modules/aws_kms_info.py @@ -394,7 +394,7 @@ def get_key_details(connection, module, key_id, tokens=None): key_id = result['Arn'] except is_boto3_error_code('NotFoundException'): return None - except botocore.exceptions.ClientError as e: + except botocore.exceptions.ClientError as e: # pylint: disable=duplicate-except module.fail_json(msg="Failed to obtain key metadata", exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response)) @@ -464,7 +464,7 @@ def main(): ) module = AnsibleAWSModule(argument_spec=argument_spec, - mutually_exclusive=[['name', 'filters', 'key_id']], + mutually_exclusive=[['alias', 'filters', 'key_id']], supports_check_mode=True) if module._name == 'aws_kms_facts': module.deprecate("The 'aws_kms_facts' module has been renamed to 'aws_kms_info'", date='2021-12-01', collection_name='community.aws')