Fix bug w/ resetting vpc settings.

Author: taeold

spec/fixtures.ts

@@ -9,8 +9,5 @@ export const MINIMAL_ENDPOINT: Partial<ManifestEndpoint> = {
   minInstances: RESET_VALUE,
   serviceAccountEmail: RESET_VALUE,
   timeoutSeconds: RESET_VALUE,
-  vpc: {
-    connector: RESET_VALUE,
-    egressSettings: RESET_VALUE,
-  },
+  vpc: RESET_VALUE,
 };

src/runtime/manifest.ts

@@ -36,10 +36,12 @@ export interface ManifestEndpoint {
   minInstances?: number | Expression<number> | ResetValue;
   concurrency?: number | Expression<number> | ResetValue;
   timeoutSeconds?: number | Expression<number> | ResetValue;
-  vpc?: {
-    connector: string | Expression<string> | ResetValue;
-    egressSettings?: string | Expression<string> | ResetValue;
-  };
+  vpc?:
+    | {
+        connector: string | Expression<string>;
+        egressSettings?: string | Expression<string> | ResetValue;
+      }
+    | ResetValue;
   serviceAccountEmail?: string | Expression<string> | ResetValue;
   cpu?: number | "gcf_gen1";
   labels?: Record<string, string>;
@@ -146,6 +148,7 @@ const RESETTABLE_OPTIONS: ResettableKeys<ManifestEndpoint> = {
   ingressSettings: null,
   concurrency: null,
   serviceAccountEmail: null,
+  vpc: null,
 };
 
 interface ManifestOptions {
@@ -161,11 +164,6 @@ function initEndpoint(
     for (const key of Object.keys(resetOptions)) {
       endpoint[key] = RESET_VALUE;
     }
-    // VPC settings is not flat and handled separately.
-    endpoint.vpc = {
-      connector: RESET_VALUE,
-      egressSettings: RESET_VALUE,
-    };
   }
   return endpoint;
 }

src/v1/cloud-functions.ts

@@ -490,7 +490,7 @@ export function optionsToEndpoint(options: DeploymentOptions): ManifestEndpoint
   );
   if (options?.vpcConnector !== undefined) {
     if (options.vpcConnector === null || options.vpcConnector instanceof ResetValue) {
-      endpoint.vpc = { connector: RESET_VALUE, egressSettings: RESET_VALUE };
+      endpoint.vpc = RESET_VALUE;
     } else {
       const vpc: ManifestEndpoint["vpc"] = { connector: options.vpcConnector };
       convertIfPresent(vpc, options, "egressSettings", "vpcConnectorEgressSettings");

src/v2/options.ts

@@ -272,7 +272,7 @@ export function optionsToEndpoint(
   convertIfPresent(endpoint, opts, "serviceAccountEmail", "serviceAccount");
   if (opts.vpcConnector !== undefined) {
     if (opts.vpcConnector === null || opts.vpcConnector instanceof ResetValue) {
-      endpoint.vpc = { connector: RESET_VALUE, egressSettings: RESET_VALUE };
+      endpoint.vpc = RESET_VALUE;
     } else {
       const vpc: ManifestEndpoint["vpc"] = { connector: opts.vpcConnector };
       convertIfPresent(vpc, opts, "egressSettings", "vpcConnectorEgressSettings");