From 7e90db4a98f88ebc5b1ceefeffda287eb2c7dcbb Mon Sep 17 00:00:00 2001
From: Daniel Young Lee <danielylee@google.com>
Date: Tue, 28 Dec 2021 13:54:10 -0800
Subject: [PATCH 1/2] Fix bug where empty vpc connector setting was removed.

---
 .../functions/runtimes/node/parseTriggers.ts  |  4 ++--
 .../runtimes/node/parseTriggers.spec.ts       | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/deploy/functions/runtimes/node/parseTriggers.ts b/src/deploy/functions/runtimes/node/parseTriggers.ts
index 707aab8517a..8e801a902c2 100644
--- a/src/deploy/functions/runtimes/node/parseTriggers.ts
+++ b/src/deploy/functions/runtimes/node/parseTriggers.ts
@@ -212,9 +212,9 @@ export function addResourcesToBackend(
       runtime: runtime,
       ...triggered,
     };
-    if (annotation.vpcConnector) {
+    if (annotation.vpcConnector != null) {
       let maybeId = annotation.vpcConnector;
-      if (!maybeId.includes("/")) {
+      if (maybeId && !maybeId.includes("/")) {
         maybeId = `projects/${projectId}/locations/${region}/connectors/${maybeId}`;
       }
       endpoint.vpcConnector = maybeId;
diff --git a/src/test/deploy/functions/runtimes/node/parseTriggers.spec.ts b/src/test/deploy/functions/runtimes/node/parseTriggers.spec.ts
index e148de92a52..675c8157de8 100644
--- a/src/test/deploy/functions/runtimes/node/parseTriggers.spec.ts
+++ b/src/test/deploy/functions/runtimes/node/parseTriggers.spec.ts
@@ -289,4 +289,23 @@ describe("addResourcesToBackend", () => {
 
     expect(result).to.deep.equal(expected);
   });
+
+  it("should preserve empty vpc connector setting", () => {
+    const trigger: parseTriggers.TriggerAnnotation = {
+      ...BASIC_TRIGGER,
+      httpsTrigger: {},
+      vpcConnector: "",
+    };
+
+    const result = backend.empty();
+    parseTriggers.addResourcesToBackend("project", "nodejs16", trigger, result);
+
+    const expected: backend.Backend = backend.of({
+      ...BASIC_ENDPOINT,
+      httpsTrigger: {},
+      vpcConnector: "",
+    });
+
+    expect(result).to.deep.equal(expected);
+  });
 });

From 7864084640720e0acef4c5514ff8a6b9458eb0f1 Mon Sep 17 00:00:00 2001
From: Daniel Young Lee <danielylee@google.com>
Date: Tue, 28 Dec 2021 13:59:44 -0800
Subject: [PATCH 2/2] Add changelog entry.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb2d..dbacb12198a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+- Preserve empty vpc connector setting on function deploy. (#3973)