From 903ec8b3b965a0ca9a3e083fe7999eb9658ffab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Novotny=CC=81?= Date: Tue, 8 Oct 2024 09:05:00 +0200 Subject: [PATCH 1/3] feat: add max cost per run --- packages/consts/src/consts.ts | 3 +++ test/consts.test.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/packages/consts/src/consts.ts b/packages/consts/src/consts.ts index afc31690f..3134a0fc9 100644 --- a/packages/consts/src/consts.ts +++ b/packages/consts/src/consts.ts @@ -287,6 +287,7 @@ export const APIFY_ENV_VARS = { ACTOR_EVENTS_WS_URL: 'APIFY_ACTOR_EVENTS_WS_URL', ACTOR_ID: 'APIFY_ACTOR_ID', ACTOR_MAX_PAID_DATASET_ITEMS: 'ACTOR_MAX_PAID_DATASET_ITEMS', + ACTOR_MAX_COST_PER_RUN_USD: 'ACTOR_MAX_COST_PER_RUN_USD', ACTOR_RUN_ID: 'APIFY_ACTOR_RUN_ID', ACTOR_TASK_ID: 'APIFY_ACTOR_TASK_ID', CONTAINER_PORT: 'APIFY_CONTAINER_PORT', @@ -323,6 +324,7 @@ export const ACTOR_ENV_VARS = { ID: 'ACTOR_ID', INPUT_KEY: 'ACTOR_INPUT_KEY', MAX_PAID_DATASET_ITEMS: 'ACTOR_MAX_PAID_DATASET_ITEMS', + MAX_COST_PER_RUN_USD: 'ACTOR_MAX_COST_PER_RUN_USD', MEMORY_MBYTES: 'ACTOR_MEMORY_MBYTES', RUN_ID: 'ACTOR_RUN_ID', STANDBY_PORT: 'ACTOR_STANDBY_PORT', @@ -338,6 +340,7 @@ export const ACTOR_ENV_VARS = { export const INTEGER_ENV_VARS = [ // Actor env vars ACTOR_ENV_VARS.MAX_PAID_DATASET_ITEMS, + ACTOR_ENV_VARS.MAX_COST_PER_RUN_USD, ACTOR_ENV_VARS.MEMORY_MBYTES, ACTOR_ENV_VARS.STANDBY_PORT, ACTOR_ENV_VARS.WEB_SERVER_PORT, diff --git a/test/consts.test.ts b/test/consts.test.ts index ffe3fccfb..ce40f936f 100644 --- a/test/consts.test.ts +++ b/test/consts.test.ts @@ -69,6 +69,7 @@ describe('consts', () => { Object.entries(APIFY_ENV_VARS).forEach(([k, v]) => { // TODO: remove this once ACTOR_MAX_PAID_DATASET_ITEMS is removed from APIFY_ENV_VARS if (k === 'ACTOR_MAX_PAID_DATASET_ITEMS') return; + if (k === 'ACTOR_MAX_COST_PER_RUN_USD') return; expect(v).toBe(`APIFY_${k}`); }); From 6ffcbb9dd69e3ab91ebcc1f9947da5c8bd72f170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Novotny=CC=81?= Date: Tue, 8 Oct 2024 09:09:00 +0200 Subject: [PATCH 2/3] chore: revert --- packages/consts/src/consts.ts | 2 -- test/consts.test.ts | 1 - 2 files changed, 3 deletions(-) diff --git a/packages/consts/src/consts.ts b/packages/consts/src/consts.ts index 3134a0fc9..7bd4922ae 100644 --- a/packages/consts/src/consts.ts +++ b/packages/consts/src/consts.ts @@ -287,7 +287,6 @@ export const APIFY_ENV_VARS = { ACTOR_EVENTS_WS_URL: 'APIFY_ACTOR_EVENTS_WS_URL', ACTOR_ID: 'APIFY_ACTOR_ID', ACTOR_MAX_PAID_DATASET_ITEMS: 'ACTOR_MAX_PAID_DATASET_ITEMS', - ACTOR_MAX_COST_PER_RUN_USD: 'ACTOR_MAX_COST_PER_RUN_USD', ACTOR_RUN_ID: 'APIFY_ACTOR_RUN_ID', ACTOR_TASK_ID: 'APIFY_ACTOR_TASK_ID', CONTAINER_PORT: 'APIFY_CONTAINER_PORT', @@ -340,7 +339,6 @@ export const ACTOR_ENV_VARS = { export const INTEGER_ENV_VARS = [ // Actor env vars ACTOR_ENV_VARS.MAX_PAID_DATASET_ITEMS, - ACTOR_ENV_VARS.MAX_COST_PER_RUN_USD, ACTOR_ENV_VARS.MEMORY_MBYTES, ACTOR_ENV_VARS.STANDBY_PORT, ACTOR_ENV_VARS.WEB_SERVER_PORT, diff --git a/test/consts.test.ts b/test/consts.test.ts index ce40f936f..ffe3fccfb 100644 --- a/test/consts.test.ts +++ b/test/consts.test.ts @@ -69,7 +69,6 @@ describe('consts', () => { Object.entries(APIFY_ENV_VARS).forEach(([k, v]) => { // TODO: remove this once ACTOR_MAX_PAID_DATASET_ITEMS is removed from APIFY_ENV_VARS if (k === 'ACTOR_MAX_PAID_DATASET_ITEMS') return; - if (k === 'ACTOR_MAX_COST_PER_RUN_USD') return; expect(v).toBe(`APIFY_${k}`); }); From 341308932f2354050ea72b674d4925a76fe2b0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Novotny=CC=81?= Date: Tue, 8 Oct 2024 10:20:20 +0200 Subject: [PATCH 3/3] chore: rename --- packages/consts/src/consts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/consts/src/consts.ts b/packages/consts/src/consts.ts index 7bd4922ae..bc1c79723 100644 --- a/packages/consts/src/consts.ts +++ b/packages/consts/src/consts.ts @@ -323,7 +323,7 @@ export const ACTOR_ENV_VARS = { ID: 'ACTOR_ID', INPUT_KEY: 'ACTOR_INPUT_KEY', MAX_PAID_DATASET_ITEMS: 'ACTOR_MAX_PAID_DATASET_ITEMS', - MAX_COST_PER_RUN_USD: 'ACTOR_MAX_COST_PER_RUN_USD', + MAX_TOTAL_CHARGE_USD: 'ACTOR_MAX_TOTAL_CHARGE_USD', MEMORY_MBYTES: 'ACTOR_MEMORY_MBYTES', RUN_ID: 'ACTOR_RUN_ID', STANDBY_PORT: 'ACTOR_STANDBY_PORT',