Add matching of wildcard to within region.

broadinstitute · Nov 13, 2024 · dba8b08 · dba8b08
1 parent c528fe7
commit dba8b08
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala b/.../main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala
@@ -24,10 +24,11 @@ final case class VpcAndSubnetworkProjectLabelValues(vpcName: String, subnetNameO
   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("*", region) }
+    subnetNameOpt map { _.replace(regionWildcard, "regions/"+ region) }
   }
 }
 
 object VpcAndSubnetworkProjectLabelValues {
   private val ProjectIdToken = s"$${projectId}"
+  private val regionWildcard = s"regions/*"
 }