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

Merge pull request #263 from grindtildeath/12.0-fix-typeerror_resource_bucket_name

Browse Source 
[12.0] attachment_s3: Fix TypeError with bucket_name
This commit is contained in:
Yannick Vaucher
2021-10-05 16:56:44 +02:00
committed by GitHub
co-authored by GitHub
parent 6564ab7c97 80fd0bf130
commit 355e73078a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_s3/models/ir_attachment.py
+3 -2
View File
@@ -45,7 +45,6 @@ class IrAttachment(models.Model):
bucket_name = bucket_name or os.environ.get('AWS_BUCKETNAME') bucket_name = bucket_name or os.environ.get('AWS_BUCKETNAME')
# replaces {db} by the database name to handle multi-tenancy # replaces {db} by the database name to handle multi-tenancy
bucket_name = bucket_name.format(db=self.env.cr.dbname) bucket_name = bucket_name.format(db=self.env.cr.dbname)
params = { params = {
'aws_access_key_id': access_key, 'aws_access_key_id': access_key,
'aws_secret_access_key': secret_key, 'aws_secret_access_key': secret_key,
@@ -74,7 +73,9 @@ class IrAttachment(models.Model):
""" """
params = self._get_s3_connection_params(bucket_name=name) params = self._get_s3_connection_params(bucket_name=name)
bucket_name = params.get('bucket_name') # Pop the bucket_name to avoid TypeError: resource() got an unexpected
# keyword argument 'bucket_name'
bucket_name = params.pop("bucket_name")
if not ( if not (
params["aws_access_key_id"] and params["aws_access_key_id"] and
params["aws_secret_access_key"] and params["aws_secret_access_key"] and