You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/06/18 00:46:36 UTC
[GitHub] [airflow] kanga333 commented on a change in pull request #9350: Add deletion by prefix to S3DeleteObjectsOperator
kanga333 commented on a change in pull request #9350:
URL: https://github.com/apache/airflow/pull/9350#discussion_r441907977
##########
File path: airflow/providers/amazon/aws/operators/s3_delete_objects.py
##########
@@ -56,22 +59,34 @@ class S3DeleteObjectsOperator(BaseOperator):
:type verify: bool or str
"""
- template_fields = ('keys', 'bucket')
+ template_fields = ('keys', 'bucket', 'prefix')
@apply_defaults
def __init__(
self,
bucket,
- keys,
+ keys=None,
+ prefix=None,
aws_conn_id='aws_default',
verify=None,
*args, **kwargs):
+
+ if not keys and not prefix:
+ raise ValueError("Either keys or prefix should be set. Both are None")
+
super().__init__(*args, **kwargs)
self.bucket = bucket
self.keys = keys
+ self.prefix = prefix
self.aws_conn_id = aws_conn_id
self.verify = verify
def execute(self, context):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id, verify=self.verify)
- s3_hook.delete_objects(bucket=self.bucket, keys=self.keys)
+
+ if self.keys:
+ keys = self.keys
+ else:
+ keys = s3_hook.list_keys(bucket_name=self.bucket, prefix=self.prefix)
+
Review comment:
Thanks for your review.
I thought I didn't need to do the runtime check because I was checking with __init__, is it necessary?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org