Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-24 16:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! attachment_s3: Add set ACL function

Browse Source
This commit is contained in:
Akim Juillerat
2020-01-29 12:45:39 +01:00
parent 1ad9a198a2
commit 6de4ced0f5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_s3/models/ir_attachment.py
+6
View File
@@ -16,6 +16,7 @@ _logger = logging.getLogger(__name__)
try: try:
import boto3 import boto3
from botocore.exceptions import ClientError, EndpointConnectionError from botocore.exceptions import ClientError, EndpointConnectionError
from botocore.errorfactory import NoSuchKey
except ImportError: except ImportError:
boto3 = None # noqa boto3 = None # noqa
ClientError = None # noqa ClientError = None # noqa
@@ -118,6 +119,7 @@ class IrAttachment(models.Model):
_logger.exception( _logger.exception(
"error getting bucket from object storage" "error getting bucket from object storage"
) )
return False
key = s3uri.item() key = s3uri.item()
try: try:
obj = bucket.Object(key=key) obj = bucket.Object(key=key)
@@ -126,6 +128,10 @@ class IrAttachment(models.Model):
"ACL %s successfully set on object %s" % (acl, fname) "ACL %s successfully set on object %s" % (acl, fname)
) )
return True return True
except NoSuchKey:
_logger.exception(
"Object %s does not exists on S3 bucket" % fname
)
except ClientError: except ClientError:
_logger.exception( _logger.exception(
"Cannot set ACL %s on object %s" % (acl, fname) "Cannot set ACL %s on object %s" % (acl, fname)