fix: adapt get_credentials for filepaths

basedosdados · Oct 9, 2023 · ad2b05b · ad2b05b
1 parent 77110c3
commit ad2b05b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/basedosdados_api/api/v1/admin.py b/basedosdados_api/api/v1/admin.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-import json
+from json import loads
+from pathlib import Path
 from time import sleep
 
 from django import forms
@@ -216,8 +217,14 @@ class CoverageTableInline(admin.StackedInline):
 
 def get_credentials():
     """Get google cloud credentials"""
-    credentials_dict = json.loads(settings.GOOGLE_APPLICATION_CREDENTIALS)
-    credentials = service_account.Credentials.from_service_account_info(credentials_dict)
+    creds_env = settings.GOOGLE_APPLICATION_CREDENTIALS
+    try:
+        creds_path = Path(creds_env)
+        assert creds_path.is_absolute() or creds_path.is_relative_to('.')
+        credentials = service_account.Credentials.from_service_account_file(creds_path)
+    except (TypeError, ValueError):
+        credentials_dict = loads(creds_env)
+        credentials = service_account.Credentials.from_service_account_info(credentials_dict)
     return credentials
 
 

diff --git a/basedosdados_api/settings/dev.py b/basedosdados_api/settings/dev.py
@@ -42,3 +42,6 @@
 
 # Logging
 setup_logger(level="DEBUG", serialize=False)
+
+# Google Application Credentials
+GOOGLE_APPLICATION_CREDENTIALS = getenv("GOOGLE_APPLICATION_CREDENTIALS", "")