Skip to content

Commit d20a80f

Browse files
committed
refactor: update other full options testcase
1 parent 33f9cad commit d20a80f

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

spec/v2/providers/scheduler.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ describe("schedule", () => {
6060
minBackoffSeconds: 2,
6161
maxBackoffSeconds: 3,
6262
maxDoublings: 4,
63+
attemptDeadline: "120s",
6364
memory: "128MiB",
6465
region: "us-central1",
6566
};
@@ -73,6 +74,7 @@ describe("schedule", () => {
7374
minBackoffSeconds: 2,
7475
maxBackoffSeconds: 3,
7576
maxDoublings: 4,
77+
attemptDeadline: "120s",
7678
},
7779
opts: {
7880
...options,
@@ -128,6 +130,7 @@ describe("schedule", () => {
128130
minBackoffSeconds: 11,
129131
maxBackoffSeconds: 12,
130132
maxDoublings: 2,
133+
attemptDeadline: "120s",
131134
region: "us-central1",
132135
labels: { key: "val" },
133136
},
@@ -148,7 +151,7 @@ describe("schedule", () => {
148151
minBackoffSeconds: 11,
149152
maxBackoffSeconds: 12,
150153
maxDoublings: 2,
151-
attemptDeadline: options.RESET_VALUE,
154+
attemptDeadline: "120s",
152155
},
153156
},
154157
});
@@ -181,6 +184,7 @@ describe("schedule", () => {
181184
minBackoffSeconds: undefined,
182185
maxBackoffSeconds: undefined,
183186
maxDoublings: undefined,
187+
attemptDeadline: undefined,
184188
},
185189
},
186190
});

src/v2/providers/scheduler.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,18 @@ export function getOpts(args: string | ScheduleOptions): SeparatedOpts {
6161
opts: {} as options.GlobalOptions,
6262
};
6363
}
64-
const retryConfig: any = {
65-
retryCount: args.retryCount,
66-
maxRetrySeconds: args.maxRetrySeconds,
67-
minBackoffSeconds: args.minBackoffSeconds,
68-
maxBackoffSeconds: args.maxBackoffSeconds,
69-
maxDoublings: args.maxDoublings,
70-
};
7164

72-
if (args.attemptDeadline !== undefined) {
73-
retryConfig.attemptDeadline = args.attemptDeadline;
74-
}
75-
7665
return {
7766
schedule: args.schedule,
7867
timeZone: args.timeZone,
79-
retryConfig,
68+
retryConfig: {
69+
retryCount: args.retryCount,
70+
maxRetrySeconds: args.maxRetrySeconds,
71+
minBackoffSeconds: args.minBackoffSeconds,
72+
maxBackoffSeconds: args.maxBackoffSeconds,
73+
maxDoublings: args.maxDoublings,
74+
attemptDeadline: args.attemptDeadline,
75+
},
8076
opts: args as options.GlobalOptions,
8177
};
8278
}

0 commit comments

Comments
 (0)