Fix bug w/ where I conflated endpoint and function options.

Author: taeold

src/common/options.ts

@@ -19,6 +19,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
+import { ManifestEndpoint } from "../runtime/manifest";
 
 /**
  * Special configuration type to reset configuration to platform default.
@@ -47,3 +48,16 @@ export const RESET_VALUE = ResetValue.getInstance();
 export type ResettableKeys<T> = Required<{
   [K in keyof T as [ResetValue] extends [T[K]] ? K : never]: null;
 }>;
+
+/**
+ * @internal
+ */
+export const RESETTABLE_OPTIONS: ResettableKeys<ManifestEndpoint> = {
+  availableMemoryMb: null,
+  timeoutSeconds: null,
+  minInstances: null,
+  maxInstances: null,
+  ingressSettings: null,
+  concurrency: null,
+  serviceAccountEmail: null,
+};

src/runtime/manifest.ts

@@ -38,10 +38,10 @@ export interface ManifestEndpoint {
   timeoutSeconds?: number | Expression<number> | ResetValue;
   vpc?: {
     connector: string | Expression<string> | ResetValue;
-    egressSettings?: string;
+    egressSettings?: string | Expression<string> | ResetValue;
   };
   ingressSettings?: string | ResetValue;
-  serviceAccountEmail?: string;
+  serviceAccountEmail?: string | ResetValue;
   cpu?: number | "gcf_gen1";
   labels?: Record<string, string>;
   environmentVariables?: Record<string, string>;

src/v1/cloud-functions.ts

@@ -30,7 +30,7 @@ import {
 export { Request, Response };
 import { convertIfPresent, copyIfPresent } from "../common/encoding";
 import { ManifestEndpoint, ManifestRequiredAPI } from "../runtime/manifest";
-import { ResettableKeys, ResetValue } from "../common/options";
+import { RESETTABLE_OPTIONS, ResetValue } from "../common/options";
 
 export { Change } from "../common/change";
 
@@ -480,17 +480,6 @@ function _detectAuthType(event: Event) {
   return "UNAUTHENTICATED";
 }
 
-const RESETTABLE_OPTIONS: ResettableKeys<DeploymentOptions> = {
-  ingressSettings: null,
-  maxInstances: null,
-  memory: null,
-  minInstances: null,
-  serviceAccount: null,
-  timeoutSeconds: null,
-  vpcConnector: null,
-  vpcConnectorEgressSettings: null,
-};
-
 /** @internal */
 export function optionsToEndpoint(options: DeploymentOptions): ManifestEndpoint {
   const endpoint: ManifestEndpoint = {};

src/v2/options.ts

@@ -26,7 +26,7 @@
  */
 
 import { convertIfPresent, copyIfPresent } from "../common/encoding";
-import { RESET_VALUE, ResettableKeys, ResetValue } from "../common/options";
+import { RESET_VALUE, RESETTABLE_OPTIONS, ResetValue } from "../common/options";
 import { ManifestEndpoint } from "../runtime/manifest";
 import { declaredParams, Expression } from "../params";
 import { ParamSpec } from "../params/types";
@@ -250,22 +250,10 @@ export interface EventHandlerOptions extends Omit<GlobalOptions, "enforceAppChec
   channel?: string;
 }
 
-const RESETTABLE_CONFIGS: ResettableKeys<GlobalOptions> = {
-  memory: null,
-  timeoutSeconds: null,
-  minInstances: null,
-  maxInstances: null,
-  ingressSettings: null,
-  vpcConnector: null,
-  vpcConnectorEgressSettings: null,
-  serviceAccount: null,
-  concurrency: null,
-};
-
 function initEndpoint(opts: GlobalOptions | EventHandlerOptions | HttpsOptions): ManifestEndpoint {
   const endpoint: ManifestEndpoint = {};
   if (!opts.preserveExternalChanges) {
-    for (const k of Object.keys(RESETTABLE_CONFIGS)) {
+    for (const k of Object.keys(RESETTABLE_OPTIONS)) {
       endpoint[k] = RESET_VALUE;
     }
   }