Skip to content

Commit 4391433

Browse files
trembleGomathiselviS
authored andcommitted
Cleanup - use is_boto3_error_(message|code) (ansible-collections#268)
* Reorder imports * Make use of is_boto3_error_message * Mass-migration over to is_boto3_error_code * Remove unused imports * unused vars in exception * Improve consistency around catching BotoCoreError and ClientError * Remove unused imports * Remove unused 'PolicyError' from iam_policy_info * Avoid catching botocore.exceptions.ClientError when we only want some error codes * Import camel_dict_to_snake_dict/snake_dict_to_camel_dict from ansible.module_utils.common.dict_transformations This commit was initially merged in https://github.com/ansible-collections/community.aws See: ansible-collections/community.aws@4cf52ef
1 parent 998eb1e commit 4391433

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

plugins/modules/ec2_placement_group.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,15 @@
8787
8888
'''
8989

90-
from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
91-
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
9290
try:
93-
from botocore.exceptions import (BotoCoreError, ClientError)
91+
import botocore
9492
except ImportError:
9593
pass # caught by AnsibleAWSModule
9694

95+
from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
96+
from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code
97+
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
98+
9799

98100
@AWSRetry.exponential_backoff()
99101
def get_placement_group_details(connection, module):
@@ -104,7 +106,7 @@ def get_placement_group_details(connection, module):
104106
"Name": "group-name",
105107
"Values": [name]
106108
}])
107-
except (BotoCoreError, ClientError) as e:
109+
except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
108110
module.fail_json_aws(
109111
e,
110112
msg="Couldn't find placement group named [%s]" % name)
@@ -128,13 +130,13 @@ def create_placement_group(connection, module):
128130
try:
129131
connection.create_placement_group(
130132
GroupName=name, Strategy=strategy, DryRun=module.check_mode)
131-
except (BotoCoreError, ClientError) as e:
132-
if e.response['Error']['Code'] == "DryRunOperation":
133-
module.exit_json(changed=True, placement_group={
134-
"name": name,
135-
"state": 'DryRun',
136-
"strategy": strategy,
137-
})
133+
except is_boto3_error_code('DryRunOperation'):
134+
module.exit_json(changed=True, placement_group={
135+
"name": name,
136+
"state": 'DryRun',
137+
"strategy": strategy,
138+
})
139+
except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e: # pylint: disable=duplicate-except
138140
module.fail_json_aws(
139141
e,
140142
msg="Couldn't create placement group [%s]" % name)
@@ -152,7 +154,7 @@ def delete_placement_group(connection, module):
152154
try:
153155
connection.delete_placement_group(
154156
GroupName=name, DryRun=module.check_mode)
155-
except (BotoCoreError, ClientError) as e:
157+
except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
156158
module.fail_json_aws(
157159
e,
158160
msg="Couldn't delete placement group [%s]" % name)

0 commit comments

Comments
 (0)