ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-28 21:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix idempotence for deleting ElasticBeanstalk applications (#35614)

Browse source
This commit is contained in:
Sloane Hertel 2018-02-01 14:08:59 -05:00 • committed by GitHub
parent b9571eb4bf
commit ee209e5f6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/amazon/aws_elasticbeanstalk_app.py
View file

@ -209,10 +209,16 @@ def main():
ebs.delete_application(ApplicationName=app_name, TerminateEnvByForce=terminate_by_force) ebs.delete_application(ApplicationName=app_name, TerminateEnvByForce=terminate_by_force)
else: else:
ebs.delete_application(ApplicationName=app_name) ebs.delete_application(ApplicationName=app_name)
except (BotoCoreError, ClientError) as e: changed = True
except BotoCoreError as e:
module.fail_json_aws(e, msg="Cannot terminate app") module.fail_json_aws(e, msg="Cannot terminate app")
except ClientError as e:
if 'It is currently pending deletion.' not in e.response['Error']['Message']:
module.fail_json_aws(e, msg="Cannot terminate app")
else:
changed = False
result = dict(changed=True, app=app) result = dict(changed=changed, app=app)
module.exit_json(**result) module.exit_json(**result)