WX-1595 Fix batch workflow options override (#7466)

Co-authored-by: SophiaPerzan-DG <[email protected]>

CHANGELOG.md

@@ -24,6 +24,7 @@ be found [here](https://cromwell.readthedocs.io/en/stable/backends/HPC/#optional
 - The `genomics` configuration entry was renamed to `batch`, see [ReadTheDocs](https://cromwell.readthedocs.io/en/stable/backends/GCPBatch/) for more information.
 - Fixes the preemption error handling, now, the correct error message is printed, this also handles the other potential exit codes.
 - Fixes pulling Docker image metadata from private GCR repositories.
+- Fixed `google_project` and `google_compute_service_account` workflow options not taking effect when using GCP Batch backend
 
 ### Improved handling of Life Sciences API quota errors
 

supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala

@@ -156,7 +156,6 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe
 
   override def submitRequest(data: GcpBatchRequest): CreateJobRequest = {
 
-    val batchAttributes = data.gcpBatchParameters.batchAttributes
     val runtimeAttributes = data.gcpBatchParameters.runtimeAttributes
     val createParameters = data.createParameters
     val retryCount = data.gcpBatchParameters.runtimeAttributes.preemptible
@@ -165,8 +164,8 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe
     val gcpBootDiskSizeMb = convertGbToMib(runtimeAttributes)
 
     // set parent for metadata storage of job information
-    lazy val parent = s"projects/${data.gcpBatchParameters.projectId}/locations/${data.gcpBatchParameters.region}"
-    val gcpSa = ServiceAccount.newBuilder.setEmail(batchAttributes.computeServiceAccount).build
+    lazy val parent = s"projects/${createParameters.projectId}/locations/${data.gcpBatchParameters.region}"
+    val gcpSa = ServiceAccount.newBuilder.setEmail(createParameters.computeServiceAccount).build
 
     // make zones path
     val zones = toZonesPath(runtimeAttributes.zones)