wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[aws] Catch errors raised when deleting objects remaining in an s3_bucket (#43358)

Browse source 
* Catch errors raised when deleting objects remaining in a bucket

* Also remove VersionId when it is not needed
This commit is contained in:
Ryan Brown 2018-07-30 11:22:00 -04:00 committed by GitHub
parent fee4c24ad4
commit 1c082e93ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/cloud/amazon/s3_bucket.py
View file

@ -444,8 +444,23 @@ def destroy_bucket(s3_client, module):
try: try:
for key_version_pairs in paginated_versions_list(s3_client, Bucket=name): for key_version_pairs in paginated_versions_list(s3_client, Bucket=name):
formatted_keys = [{'Key': key, 'VersionId': version} for key, version in key_version_pairs] formatted_keys = [{'Key': key, 'VersionId': version} for key, version in key_version_pairs]
for fk in formatted_keys:
# remove VersionId from cases where they are `None` so that
# unversioned objects are deleted using `DeleteObject`
# rather than `DeleteObjectVersion`, improving backwards
# compatibility with older IAM policies.
if not fk.get('VersionId'):
fk.pop('VersionId')
if formatted_keys: if formatted_keys:
s3_client.delete_objects(Bucket=name, Delete={'Objects': formatted_keys}) resp = s3_client.delete_objects(Bucket=name, Delete={'Objects': formatted_keys})
if resp.get('Errors'):
module.fail_json(
msg='Could not empty bucket before deleting. Could not delete objects: {0}'.format(
', '.join([k['Key'] for k in resp['Errors']])
),
errors=resp['Errors'], response=resp
)
except (BotoCoreError, ClientError) as e: except (BotoCoreError, ClientError) as e:
module.fail_json_aws(e, msg="Failed while deleting bucket") module.fail_json_aws(e, msg="Failed while deleting bucket")