From dba8b08c694b1c361cb795d862e74a933774de4a Mon Sep 17 00:00:00 2001 From: dspeck Date: Wed, 13 Nov 2024 18:31:45 +0000 Subject: [PATCH] Add matching of wildcard to within region. --- .../batch/models/VpcAndSubnetworkProjectLabelValues.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala index a61b40f880..89c8eabb53 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/VpcAndSubnetworkProjectLabelValues.scala +++ b/supportedBackends/google/batch/src/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/*" }