Merge pull request #116 from yvaucher/aws-bucketname-unstrctured

Add AWS_BUCKETNAME_UNSTRUCTURED to by-pass check
This commit is contained in:
Yannick Vaucher
2020-02-25 16:27:46 +01:00
committed by GitHub
co-authored by GitHub
2 changed files with 22 additions and 0 deletions
+8
View File
@@ -81,6 +81,10 @@ Besides, the attachment location should be set to `s3` (this is
automatically done by the `install` methods of the `cloud_platform` module). automatically done by the `install` methods of the `cloud_platform` module).
* `ir.config_parameter` `ir_attachment.location`: `s3` * `ir.config_parameter` `ir_attachment.location`: `s3`
Structure of bucket name is checked against environment.
It is possible to by-pass this behavior by using the following environment variable:
`AWS_BUCKETNAME_UNSTRUCTURED`.
### Attachments in the Object Storage Swift ### Attachments in the Object Storage Swift
@@ -100,6 +104,10 @@ Besides, the attachment location should be set to `swift` (this is
automatically done by the `install` methods of the `cloud_platform` module). automatically done by the `install` methods of the `cloud_platform` module).
* `ir.config_parameter` `ir_attachment.location`: `swift` * `ir.config_parameter` `ir_attachment.location`: `swift`
Structure of container name is checked against environment.
It is possible to by-pass this behavior by using the following environment variable:
`SWIFT_WRITE_CONTAINER_UNSTRUCTURED`.
### Sessions in Redis ### Sessions in Redis
* prod: * prod:
+14
View File
@@ -113,6 +113,13 @@ class CloudPlatform(models.AbstractModel):
) )
prod_container = bool(re.match(r'[a-z0-9-]+-odoo-prod', prod_container = bool(re.match(r'[a-z0-9-]+-odoo-prod',
container_name)) container_name))
# A bucket name is defined under the following format
# <client>-odoo-<env>
#
# Use SWIFT_WRITE_CONTAINER_UNSTRUCTURED to by-pass check on bucket name
# structure
if os.environ.get('SWIFT_WRITE_CONTAINER_UNSTRUCTURED'):
return
if environment_name == 'prod': if environment_name == 'prod':
assert prod_container, ( assert prod_container, (
"SWIFT_WRITE_CONTAINER should match '<client>-odoo-prod', " "SWIFT_WRITE_CONTAINER should match '<client>-odoo-prod', "
@@ -167,6 +174,13 @@ class CloudPlatform(models.AbstractModel):
"If you don't actually need a bucket, change the" "If you don't actually need a bucket, change the"
" 'ir_attachment.location' parameter." " 'ir_attachment.location' parameter."
) )
# A bucket name is defined under the following format
# <client>-odoo-<env>
#
# Use AWS_BUCKETNAME_UNSTRUCTURED to by-pass check on bucket name
# structure
if os.environ.get('AWS_BUCKETNAME_UNSTRUCTURED'):
return
prod_bucket = bool(re.match(r'[a-z-0-9]+-odoo-prod', bucket_name)) prod_bucket = bool(re.match(r'[a-z-0-9]+-odoo-prod', bucket_name))
if environment_name == 'prod': if environment_name == 'prod':
assert prod_bucket, ( assert prod_bucket, (