Takes the zones from runtime attributes and determines the region fro…

…m the zone by dropping the last 2 characters which are always a dash and a single letter.
broadinstitute · Nov 14, 2024 · 81ec26e · 81ec26e
1 parent dba8b08
commit 81ec26e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...e/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala b/...e/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala
@@ -57,7 +57,7 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe
       .setNetwork(vpcAndSubnetworkProjectLabelValues.networkName(data.createParameters.projectId))
 
     vpcAndSubnetworkProjectLabelValues
-      .subnetNameOption(projectId=data.createParameters.projectId, region=data.gcpBatchParameters.region)
+      .subnetNameOption(projectId=data.createParameters.projectId, region=zonesToRegion(data.createParameters.runtimeAttributes.zones))
       .foreach(network.setSubnetwork)
 
     network

diff --git a/.../main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala b/.../main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala
@@ -19,11 +19,10 @@ final case class VpcAndSubnetworkProjectLabelValues(vpcName: String, subnetNameO
   }
 
   /**
-   * Replaces the string `\${projectId}` in the subnet name if found.
+   * Replaces the string `\${projectId}` in the subnet name if found.  Replace wildcard character used in terra configuration for subnetworks with appropriate region
    */
   def subnetNameOption(projectId: String, region: String): Option[String] = {
     subnetNameOpt map { _.replace(ProjectIdToken, projectId) }
-    //replace wildcard character used in terra configuration for subnetworks with appropriate region
     subnetNameOpt map { _.replace(regionWildcard, "regions/"+ region) }
   }
 }

diff --git a/...gle/batch/src/main/scala/cromwell/backend/google/batch/util/BatchUtilityConversions.scala b/...gle/batch/src/main/scala/cromwell/backend/google/batch/util/BatchUtilityConversions.scala
@@ -12,6 +12,12 @@ trait BatchUtilityConversions {
   def toZonesPath(zones: Vector[String]): String =
     zones.map(zone => "zones/" + zone).mkString(" ")
 
+  // Gets first zone in vector and removes last two characters of zone to construct region
+  def zonesToRegion(zones: Vector[String]): String = {
+    val regionFromZone = zones.head.dropRight(2)
+    regionFromZone
+  }
+
   // lowercase text to match gcp label requirements
   def toLabel(text: String): String =
     text.toLowerCase