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

fix: do not set extra parameter irsa (#360)

Browse Source
This commit is contained in:
Vincent Renaville
2022-04-01 14:34:12 +02:00
committed by GitHub
co-authored by GitHub
parent 6c415df113
commit 034799e1f5
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_s3/models/ir_attachment.py
+6 -8
View File
@@ -61,18 +61,16 @@ class IrAttachment(models.Model):
params = { params = {
'bucket_name': bucket_name, 'bucket_name': bucket_name,
} }
if access_key: if not aws_use_irsa and access_key:
params['aws_access_key_id'] = access_key params['aws_access_key_id'] = access_key
if secret_key: if secret_key:
params['aws_secret_access_key'] = secret_key params['aws_secret_access_key'] = secret_key
if aws_use_irsa:
params['aws_use_irsa'] = aws_use_irsa
if host: if host:
params['endpoint_url'] = host params['endpoint_url'] = host
if region_name: if region_name:
params['region_name'] = region_name params['region_name'] = region_name
return params return params, aws_use_irsa
@api.model @api.model
def _get_s3_bucket(self, name=None): def _get_s3_bucket(self, name=None):
@@ -90,7 +88,7 @@ class IrAttachment(models.Model):
from the environment variable ``AWS_BUCKETNAME`` will be read. from the environment variable ``AWS_BUCKETNAME`` will be read.
""" """
params = self._get_s3_connection_params(bucket_name=name) params, aws_use_irsa = self._get_s3_connection_params(bucket_name=name)
# Pop the bucket_name to avoid TypeError: resource() got an unexpected # Pop the bucket_name to avoid TypeError: resource() got an unexpected
# keyword argument 'bucket_name' # keyword argument 'bucket_name'
bucket_name = params.pop("bucket_name") bucket_name = params.pop("bucket_name")
@@ -98,7 +96,7 @@ class IrAttachment(models.Model):
bucket_name and bucket_name and
(params.get("aws_access_key_id") and (params.get("aws_access_key_id") and
params.get("aws_secret_access_key") or params.get("aws_secret_access_key") or
params.get("aws_use_irsa")) aws_use_irsa)
): ):
msg = _('If you want to read from the %s S3 bucket, the following ' msg = _('If you want to read from the %s S3 bucket, the following '
'environment variables must be set:\n' 'environment variables must be set:\n'