From 6d8cf442a7b1e2a0f0cc48b2b1941ff461fa28a2 Mon Sep 17 00:00:00 2001 From: martmull Date: Thu, 20 Mar 2025 16:43:38 +0100 Subject: [PATCH] Give worker access to server volume (#11065) --- packages/twenty-docker/docker-compose.yml | 2 ++ .../serverless/utils/serverless-get-folder.utils.ts | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/twenty-docker/docker-compose.yml b/packages/twenty-docker/docker-compose.yml index 841cb5392..a9429b543 100644 --- a/packages/twenty-docker/docker-compose.yml +++ b/packages/twenty-docker/docker-compose.yml @@ -70,6 +70,8 @@ services: worker: image: twentycrm/twenty:${TAG:-latest} + volumes: + - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage} command: ["yarn", "worker:prod"] environment: PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default diff --git a/packages/twenty-server/src/engine/core-modules/serverless/utils/serverless-get-folder.utils.ts b/packages/twenty-server/src/engine/core-modules/serverless/utils/serverless-get-folder.utils.ts index 661ceda2b..fd467dbd1 100644 --- a/packages/twenty-server/src/engine/core-modules/serverless/utils/serverless-get-folder.utils.ts +++ b/packages/twenty-server/src/engine/core-modules/serverless/utils/serverless-get-folder.utils.ts @@ -17,20 +17,20 @@ export const getServerlessFolder = ({ serverlessFunction: ServerlessFunctionEntity; version?: 'draft' | 'latest' | (string & NonNullable); }) => { - const computedVersion = - version === 'latest' ? serverlessFunction.latestVersion : version; - - if (!isDefined(computedVersion)) { + if (version === 'latest' && !isDefined(serverlessFunction.latestVersion)) { throw new ServerlessFunctionException( - 'Cannot compute serverless folder for undefined version', + "Can't get 'latest' version when serverlessFunction 'latestVersion' is undefined", ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_VERSION_NOT_FOUND, ); } + const computedVersion = + version === 'latest' ? serverlessFunction.latestVersion : version; + return join( 'workspace-' + serverlessFunction.workspaceId, FileFolder.ServerlessFunction, serverlessFunction.id, - computedVersion, + computedVersion || '', ); };