Fix idempotence for deleting ElasticBeanstalk applications (#35614)

pull/35624/head
Sloane Hertel 7 years ago committed by GitHub
parent b9571eb4bf
commit ee209e5f6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -209,10 +209,16 @@ def main():
ebs.delete_application(ApplicationName=app_name, TerminateEnvByForce=terminate_by_force)
else:
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")
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)

Loading…
Cancel
Save