Merge pull request #148 from grindtildeath/11.0_dev_attachments

[11.0] Require AWS_BUCKETNAME for prod, integration and labs environments only
This commit is contained in:
Akim Juillerat
2020-03-05 09:59:43 +01:00
committed by GitHub
co-authored by GitHub
+4 -2
View File
@@ -122,7 +122,8 @@ class CloudPlatform(models.AbstractModel):
"SWIFT_PASSWORD environment variable is required when "
"ir_attachment.location is 'swift'."
)
container_name = os.environ.get('SWIFT_WRITE_CONTAINER')
container_name = os.environ.get('SWIFT_WRITE_CONTAINER', '')
if environment_name in ('prod', 'integration', 'labs'):
assert container_name, (
"SWIFT_WRITE_CONTAINER environment variable is required when "
"ir_attachment.location is 'swift'.\n"
@@ -178,7 +179,8 @@ class CloudPlatform(models.AbstractModel):
"AWS_SECRET_ACCESS_KEY environment variable is required when "
"ir_attachment.location is 's3'."
)
bucket_name = os.environ.get('AWS_BUCKETNAME')
bucket_name = os.environ.get('AWS_BUCKETNAME', '')
if environment_name in ('prod', 'integration', 'labs'):
assert bucket_name, (
"AWS_BUCKETNAME environment variable is required when "
"ir_attachment.location is 's3'.\n"