Delete S3 file only when bucket is the current one

attachment_s3/models/ir_attachment.py

@@ -150,20 +150,23 @@ class IrAttachment(models.Model):
             s3uri = S3Uri(fname)
             bucket_name = s3uri.bucket()
             item_name = s3uri.item()
-
+            # delete the file only if it is on the current configured bucket
-            bucket = self._get_s3_bucket(name=bucket_name)
+            # otherwise, we might delete files used on a different environment
-            filekey = bucket.get_key(item_name)
+            if bucket_name == os.environ.get('AWS_BUCKETNAME'):
-            if not count and filekey:
+                bucket = self._get_s3_bucket()
-                try:
+                filekey = bucket.get_key(item_name)
-                    filekey.delete()
+                if not count and filekey:
-                    _logger.info(
+                    try:
-                        'file %s deleted on the object storage' % (fname,)
+                        filekey.delete()
-                    )
+                        _logger.info(
-                except S3ResponseError:
+                            'file %s deleted on the object storage' % (fname,)
-                    # log verbose error from s3, return short message for user
+                        )
-                    _logger.exception(
+                    except S3ResponseError:
-                        'Error during deletion of the file %s' % fname
+                        # log verbose error from s3, return short message for
-                    )
+                        # user
+                        _logger.exception(
+                            'Error during deletion of the file %s' % fname
+                        )
         else:
             super(IrAttachment, self)._file_delete(fname)