Skip to content

Commit

Permalink
Merge pull request #56 from edx/hassan/fix-s3-delete-directory
Browse files Browse the repository at this point in the history
chore: skip deletion if there are no keys under prefix.
  • Loading branch information
HassanJaveed84 authored Jan 14, 2022
2 parents de84d51 + 92bee3b commit 3d99ddb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion edx_prefectutils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Top-level package for edx-prefectutils.
"""

__version__ = '2.2.4'
__version__ = '2.2.5'
15 changes: 8 additions & 7 deletions edx_prefectutils/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ def delete_s3_directory(bucket: str = None, prefix: str = None, credentials: dic
credentials (dict): The AWS credentials to use.
"""
s3_keys = list_object_keys_from_s3.run(bucket, prefix, credentials)
s3_client = get_boto_client('s3', credentials=credentials)
s3_client.delete_objects(
Bucket=bucket,
Delete={
'Objects': [{'Key': key} for key in s3_keys]
}
)
if s3_keys:
s3_client = get_boto_client('s3', credentials=credentials)
s3_client.delete_objects(
Bucket=bucket,
Delete={
'Objects': [{'Key': key} for key in s3_keys]
}
)


@task
Expand Down

0 comments on commit 3d99ddb

Please sign in to comment.