diff --git a/api/services/storage.py b/api/services/storage.py index df49bd42..6769eba8 100644 --- a/api/services/storage.py +++ b/api/services/storage.py @@ -15,9 +15,7 @@ BUCKET_NAME = os.getenv("GCP_BUCKET_NAME", "") PHOTO_PREFIX = os.getenv("GCP_PHOTO_PREFIX", "") PHOTO_JWT_EXPIRE_SECONDS = 600 -TARGET_SERVICE_ACCOUNT = ( - "pvacd-meterapp@waterdatainitiative-271000.iam.gserviceaccount.com" -) +TARGET_SERVICE_ACCOUNT = os.getenv("GCP_SERVICE_ACCOUNT", "") def get_activity_photo_record( diff --git a/docker-compose.development.yml b/docker-compose.development.yml index 0cb58262..ad06bc27 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -54,6 +54,7 @@ services: - GCP_WOODPECKER_BUCKET_NAME=meter-manager-woodpecker-bucket - GCP_BACKUP_PREFIX=pre-prod-db-backups - GCP_PHOTO_PREFIX=pre-prod-meter-activities-photos + - GCP_SERVICE_ACCOUNT=13393509252-compute@developer.gserviceaccount.com - BACKUP_RETENTION_DAYS=14 - APPDB_ENV=.env_devserver command: > diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 4dea88eb..e627ca55 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -54,6 +54,7 @@ services: - GCP_WOODPECKER_BUCKET_NAME=meter-manager-woodpecker-bucket - GCP_BACKUP_PREFIX=prod-db-backups - GCP_PHOTO_PREFIX=prod-meter-activities-photos + - GCP_SERVICE_ACCOUNT=13393509252-compute@developer.gserviceaccount.com - BACKUP_RETENTION_DAYS=90 - APPDB_ENV=.env_production command: >