Marmelator/pyinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

RED-5324: Added missing storage-region to key to config and to minio-client creation so that storage access works on s3

Browse Source
This commit is contained in:
Viktor Seifert 2022-09-30 15:12:58 +02:00
parent 88b4c5c7ce
commit ffaa4a668b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyinfra/config.py
View File

@ -49,6 +49,9 @@ class Config(object):
# Password for s3 storage # Password for s3 storage
self.storage_secret = read_from_environment("STORAGE_SECRET", "password") self.storage_secret = read_from_environment("STORAGE_SECRET", "password")
# Region for s3 storage
self.storage_region = read_from_environment("STORAGE_REGION", "eu-central-1")
# Connection string for Azure storage # Connection string for Azure storage
self.storage_azureconnectionstring = read_from_environment( self.storage_azureconnectionstring = read_from_environment(
"STORAGE_AZURECONNECTIONSTRING", "DefaultEndpointsProtocol=..." "STORAGE_AZURECONNECTIONSTRING", "DefaultEndpointsProtocol=..."

4
pyinfra/storage/adapters/s3.py
View File

@ -94,7 +94,7 @@ def get_s3_storage(config: Config):
**_parse_endpoint(config.storage_endpoint), **_parse_endpoint(config.storage_endpoint),
access_key=config.storage_key, access_key=config.storage_key,
secret_key=config.storage_secret, secret_key=config.storage_secret,
# FIXME Is this still needed? Check and if yes, add it to config # This is relevant for running on s3
# region=config.region, region=config.storage_region,
) )
) )