ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 11:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixes #37752 Delete all versions and deletemarkers in S3_Bucket when force paramet… (#39781)

Browse source 
* Delete all versions and deletemarkers in S3_Bucket when force parameter is passed

* Fix PEP8 style conformance

* Clarify explanation of force parameter
This commit is contained in:
Guy Templeton 2018-07-18 13:49:01 +01:00 • committed by ansibot
parent a2e7869362
commit 841b063d12
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,8 @@ author: "Rob White (@wimnat)"
options: options:
force: force:
description: description:
- When trying to delete a bucket, delete all keys in the bucket first (an s3 bucket must be empty for a successful deletion) - When trying to delete a bucket, delete all keys (including versions and delete markers)
in the bucket first (an s3 bucket must be empty for a successful deletion)
type: bool type: bool
default: 'no' default: 'no'
name: name:
@ -417,6 +418,13 @@ def paginated_list(s3_client, **pagination_params):
yield [data['Key'] for data in page.get('Contents', [])] yield [data['Key'] for data in page.get('Contents', [])]
def paginated_versions_list(s3_client, **pagination_params):
pg = s3_client.get_paginator('list_object_versions')
for page in pg.paginate(**pagination_params):
# We have to merge the Versions and DeleteMarker lists here, as DeleteMarkers can still prevent a bucket deletion
yield [(data['Key'], data['VersionId']) for data in (page.get('Versions', []) + page.get('DeleteMarkers', []))]
def destroy_bucket(s3_client, module): def destroy_bucket(s3_client, module):
force = module.params.get("force") force = module.params.get("force")
@ -432,10 +440,10 @@ def destroy_bucket(s3_client, module):
module.exit_json(changed=False) module.exit_json(changed=False)
if force: if force:
# if there are contents then we need to delete them before we can delete the bucket # if there are contents then we need to delete them (including versions) before we can delete the bucket
try: try:
for keys in paginated_list(s3_client, Bucket=name): for key_version_pairs in paginated_versions_list(s3_client, Bucket=name):
formatted_keys = [{'Key': key} for key in keys] formatted_keys = [{'Key': key, 'VersionId': version} for key, version in key_version_pairs]
if formatted_keys: if formatted_keys:
s3_client.delete_objects(Bucket=name, Delete={'Objects': formatted_keys}) s3_client.delete_objects(Bucket=name, Delete={'Objects': formatted_keys})
except (BotoCoreError, ClientError) as e: except (BotoCoreError, ClientError) as e: