Skip to content

The open alternative to Salesforce, designed for AI.

Share Lambda connection options (#28854)

Weiko3b66ba85d224
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-aws-client.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-aws-client.service.ts
index 23153725131..6bea7202f01 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-aws-client.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-aws-client.service.ts
@@ -22,7 +22,10 @@ import {
LAMBDA_CLIENT_RETRY_MODE,
UPDATE_FUNCTION_DURATION_TIMEOUT_IN_SECONDS,
} from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/constants/lambda-driver.constant';
-import { type LambdaDriverOptions } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type';
+import {
+ type LambdaConnectionOptions,
+ type LambdaDriverOptions,
+} from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type';
import { addLambdaRateLimitErrorMiddleware } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/add-lambda-rate-limit-error-middleware.util';
import { buildAwsRequestHandlerOptions } from 'src/utils/aws-request-handler.util';
@@ -35,7 +38,10 @@ export class LambdaAwsClientService {
| undefined;
private credentialsExpiry: Date | null = null;
- constructor(private readonly options: LambdaDriverOptions) {}
+ constructor(
+ private readonly options: LambdaConnectionOptions &
+ Pick<LambdaDriverOptions, 'cacheStorageService'>,
+ ) {}
async getLambdaClient() {
if (
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type.ts
index 2e27c458abc..441eb53bddf 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type.ts
@@ -37,12 +37,15 @@ export type BuilderLambdaResult = {
builtCode: string;
};
-export interface LambdaDriverOptions extends LambdaClientConfig {
+export type LambdaDriverOptions = LambdaConnectionOptions & {
logicFunctionResourceService: LogicFunctionResourceService;
sdkClientArchiveService: SdkClientArchiveService;
cacheLockService: CacheLockService;
cacheStorageService: CacheStorageService;
workspaceCacheService: WorkspaceCacheService;
+};
+
+export type LambdaConnectionOptions = LambdaClientConfig & {
region: string;
lambdaRole: string;
subhostingRole?: string;
@@ -50,7 +53,7 @@ export interface LambdaDriverOptions extends LambdaClientConfig {
layerBucketRegion: string;
resourceNamespace: string;
resourceTags?: Record<string, string>;
-}
+};
export enum LambdaExecutionPhase {
BUILD = 'build',
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/get-lambda-connection-options.util.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/get-lambda-connection-options.util.ts
new file mode 100644
index 00000000000..a43fac74ee2
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/get-lambda-connection-options.util.ts
@@ -0,0 +1,49 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+import { type LambdaConnectionOptions } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type';
+import { getLambdaResourceNamespace } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/get-lambda-resource-namespace.util';
+
+export const getLambdaConnectionOptions = (
+ twentyConfigService: TwentyConfigService,
+): LambdaConnectionOptions => {
+ const region = twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_REGION');
+ const accessKeyId = twentyConfigService.get(
+ 'LOGIC_FUNCTION_LAMBDA_ACCESS_KEY_ID',
+ );
+ const secretAccessKey = twentyConfigService.get(
+ 'LOGIC_FUNCTION_LAMBDA_SECRET_ACCESS_KEY',
+ );
+ const lambdaRole = twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_ROLE');
+ const subhostingRole = twentyConfigService.get(
+ 'LOGIC_FUNCTION_LAMBDA_SUBHOSTING_ROLE',
+ );
+ const s3BucketName = twentyConfigService.get('STORAGE_S3_NAME');
+ const layerBucket =
+ twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_LAYER_BUCKET') ??
+ s3BucketName ??
+ 'twenty-lambda-layer';
+ const layerBucketRegion =
+ twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_LAYER_BUCKET_REGION') ??
+ region;
+ const resourceTags =
+ twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_RESOURCE_TAGS') ?? {};
+ const resourceNamespace = getLambdaResourceNamespace({
+ lambdaRoleArn: lambdaRole,
+ });
+
+ return {
+ credentials: isNonEmptyString(accessKeyId)
+ ? { accessKeyId, secretAccessKey }
+ : fromNodeProviderChain({ clientConfig: { region } }),
+ region,
+ endpoint: twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_ENDPOINT'),
+ lambdaRole,
+ subhostingRole,
+ layerBucket,
+ layerBucketRegion,
+ resourceNamespace,
+ resourceTags:
+ Object.keys(resourceTags).length > 0 ? resourceTags : undefined,
+ };
+};
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory.ts
index 78849effc31..1e849858e91 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory.ts
@@ -1,7 +1,5 @@
import { Injectable } from '@nestjs/common';
-import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
-
import {
type LogicFunctionDriver,
LogicFunctionDriverType,
@@ -14,7 +12,7 @@ import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/typ
import { DisabledDriver } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/disabled.driver';
import { LambdaDriver } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver';
import { LocalDriver } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/local.driver';
-import { getLambdaResourceNamespace } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/get-lambda-resource-namespace.util';
+import { getLambdaConnectionOptions } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/get-lambda-connection-options.util';
import { LogicFunctionResourceService } from 'src/engine/core-modules/logic-function/logic-function-resource/logic-function-resource.service';
import { SdkClientArchiveService } from 'src/engine/core-modules/sdk-client/sdk-client-archive.service';
import { DriverFactoryBase } from 'src/engine/core-modules/twenty-config/dynamic-factory.base';
@@ -64,56 +62,12 @@ export class LogicFunctionDriverFactory extends DriverFactoryBase<LogicFunctionD
});
case LogicFunctionDriverType.LAMBDA: {
- const region = this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_REGION',
- );
- const accessKeyId = this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_ACCESS_KEY_ID',
- );
- const secretAccessKey = this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_SECRET_ACCESS_KEY',
- );
- const lambdaRole = this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_ROLE',
- );
- const subhostingRole = this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_SUBHOSTING_ROLE',
- );
- const s3BucketName = this.twentyConfigService.get('STORAGE_S3_NAME');
- const layerBucket =
- this.twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_LAYER_BUCKET') ??
- s3BucketName ??
- 'twenty-lambda-layer';
- const layerBucketRegion =
- this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_LAYER_BUCKET_REGION',
- ) ?? region;
- const resourceTags =
- this.twentyConfigService.get('LOGIC_FUNCTION_LAMBDA_RESOURCE_TAGS') ??
- {};
- const resourceNamespace = getLambdaResourceNamespace({
- lambdaRoleArn: lambdaRole,
- });
-
return new LambdaDriver({
logicFunctionResourceService: this.logicFunctionResourceService,
cacheLockService: this.cacheLockService,
cacheStorageService: this.cacheStorageService,
workspaceCacheService: this.workspaceCacheService,
- credentials: accessKeyId
- ? { accessKeyId, secretAccessKey }
- : fromNodeProviderChain({ clientConfig: { region } }),
- region,
- endpoint: this.twentyConfigService.get(
- 'LOGIC_FUNCTION_LAMBDA_ENDPOINT',
- ),
- lambdaRole,
- subhostingRole,
- layerBucket,
- layerBucketRegion,
- resourceNamespace,
- resourceTags:
- Object.keys(resourceTags).length > 0 ? resourceTags : undefined,
+ ...getLambdaConnectionOptions(this.twentyConfigService),
sdkClientArchiveService: this.sdkClientArchiveService,
});
}