From a6301f05aa1241bccae0ed33c9a9cd504810f4ae Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Thu, 14 Nov 2024 15:22:01 -0500 Subject: [PATCH] Fix project name replacement in subnet --- .../models/VpcAndSubnetworkProjectLabelValues.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 fbbed22551..096ee1aa44 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 @@ -19,12 +19,11 @@ final case class VpcAndSubnetworkProjectLabelValues(vpcName: String, subnetNameO } /** - * Replaces the string `\${projectId}` in the subnet name if found. Replace wildcard character used in terra configuration for subnetworks with appropriate region + * 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) } - subnetNameOpt map { _.replace(regionWildcard, "regions/"+ region) } - } + def subnetNameOption(projectId: String, region: String): Option[String] = + subnetNameOpt map { _.replace(ProjectIdToken, projectId) } map { _.replace(regionWildcard, "regions/" + region) } } object VpcAndSubnetworkProjectLabelValues {