Fix bug where reset keys were based on fn opt not endpoint.

Author: taeold

src/common/providers/tasks.ts

@@ -27,6 +27,7 @@ import * as logger from "../../logger";
 import * as https from "./https";
 import { Expression } from "../../params";
 import { ResettableKeys, ResetValue } from "../options";
+import { ManifestEndpoint } from "../../runtime/manifest";
 
 /** How a task should be retried in the event of a non-2xx return. */
 export interface RetryConfig {
@@ -109,7 +110,9 @@ type v1TaskHandler = (data: any, context: TaskContext) => void | Promise<void>;
 type v2TaskHandler<Req> = (request: Request<Req>) => void | Promise<void>;
 
 /** @internal */
-export const RESETTABLE_RETRY_CONFIG_OPTIONS: ResettableKeys<RetryConfig> = {
+export const RESETTABLE_RETRY_CONFIG_OPTIONS: ResettableKeys<
+  ManifestEndpoint["taskQueueTrigger"]["retryConfig"]
+> = {
   maxAttempts: null,
   maxDoublings: null,
   maxBackoffSeconds: null,
@@ -118,7 +121,9 @@ export const RESETTABLE_RETRY_CONFIG_OPTIONS: ResettableKeys<RetryConfig> = {
 };
 
 /** @internal */
-export const RESETTABLE_RATE_LIMITS_OPTIONS: ResettableKeys<RateLimits> = {
+export const RESETTABLE_RATE_LIMITS_OPTIONS: ResettableKeys<
+  ManifestEndpoint["taskQueueTrigger"]["rateLimits"]
+> = {
   maxConcurrentDispatches: null,
   maxDispatchesPerSecond: null,
 };

src/v1/cloud-functions.ts

@@ -22,21 +22,29 @@
 
 import { Request, Response } from "express";
 import { warn } from "../logger";
-import {
-  DeploymentOptions,
-  RESET_VALUE,
-  RESETTABLE_SCHEDULE_OPTIONS,
-} from "./function-configuration";
+import { DeploymentOptions, RESET_VALUE } from "./function-configuration";
 export { Request, Response };
 import { convertIfPresent, copyIfPresent } from "../common/encoding";
 import { ManifestEndpoint, ManifestRequiredAPI } from "../runtime/manifest";
-import { RESETTABLE_OPTIONS, ResetValue } from "../common/options";
+import { RESETTABLE_OPTIONS, ResettableKeys, ResetValue } from "../common/options";
 
 export { Change } from "../common/change";
 
 /** @internal */
 const WILDCARD_REGEX = new RegExp("{[^/{}]*}", "g");
 
+/** @internal */
+export const RESETTABLE_SCHEDULE_OPTIONS: Omit<
+  ResettableKeys<ManifestEndpoint["scheduleTrigger"]["retryConfig"]>,
+  "maxBackoffSeconds" | "minBackoffSeconds" | "maxRetrySeconds"
+> = {
+  retryCount: null,
+  maxDoublings: null,
+  maxRetryDuration: null,
+  maxBackoffDuration: null,
+  minBackoffDuration: null,
+};
+
 /**
  * Wire format for an event.
  */

src/v1/function-configuration.ts

@@ -1,5 +1,5 @@
 import { Expression } from "../params";
-import { ResettableKeys, ResetValue } from "../common/options";
+import { ResetValue } from "../common/options";
 
 export { RESET_VALUE } from "../common/options";
 
@@ -266,12 +266,3 @@ export interface DeploymentOptions extends RuntimeOptions {
    */
   preserveExternalChanges?: boolean;
 }
-
-/** @internal */
-export const RESETTABLE_SCHEDULE_OPTIONS: ResettableKeys<ScheduleRetryConfig> = {
-  retryCount: null,
-  maxBackoffDuration: null,
-  maxDoublings: null,
-  maxRetryDuration: null,
-  minBackoffDuration: null,
-};

src/v2/providers/scheduler.ts

@@ -23,7 +23,7 @@
 import * as express from "express";
 
 import { copyIfPresent } from "../../common/encoding";
-import { ResetValue } from "../../common/options";
+import { ResettableKeys, ResetValue } from "../../common/options";
 import { timezone } from "../../common/timezone";
 import { ManifestEndpoint, ManifestRequiredAPI } from "../../runtime/manifest";
 import { HttpsFunction } from "./https";
@@ -118,13 +118,16 @@ export interface ScheduleOptions extends options.GlobalOptions {
   maxDoublings?: number | Expression<number> | ResetValue;
 }
 
-const RESETTABLE_SCHEDULE_OPTIONS: Array<keyof ScheduleOptions> = [
-  "retryCount",
-  "maxRetrySeconds",
-  "minBackoffSeconds",
-  "maxBackoffSeconds",
-  "maxDoublings",
-];
+const RESETTABLE_SCHEDULE_OPTIONS: Omit<
+  ResettableKeys<ManifestEndpoint["scheduleTrigger"]["retryConfig"]>,
+  "maxRetryDuration" | "maxBackoffDuration" | "minBackoffDuration"
+> = {
+  retryCount: null,
+  maxDoublings: null,
+  maxRetrySeconds: null,
+  minBackoffSeconds: null,
+  maxBackoffSeconds: null,
+};
 
 /**
  * Handler for scheduled functions. Triggered whenever the associated