refactor: change level attemptDeadline same as timeZone level for api

Author: Skyfury2651

spec/runtime/manifest.spec.ts

@@ -259,13 +259,13 @@ describe("initScheduleTrigger", () => {
     expect(st).to.deep.eq({
       schedule: "every 30 minutes",
       timeZone: RESET_VALUE,
+      attemptDeadline: RESET_VALUE,
       retryConfig: {
         retryCount: RESET_VALUE,
         maxDoublings: RESET_VALUE,
         maxRetryDuration: RESET_VALUE,
         minBackoffDuration: RESET_VALUE,
         maxBackoffDuration: RESET_VALUE,
-        attemptDeadline: RESET_VALUE,
       },
     });
   });
@@ -287,13 +287,13 @@ describe("initScheduleTrigger", () => {
     expect(st).to.deep.eq({
       schedule: "every 30 minutes",
       timeZone: RESET_VALUE,
+      attemptDeadline: RESET_VALUE,
       retryConfig: {
         retryCount: RESET_VALUE,
         maxDoublings: RESET_VALUE,
         maxRetrySeconds: RESET_VALUE,
         minBackoffSeconds: RESET_VALUE,
         maxBackoffSeconds: RESET_VALUE,
-        attemptDeadline: RESET_VALUE,
       },
     });
   });

spec/v1/cloud-functions.spec.ts

@@ -206,13 +206,13 @@ describe("makeCloudFunction", () => {
       platform: "gcfv1",
       scheduleTrigger: {
         ...schedule,
+        attemptDeadline: RESET_VALUE,
         retryConfig: {
           ...schedule.retryConfig,
           maxBackoffDuration: RESET_VALUE,
           maxDoublings: RESET_VALUE,
           maxRetryDuration: RESET_VALUE,
           minBackoffDuration: RESET_VALUE,
-          attemptDeadline: RESET_VALUE,
         },
       },
       labels: {},

spec/v1/providers/fixtures.ts

@@ -46,6 +46,6 @@ export const MINIMAL_SCHEDULE_TRIGGER: ManifestEndpoint["scheduleTrigger"] = {
     maxBackoffDuration: options.RESET_VALUE,
     minBackoffDuration: options.RESET_VALUE,
     maxDoublings: options.RESET_VALUE,
-    attemptDeadline: options.RESET_VALUE,
   },
+  attemptDeadline: options.RESET_VALUE,
 };

spec/v1/providers/pubsub.spec.ts

@@ -217,7 +217,6 @@ describe("Pubsub Functions", () => {
           schedule: "every 5 minutes",
           retryConfig: {
             ...retryConfig,
-            attemptDeadline: RESET_VALUE,
           },
         });
         expect(result.__endpoint.labels).to.be.empty;
@@ -254,7 +253,6 @@ describe("Pubsub Functions", () => {
             schedule: "every 5 minutes",
             retryConfig: {
               ...retryConfig,
-              attemptDeadline: RESET_VALUE,
             },
             timeZone: "America/New_York",
           });
@@ -349,7 +347,6 @@ describe("Pubsub Functions", () => {
           timeZone: RESET_VALUE,
           retryConfig: {
             ...retryConfig,
-            attemptDeadline: RESET_VALUE,
           },
         });
         expect(result.__endpoint.region).to.deep.equal(["us-east1"]);
@@ -393,7 +390,6 @@ describe("Pubsub Functions", () => {
           timeZone: "America/New_York",
           retryConfig: {
             ...retryConfig,
-            attemptDeadline: RESET_VALUE,
           },
         });
         expect(result.__endpoint.region).to.deep.equal(["us-east1"]);

spec/v2/providers/scheduler.spec.ts

@@ -38,8 +38,8 @@ const MINIMAL_SCHEDULE_TRIGGER: ManifestEndpoint["scheduleTrigger"] = {
     minBackoffSeconds: options.RESET_VALUE,
     maxBackoffSeconds: options.RESET_VALUE,
     maxDoublings: options.RESET_VALUE,
-    attemptDeadline: options.RESET_VALUE,
   },
+  attemptDeadline: options.RESET_VALUE,
 };
 
 describe("schedule", () => {
@@ -74,8 +74,8 @@ describe("schedule", () => {
           minBackoffSeconds: 2,
           maxBackoffSeconds: 3,
           maxDoublings: 4,
-          attemptDeadline: "120s",
         },
+        attemptDeadline: "120s",
         opts: {
           ...options,
           memory: "128MiB",
@@ -115,7 +115,7 @@ describe("schedule", () => {
         () => undefined
       );
 
-      expect(schfn.__endpoint.scheduleTrigger?.retryConfig?.attemptDeadline).to.equal(
+      expect(schfn.__endpoint.scheduleTrigger?.attemptDeadline).to.equal(
         "320s"
       );
     });
@@ -151,8 +151,8 @@ describe("schedule", () => {
             minBackoffSeconds: 11,
             maxBackoffSeconds: 12,
             maxDoublings: 2,
-            attemptDeadline: "120s",
           },
+          attemptDeadline: "120s",
         },
       });
       expect(schfn.__requiredAPIs).to.deep.eq([
@@ -178,13 +178,13 @@ describe("schedule", () => {
         scheduleTrigger: {
           schedule: "* * * * *",
           timeZone: undefined,
+          attemptDeadline: undefined,
           retryConfig: {
             retryCount: undefined,
             maxRetrySeconds: undefined,
             minBackoffSeconds: undefined,
             maxBackoffSeconds: undefined,
             maxDoublings: undefined,
-            attemptDeadline: undefined,
           },
         },
       });

src/runtime/manifest.ts

@@ -107,8 +107,8 @@ export interface ManifestEndpoint {
       maxRetryDuration?: string | Expression<string> | ResetValue;
       minBackoffDuration?: string | Expression<string> | ResetValue;
       maxBackoffDuration?: string | Expression<string> | ResetValue;
-      attemptDeadline?: string | Expression<string> | ResetValue;
     };
+    attemptDeadline?: string | Expression<string> | ResetValue;
   };
 
   blockingTrigger?: {
@@ -255,7 +255,6 @@ const RESETTABLE_V1_SCHEDULE_OPTIONS: Omit<
   maxRetryDuration: null,
   maxBackoffDuration: null,
   minBackoffDuration: null,
-  attemptDeadline: null,
 };
 
 const RESETTABLE_V2_SCHEDULE_OPTIONS: Omit<
@@ -267,7 +266,6 @@ const RESETTABLE_V2_SCHEDULE_OPTIONS: Omit<
   maxRetrySeconds: null,
   minBackoffSeconds: null,
   maxBackoffSeconds: null,
-  attemptDeadline: null,
 };
 
 function initScheduleTrigger(
@@ -283,7 +281,7 @@ function initScheduleTrigger(
     for (const key of Object.keys(resetOptions)) {
       scheduleTrigger.retryConfig[key] = RESET_VALUE;
     }
-    scheduleTrigger = { ...scheduleTrigger, timeZone: RESET_VALUE };
+    scheduleTrigger = { ...scheduleTrigger, timeZone: RESET_VALUE, attemptDeadline: RESET_VALUE };
   }
   return scheduleTrigger;
 }

src/v1/cloud-functions.ts

@@ -486,7 +486,6 @@ export function makeCloudFunction<EventData>({
           "maxBackoffDuration",
           "maxRetryDuration",
           "minBackoffDuration",
-          "attemptDeadline"
         );
       } else {
         endpoint.eventTrigger = {

src/v2/providers/scheduler.ts

@@ -48,8 +48,8 @@ interface SeparatedOpts {
     minBackoffSeconds?: number | Expression<number> | ResetValue;
     maxBackoffSeconds?: number | Expression<number> | ResetValue;
     maxDoublings?: number | Expression<number> | ResetValue;
-    attemptDeadline?: string | Expression<string> | ResetValue;
   };
+  attemptDeadline?: string | Expression<string> | ResetValue;
   opts: options.GlobalOptions;
 }
 
@@ -71,8 +71,8 @@ export function getOpts(args: string | ScheduleOptions): SeparatedOpts {
       minBackoffSeconds: args.minBackoffSeconds,
       maxBackoffSeconds: args.maxBackoffSeconds,
       maxDoublings: args.maxDoublings,
-      attemptDeadline: args.attemptDeadline,
     },
+    attemptDeadline: args.attemptDeadline,
     opts: args as options.GlobalOptions,
   };
 }
@@ -206,6 +206,7 @@ export function onSchedule(
   };
 
   copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
+  copyIfPresent(ep.scheduleTrigger, separatedOpts, "attemptDeadline");
   copyIfPresent(
     ep.scheduleTrigger.retryConfig,
     separatedOpts.retryConfig,
@@ -214,7 +215,6 @@ export function onSchedule(
     "minBackoffSeconds",
     "maxBackoffSeconds",
     "maxDoublings",
-    "attemptDeadline"
   );
   func.__endpoint = ep;