Change credential passing

michplunkett · Aug 7, 2024 · 54eefd9 · 54eefd9
1 parent 5fa18ea
commit 54eefd9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/incident_reporting/external/google_logger.py b/incident_reporting/external/google_logger.py
@@ -1,6 +1,5 @@
 """Initialize and set the logging defaults."""
 
-import json
 import logging
 import sys
 
@@ -18,10 +17,11 @@ def init_logger():
     if ENV_GCP_CREDENTIALS.endswith(FILE_TYPE_JSON):
         logging_client = gcp_logging.Client()
     else:
-        credentials = service_account.Credentials.from_service_account_info(
-            json.loads(ENV_GCP_CREDENTIALS)
+        logging_client = gcp_logging.Client(
+            credentials=service_account.Credentials.from_service_account_info(
+                ENV_GCP_CREDENTIALS
+            )
         )
-        logging_client = gcp_logging.Client(credentials=credentials)
 
     logging_client.setup_logging(log_level=logging.INFO)
     logging.getLogger().addHandler(logging.StreamHandler(sys.stdout))
diff --git a/incident_reporting/external/google_nbd.py b/incident_reporting/external/google_nbd.py
@@ -1,7 +1,6 @@
 """Contains code relating to the Google Cloud Platform Datastore service."""
 
 import gzip
-import json
 import os
 from datetime import date, datetime, timedelta
 
@@ -98,11 +97,10 @@ def __init__(self):
         if ENV_GCP_CREDENTIALS.endswith(FILE_TYPE_JSON):
             self.client = Client()
         else:
-            credentials = service_account.Credentials.from_service_account_info(
-                json.loads(ENV_GCP_CREDENTIALS)
-            )
             self.client = Client(
-                credentials=credentials,
+                credentials=service_account.Credentials.from_service_account_info(
+                    ENV_GCP_CREDENTIALS
+                ),
             )
 
     @staticmethod