From 6654553542d92123def67c94813c694a158a21c7 Mon Sep 17 00:00:00 2001 From: Sny Date: Mon, 26 Apr 2021 13:49:51 +0530 Subject: [PATCH] Source/Collection version delete to correctly delete all cached export files from S3 --- core/common/models.py | 2 +- core/common/services.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/common/models.py b/core/common/models.py index ec736ddf0..4583ecc38 100644 --- a/core/common/models.py +++ b/core/common/models.py @@ -420,7 +420,7 @@ def delete(self, using=None, keep_parents=False): if self.is_content_privately_referred(): raise ValidationError(dict(detail=CONTENT_REFERRED_PRIVATELY.format(self.mnemonic))) - generic_export_path = self.generic_export_path() + generic_export_path = self.generic_export_path(suffix=None) if self.is_head: self.versions.exclude(id=self.id).delete() diff --git a/core/common/services.py b/core/common/services.py index 95f29aebd..df11d688e 100644 --- a/core/common/services.py +++ b/core/common/services.py @@ -136,9 +136,7 @@ def exists(cls, key): def __fetch_keys(cls, prefix='/', delimiter='/'): # pragma: no cover prefix = prefix[1:] if prefix.startswith(delimiter) else prefix s3_resource = cls.resource() - objects = s3_resource.meta.client.list_objects( - Bucket=settings.AWS_STORAGE_BUCKET_NAME, Prefix=prefix - ) + objects = s3_resource.meta.client.list_objects(Bucket=settings.AWS_STORAGE_BUCKET_NAME, Prefix=prefix) return [{'Key': k} for k in [obj['Key'] for obj in objects.get('Contents', [])]] @classmethod