From 50cb368704e59e964901d2373949f07d7a9a07cd Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Tue, 30 Jul 2019 14:13:07 +0200 Subject: [PATCH] cloud_platform: support client name w/ multiple `-` --- cloud_platform/models/cloud_platform.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud_platform/models/cloud_platform.py b/cloud_platform/models/cloud_platform.py index da876ed..961adae 100644 --- a/cloud_platform/models/cloud_platform.py +++ b/cloud_platform/models/cloud_platform.py @@ -94,7 +94,7 @@ class CloudPlatform(models.AbstractModel): "SWIFT_WRITE_CONTAINER must not be empty for prod " "and integration" ) - prod_container = bool(re.match(r'[a-z]+-odoo-prod', + prod_container = bool(re.match(r'[a-z-]+-odoo-prod', container_name)) if environment_name == 'prod': assert prod_container, ( @@ -150,7 +150,7 @@ class CloudPlatform(models.AbstractModel): "AWS_BUCKETNAME must not be empty for prod " "and integration" ) - prod_bucket = bool(re.match(r'[a-z0-9]+-odoo-prod', bucket_name)) + prod_bucket = bool(re.match(r'[a-z-0-9]+-odoo-prod', bucket_name)) if environment_name == 'prod': assert prod_bucket, ( "AWS_BUCKETNAME should match '-odoo-prod', " @@ -190,7 +190,7 @@ class CloudPlatform(models.AbstractModel): ) prefix = os.environ['ODOO_SESSION_REDIS_PREFIX'] - assert re.match(r'[a-z0-9]+-odoo-[a-z0-9]+[0-9]*', prefix), ( + assert re.match(r'[a-z-0-9]+-odoo-[a-z0-9]+[0-9]*', prefix), ( "ODOO_SESSION_REDIS_PREFIX must match '-odoo-'" ", we got: '%s'" % (prefix,) )