Skip to content

Commit 8f80f82

Browse files
authored
feat: move restartOnError from Actor to Run options (#760)
1 parent 0f9f220 commit 8f80f82

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

src/resource_clients/actor.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,21 @@ export class ActorClient extends ResourceClient {
7070
webhooks: ow.optional.array.ofType(ow.object),
7171
maxItems: ow.optional.number.not.negative,
7272
maxTotalChargeUsd: ow.optional.number.not.negative,
73+
restartOnError: ow.optional.boolean,
7374
forcePermissionLevel: ow.optional.string.oneOf(Object.values(ACTOR_PERMISSION_LEVEL)),
7475
}),
7576
);
7677

77-
const { waitForFinish, timeout, memory, build, maxItems, maxTotalChargeUsd, forcePermissionLevel } = options;
78+
const {
79+
waitForFinish,
80+
timeout,
81+
memory,
82+
build,
83+
maxItems,
84+
maxTotalChargeUsd,
85+
restartOnError,
86+
forcePermissionLevel,
87+
} = options;
7888

7989
const params = {
8090
waitForFinish,
@@ -84,6 +94,7 @@ export class ActorClient extends ResourceClient {
8494
webhooks: stringifyWebhooksToBase64(options.webhooks),
8595
maxItems,
8696
maxTotalChargeUsd,
97+
restartOnError,
8798
forcePermissionLevel,
8899
};
89100

@@ -128,6 +139,7 @@ export class ActorClient extends ResourceClient {
128139
webhooks: ow.optional.array.ofType(ow.object),
129140
maxItems: ow.optional.number.not.negative,
130141
maxTotalChargeUsd: ow.optional.number.not.negative,
142+
restartOnError: ow.optional.boolean,
131143
forcePermissionLevel: ow.optional.string.oneOf(Object.values(ACTOR_PERMISSION_LEVEL)),
132144
}),
133145
);
@@ -268,6 +280,7 @@ export interface Actor {
268280
name: string;
269281
username: string;
270282
description?: string;
283+
/** @deprecated Use defaultRunOptions.restartOnError instead */
271284
restartOnError?: boolean;
272285
isPublic: boolean;
273286
isAnonymouslyRunnable?: boolean;
@@ -305,6 +318,7 @@ export interface ActorDefaultRunOptions {
305318
build: string;
306319
timeoutSecs: number;
307320
memoryMbytes: number;
321+
restartOnError?: boolean;
308322
}
309323

310324
export interface ActorExampleRunInput {
@@ -396,6 +410,11 @@ export interface ActorStartOptions {
396410
*/
397411
maxItems?: number;
398412

413+
/**
414+
* Determines whether the run will be restarted if it fails.
415+
*/
416+
restartOnError?: boolean;
417+
399418
// TODO(PPE): add maxTotalChargeUsd after finished
400419

401420
/**
@@ -486,6 +505,7 @@ export interface ActorRunOptions {
486505
memoryMbytes: number;
487506
diskMbytes: number;
488507
maxTotalChargeUsd?: number;
508+
restartOnError?: boolean;
489509
}
490510

491511
export interface ActorBuildOptions {

src/resource_clients/actor_collection.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export interface ActorCollectionCreateOptions {
7676
isDeprecated?: boolean;
7777
isPublic?: boolean;
7878
name?: string;
79+
/** @deprecated Use defaultRunOptions.restartOnError instead */
7980
restartOnError?: boolean;
8081
seoTitle?: string;
8182
seoDescription?: string;

src/resource_clients/run.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ export class RunClient extends ResourceClient {
141141
timeout: ow.optional.number,
142142
maxItems: ow.optional.number,
143143
maxTotalChargeUsd: ow.optional.number,
144+
restartOnError: ow.optional.boolean,
144145
}),
145146
);
146147

@@ -291,6 +292,7 @@ export interface RunResurrectOptions {
291292
timeout?: number;
292293
maxItems?: number;
293294
maxTotalChargeUsd?: number;
295+
restartOnError?: boolean;
294296
}
295297

296298
export interface RunChargeOptions {

src/resource_clients/schedule.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ export interface ScheduledActorRunOptions {
117117
build: string;
118118
timeoutSecs: number;
119119
memoryMbytes: number;
120+
restartOnError?: boolean;
120121
}
121122

122123
export interface ScheduleActionRunActorTask extends BaseScheduleAction<ScheduleActions.RunActorTask> {

src/resource_clients/task.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@ export class TaskClient extends ResourceClient {
6363
webhooks: ow.optional.array.ofType(ow.object),
6464
maxItems: ow.optional.number.not.negative,
6565
maxTotalChargeUsd: ow.optional.number.not.negative,
66+
restartOnError: ow.optional.boolean,
6667
}),
6768
);
6869

69-
const { waitForFinish, timeout, memory, build, maxItems, maxTotalChargeUsd } = options;
70+
const { waitForFinish, timeout, memory, build, maxItems, maxTotalChargeUsd, restartOnError } = options;
7071

7172
const params = {
7273
waitForFinish,
@@ -76,6 +77,7 @@ export class TaskClient extends ResourceClient {
7677
webhooks: stringifyWebhooksToBase64(options.webhooks),
7778
maxItems,
7879
maxTotalChargeUsd,
80+
restartOnError,
7981
};
8082

8183
const request: ApifyRequestConfig = {
@@ -112,6 +114,7 @@ export class TaskClient extends ResourceClient {
112114
webhooks: ow.optional.array.ofType(ow.object),
113115
maxItems: ow.optional.number.not.negative,
114116
maxTotalChargeUsd: ow.optional.number.not.negative,
117+
restartOnError: ow.optional.boolean,
115118
}),
116119
);
117120

@@ -222,6 +225,7 @@ export interface TaskOptions {
222225
build?: string;
223226
timeoutSecs?: number;
224227
memoryMbytes?: number;
228+
restartOnError?: boolean;
225229
}
226230

227231
export type TaskUpdateData = Partial<

0 commit comments

Comments
 (0)