From 29fa97a5b1673ee85ec8c04203c1444fdc67fd9d Mon Sep 17 00:00:00 2001 From: steveoh Date: Wed, 6 Sep 2023 18:14:43 -0600 Subject: [PATCH 1/4] fix: resolve vpc value prior to checking it's value closes #6327 --- src/deploy/functions/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deploy/functions/build.ts b/src/deploy/functions/build.ts index 573a199ab4e..ef29ffc5b75 100644 --- a/src/deploy/functions/build.ts +++ b/src/deploy/functions/build.ts @@ -494,10 +494,10 @@ export function toBackend( nullsafeVisitor((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu))) ); if (bdEndpoint.vpc) { + bkEndpoint.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) }; proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings"); } else if (bdEndpoint.vpc === null) { bkEndpoint.vpc = null; From ae603b7db3bcfe61b7c6b903b7541ac3cfc6663c Mon Sep 17 00:00:00 2001 From: steveoh Date: Wed, 4 Oct 2023 23:41:15 +0000 Subject: [PATCH 2/4] chore: correct endpoint resolution --- src/deploy/functions/build.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/deploy/functions/build.ts b/src/deploy/functions/build.ts index ef29ffc5b75..90369aed0cd 100644 --- 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) { - bkEndpoint.vpc = { connector: params.resolveString(bdEndpoint.vpc.connector, paramValues) }; + 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: bdEndpoint.vpc.connector }; proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings"); } else if (bdEndpoint.vpc === null) { bkEndpoint.vpc = null; From 17d5150824920e7fbf3c87723a41a9611b888c70 Mon Sep 17 00:00:00 2001 From: steveoh Date: Thu, 5 Oct 2023 09:29:11 -0600 Subject: [PATCH 3/4] style: correct linting --- src/deploy/functions/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deploy/functions/build.ts b/src/deploy/functions/build.ts index 90369aed0cd..1e97b1440de 100644 --- a/src/deploy/functions/build.ts +++ b/src/deploy/functions/build.ts @@ -498,7 +498,7 @@ export function toBackend( if (bdEndpoint.vpc.connector && !bdEndpoint.vpc.connector.includes("/")) { bdEndpoint.vpc.connector = `projects/${bdEndpoint.project}/locations/${region}/connectors/${bdEndpoint.vpc.connector}`; } - + bkEndpoint.vpc = { connector: bdEndpoint.vpc.connector }; proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings"); } else if (bdEndpoint.vpc === null) { From 4a4188d65c73468d5ebc74bba3b67c87ed928e19 Mon Sep 17 00:00:00 2001 From: steveoh Date: Thu, 5 Oct 2023 09:47:54 -0600 Subject: [PATCH 4/4] fix: do not overwrite entire object --- src/deploy/functions/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deploy/functions/build.ts b/src/deploy/functions/build.ts index 1e97b1440de..47dd2c07a6b 100644 --- a/src/deploy/functions/build.ts +++ b/src/deploy/functions/build.ts @@ -494,7 +494,7 @@ export function toBackend( nullsafeVisitor((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu))) ); if (bdEndpoint.vpc) { - bdEndpoint.vpc = { connector: params.resolveString(bdEndpoint.vpc.connector, paramValues) }; + 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}`; }