feat: remove attemptDeadlineSeconds in v2 scheduled functions (#1776)

* feat: tie scheduled function attemptDeadline to timeoutSeconds

* feat: tie scheduled function attemptDeadline to timeoutSeconds

* run formatter.

* run formatter.

* nit: fix formatting

Author: taeold

spec/runtime/manifest.spec.ts

@@ -286,7 +286,6 @@ describe("initScheduleTrigger", () => {
     expect(st).to.deep.eq({
       schedule: "every 30 minutes",
       timeZone: RESET_VALUE,
-      attemptDeadlineSeconds: RESET_VALUE,
       retryConfig: {
         retryCount: RESET_VALUE,
         maxDoublings: RESET_VALUE,

spec/v2/providers/scheduler.spec.ts

@@ -32,7 +32,6 @@ import { runHandler } from "../../helper";
 const MINIMAL_SCHEDULE_TRIGGER: ManifestEndpoint["scheduleTrigger"] = {
   schedule: "",
   timeZone: options.RESET_VALUE,
-  attemptDeadlineSeconds: options.RESET_VALUE,
   retryConfig: {
     retryCount: options.RESET_VALUE,
     maxRetrySeconds: options.RESET_VALUE,
@@ -67,7 +66,6 @@ describe("schedule", () => {
       expect(schedule.getOpts(options)).to.deep.eq({
         schedule: "* * * * *",
         timeZone: "utc",
-        attemptDeadlineSeconds: undefined,
         retryConfig: {
           retryCount: 3,
           maxRetrySeconds: 1,
@@ -110,7 +108,7 @@ describe("schedule", () => {
         {
           schedule: "* * * * *",
           timeZone: "utc",
-          attemptDeadlineSeconds: 300,
+          timeoutSeconds: 300,
           retryCount: 3,
           maxRetrySeconds: 10,
           minBackoffSeconds: 11,
@@ -127,10 +125,10 @@ describe("schedule", () => {
         platform: "gcfv2",
         labels: { key: "val" },
         region: ["us-central1"],
+        timeoutSeconds: 300,
         scheduleTrigger: {
           schedule: "* * * * *",
           timeZone: "utc",
-          attemptDeadlineSeconds: 300,
           retryConfig: {
             retryCount: 3,
             maxRetrySeconds: 10,
@@ -163,7 +161,6 @@ describe("schedule", () => {
         scheduleTrigger: {
           schedule: "* * * * *",
           timeZone: undefined,
-          attemptDeadlineSeconds: undefined,
           retryConfig: {
             retryCount: undefined,
             maxRetrySeconds: undefined,

src/runtime/manifest.ts

@@ -97,7 +97,6 @@ export interface ManifestEndpoint {
   scheduleTrigger?: {
     schedule: string | Expression<string>;
     timeZone?: string | Expression<string> | ResetValue;
-    attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
     retryConfig?: {
       retryCount?: number | Expression<number> | ResetValue;
       maxRetrySeconds?: string | Expression<string> | ResetValue;
@@ -260,14 +259,12 @@ const RESETTABLE_V1_SCHEDULE_OPTIONS: Omit<
 const RESETTABLE_V2_SCHEDULE_OPTIONS: Omit<
   ResettableKeys<ManifestEndpoint["scheduleTrigger"]["retryConfig"]>,
   "maxRetryDuration" | "maxBackoffDuration" | "minBackoffDuration"
-> &
-  Pick<ResettableKeys<ManifestEndpoint["scheduleTrigger"]>, "attemptDeadlineSeconds"> = {
+> = {
   retryCount: null,
   maxDoublings: null,
   maxRetrySeconds: null,
   minBackoffSeconds: null,
   maxBackoffSeconds: null,
-  attemptDeadlineSeconds: null,
 };
 
 function initScheduleTrigger(
@@ -281,11 +278,7 @@ function initScheduleTrigger(
   };
   if (opts.every((opt) => !opt?.preserveExternalChanges)) {
     for (const key of Object.keys(resetOptions)) {
-      if (key === "attemptDeadlineSeconds") {
-        scheduleTrigger[key] = RESET_VALUE;
-      } else {
-        scheduleTrigger.retryConfig[key] = RESET_VALUE;
-      }
+      scheduleTrigger.retryConfig[key] = RESET_VALUE;
     }
     scheduleTrigger = { ...scheduleTrigger, timeZone: RESET_VALUE };
   }

src/v2/providers/scheduler.ts

@@ -42,7 +42,6 @@ import { withInit } from "../../common/onInit";
 interface SeparatedOpts {
   schedule: string | Expression<string>;
   timeZone?: timezone | Expression<string> | ResetValue;
-  attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
   retryConfig?: {
     retryCount?: number | Expression<number> | ResetValue;
     maxRetrySeconds?: number | Expression<number> | ResetValue;
@@ -64,7 +63,6 @@ export function getOpts(args: string | ScheduleOptions): SeparatedOpts {
   return {
     schedule: args.schedule,
     timeZone: args.timeZone,
-    attemptDeadlineSeconds: args.attemptDeadlineSeconds,
     retryConfig: {
       retryCount: args.retryCount,
       maxRetrySeconds: args.maxRetrySeconds,
@@ -113,13 +111,6 @@ export interface ScheduleOptions extends options.GlobalOptions {
   /** The timezone that the schedule executes in. */
   timeZone?: timezone | Expression<string> | ResetValue;
 
-  /**
-   * The deadline for job attempts in seconds. If the request handler does not respond by this deadline,
-   * the request is cancelled and the attempt is marked as a `DEADLINE_EXCEEDED` failure.
-   * The value must be between 15 and 1800. Defaults to 180.
-   */
-  attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
-
   /** The number of retry attempts for a failed run. */
   retryCount?: number | Expression<number> | ResetValue;
 
@@ -205,7 +196,7 @@ export function onSchedule(
     scheduleTrigger: initV2ScheduleTrigger(separatedOpts.schedule, globalOpts, separatedOpts.opts),
   };
 
-  copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone", "attemptDeadlineSeconds");
+  copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
   copyIfPresent(
     ep.scheduleTrigger.retryConfig,
     separatedOpts.retryConfig,