set gcpbatchclient as client for batch service staticaly

Signed-off-by: Javan Lacerda <javanlacerda@google.com>

Author: javanlacerda

src/clusterfuzz/_internal/batch/gcp.py

@@ -20,9 +20,9 @@
 from google.cloud import batch_v1 as batch
 
 from clusterfuzz._internal.base import retry
-from clusterfuzz._internal.remote_task import RemoteTaskInterface
 from clusterfuzz._internal.google_cloud_utils import credentials
 from clusterfuzz._internal.metrics import logs
+from clusterfuzz._internal.remote_task import RemoteTaskInterface
 
 _local = threading.local()
 

src/clusterfuzz/_internal/batch/service.py

@@ -21,6 +21,7 @@
 from clusterfuzz._internal.base.tasks import task_utils
 from clusterfuzz._internal.batch.data_structures import BatchTask
 from clusterfuzz._internal.batch.data_structures import BatchWorkloadSpec
+from clusterfuzz._internal.batch.gcp import GcpBatchClient
 from clusterfuzz._internal.config import local_config
 from clusterfuzz._internal.datastore import data_types
 from clusterfuzz._internal.datastore import ndb_utils
@@ -174,8 +175,8 @@ def _get_specs_from_config(batch_tasks) -> Dict:
 class BatchService:
   """Batch service."""
 
-  def __init__(self, client):
-    self._client = client
+  def __init__(self):
+    self._client = GcpBatchClient()
 
   def create_uworker_main_batch_job(self, module, job_type, input_download_url):
     command = task_utils.get_command_from_module(module)

src/clusterfuzz/_internal/google_cloud_utils/batch.py

@@ -15,18 +15,17 @@
 from typing import List
 
 from clusterfuzz._internal.batch.data_structures import BatchTask
-from clusterfuzz._internal.batch.gcp import GcpBatchClient
 from clusterfuzz._internal.batch.service import BatchService
 
 
 def create_uworker_main_batch_job(module, job_type, input_download_url):
   """Creates a batch job."""
-  service = BatchService(GcpBatchClient())
+  service = BatchService()
   return service.create_uworker_main_batch_job(module, job_type,
                                                input_download_url)
 
 
 def create_uworker_main_batch_jobs(batch_tasks: List[BatchTask]):
   """Creates batch jobs."""
-  service = BatchService(GcpBatchClient())
+  service = BatchService()
   return service.create_uworker_main_batch_jobs(batch_tasks)