try to auth so we can gsutilc cp

broadinstitute · Dec 13, 2024 · 118862d · 118862d
1 parent a102049
commit 118862d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/scripts/firecloud_api/firecloud_api.py b/scripts/firecloud_api/firecloud_api.py
@@ -42,6 +42,7 @@ def __init__(self, workspace_namespace, workspace_name, sa_json_b64, user, actio
             scopes=scopes
         )
         self.delegated_creds = sa_credentials.with_subject(user)
+        self.storage_client = storage.Client(credentials=sa_credentials, project=sa_credentials.project_id)
 
     def build_auth_headers(self, token: str):
         if not self.delegated_creds.valid:
@@ -285,13 +286,13 @@ def gcloud_auth_list(self):
             return None
 
     def gsutil_copy(self, source, destination):
-        client = storage.Client()  # Uses GOOGLE_APPLICATION_CREDENTIALS implicitly
+        #client = storage.Client()  # Uses GOOGLE_APPLICATION_CREDENTIALS implicitly
         source_bucket_name, source_blob_name = source.replace("gs://", "").split("/", 1)
         destination_bucket_name, destination_blob_name = destination.replace("gs://", "").split("/", 1)
 
-        source_bucket = client.bucket(source_bucket_name)
+        source_bucket = self.storage_client.bucket(source_bucket_name)
         source_blob = source_bucket.blob(source_blob_name)
-        destination_bucket = client.bucket(destination_bucket_name)
+        destination_bucket = self.storage_client.bucket(destination_bucket_name)
 
         source_bucket.copy_blob(source_blob, destination_bucket, destination_blob_name)