Resolve vpc value prior to checking it's value (#6332)

steveoh · joehan · web-flow · commit b36700f20fa0 · 2023-10-10T15:59:35.000-07:00
* fix: resolve vpc value prior to checking it's value closes #6327 * chore: correct endpoint resolution * style: correct linting * fix: do not overwrite entire object --------- Co-authored-by: joehan <joehanley@google.com>
diff --git a/src/deploy/functions/build.ts b/src/deploy/functions/build.ts
@@ -494,10 +494,12 @@ export function toBackend(
         nullsafeVisitor((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu)))
       );
       if (bdEndpoint.vpc) {
+        bdEndpoint.vpc.connector = params.resolveString(bdEndpoint.vpc.connector, paramValues);
         if (bdEndpoint.vpc.connector && !bdEndpoint.vpc.connector.includes("/")) {
           bdEndpoint.vpc.connector = `projects/${bdEndpoint.project}/locations/${region}/connectors/${bdEndpoint.vpc.connector}`;
         }
-        bkEndpoint.vpc = { connector: params.resolveString(bdEndpoint.vpc.connector, paramValues) };
+
+        bkEndpoint.vpc = { connector: bdEndpoint.vpc.connector };
         proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings");
       } else if (bdEndpoint.vpc === null) {
         bkEndpoint.vpc = null;
