Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #493 #494

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for #493 #494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions s3tests_boto3/functional/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,13 @@ def get_objects_list(bucket, client=None, prefix=None):
# generator function that returns object listings in batches, where each
# batch is a list of dicts compatible with delete_objects()
def list_versions(client, bucket, batch_size):
key_marker = ''
version_marker = ''
kwargs = {'Bucket': bucket, 'MaxKeys': batch_size}
truncated = True
while truncated:
listing = client.list_object_versions(
Bucket=bucket,
KeyMarker=key_marker,
VersionIdMarker=version_marker,
MaxKeys=batch_size)

key_marker = listing.get('NextKeyMarker')
version_marker = listing.get('NextVersionIdMarker')
listing = client.list_object_versions(**kwargs)

kwargs['KeyMarker'] = listing.get('NextKeyMarker')
kwargs['VersionIdMarker'] = listing.get('NextVersionIdMarker')
truncated = listing['IsTruncated']

objs = listing.get('Versions', []) + listing.get('DeleteMarkers', [])
Expand All @@ -104,11 +99,25 @@ def nuke_bucket(client, bucket):
batch_size = 128
max_retain_date = None

try:
response = client.get_object_lock_configuration(Bucket=bucket)
LockEnabled = True
except ClientError as error:
if error.response['Error']['Code'] == 'ObjectLockConfigurationNotFoundError':
LockEnabled = False
else:
raise error

# list and delete objects in batches
for objects in list_versions(client, bucket, batch_size):
delete = client.delete_objects(Bucket=bucket,
Delete={'Objects': objects, 'Quiet': True},
BypassGovernanceRetention=True)
if(LockEnabled):
delete = client.delete_objects(Bucket=bucket,
Delete={'Objects': objects, 'Quiet': True},
BypassGovernanceRetention = LockEnabled)
else:
delete = client.delete_objects(Bucket=bucket,
Delete={'Objects': objects, 'Quiet': True})


# check for object locks on 403 AccessDenied errors
for err in delete.get('Errors', []):
Expand Down