Skip to content

The open alternative to Salesforce, designed for AI.

Add configurable tags when creating Lambda functions (#28810)

Félix Malfaitbdad3cfb0c2e
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/decorators/is-lambda-resource-tags.decorator.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/decorators/is-lambda-resource-tags.decorator.ts
new file mode 100644
index 00000000000..2a7d62e856c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/decorators/is-lambda-resource-tags.decorator.ts
@@ -0,0 +1,31 @@
+import {
+ registerDecorator,
+ type ValidationOptions,
+ ValidatorConstraint,
+ type ValidatorConstraintInterface,
+} from 'class-validator';
+
+import { isLambdaResourceTags } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/is-lambda-resource-tags.util';
+
+@ValidatorConstraint({ async: false })
+export class IsLambdaResourceTagsConstraint implements ValidatorConstraintInterface {
+ validate(value: unknown) {
+ return isLambdaResourceTags(value);
+ }
+
+ defaultMessage() {
+ return 'Lambda resource tags must be a JSON object with at most 48 string values, valid AWS tag characters, keys of 1–128 characters and values of at most 256 characters; aws: prefixes and Twenty checksum keys are reserved';
+ }
+}
+
+export const IsLambdaResourceTags =
+ (validationOptions?: ValidationOptions) =>
+ (object: object, propertyName: string) => {
+ registerDecorator({
+ target: object.constructor,
+ propertyName: propertyName,
+ options: validationOptions,
+ constraints: [],
+ validator: IsLambdaResourceTagsConstraint,
+ });
+ };
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts
index d2567c302ea..15790910582 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts
@@ -38,6 +38,7 @@ import {
import { type LambdaDriverOptions } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/types/lambda-driver.type';
import { type LambdaAwsClientService } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-aws-client.service';
import { type LambdaLayerManagerService } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-layer-manager.service';
+import { buildLambdaResourceTags } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/build-lambda-resource-tags.util';
import { copyExecutor } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/copy-executor';
import { createZipFile } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/create-zip-file';
import { TemporaryDirManager } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/temporary-dir-manager';
@@ -59,7 +60,10 @@ export class LambdaExecutorManagerService {
private readonly logger = new Logger(LambdaExecutorManagerService.name);
constructor(
- private readonly options: Pick<LambdaDriverOptions, 'lambdaRole'>,
+ private readonly options: Pick<
+ LambdaDriverOptions,
+ 'lambdaRole' | 'resourceTags'
+ >,
private readonly awsClient: LambdaAwsClientService,
private readonly layerManager: LambdaLayerManagerService,
private readonly cacheLockService: CacheLockService,
@@ -453,9 +457,10 @@ export class LambdaExecutorManagerService {
Timeout: EXECUTOR_LAMBDA_TIMEOUT_SECONDS,
MemorySize: EXECUTOR_LAMBDA_MEMORY_MB,
EphemeralStorage: { Size: LAMBDA_EPHEMERAL_STORAGE_MB },
- Tags: isDefined(sdkClientCoreChecksum)
- ? { [LAMBDA_SDK_CLIENT_CHECKSUM_TAG]: sdkClientCoreChecksum }
- : undefined,
+ Tags: buildLambdaResourceTags({
+ resourceTags: this.options.resourceTags,
+ sdkClientCoreChecksum,
+ }),
};
const lambdaClient = await this.awsClient.getLambdaClient();
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-tool-functions.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-tool-functions.service.ts
index 1a802e4fb74..7cd76f27f02 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-tool-functions.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-tool-functions.service.ts
@@ -53,7 +53,7 @@ export class LambdaToolFunctionsService {
constructor(
private readonly options: Pick<
LambdaDriverOptions,
- 'lambdaRole' | 'resourceNamespace'
+ 'lambdaRole' | 'resourceNamespace' | 'resourceTags'
>,
private readonly awsClient: LambdaAwsClientService,
) {}
@@ -247,6 +247,7 @@ export class LambdaToolFunctionsService {
Layers: [commonLayerArn],
Handler: 'index.handler',
Role: this.options.lambdaRole,
+ Tags: this.options.resourceTags,
Runtime: LogicFunctionRuntime.NODE22,
Timeout: YARN_INSTALL_LAMBDA_TIMEOUT_SECONDS,
MemorySize: YARN_INSTALL_LAMBDA_MEMORY_MB,
@@ -288,6 +289,7 @@ export class LambdaToolFunctionsService {
Layers: [commonLayerArn],
Handler: 'index.handler',
Role: this.options.lambdaRole,
+ Tags: this.options.resourceTags,
Runtime: LogicFunctionRuntime.NODE22,
Timeout: BUILDER_LAMBDA_TIMEOUT_SECONDS,
MemorySize: BUILDER_LAMBDA_MEMORY_MB,
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 abc3bfb1ef3..2e27c458abc 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
@@ -49,6 +49,7 @@ export interface LambdaDriverOptions extends LambdaClientConfig {
layerBucket: string;
layerBucketRegion: string;
resourceNamespace: string;
+ resourceTags?: Record<string, string>;
}
export enum LambdaExecutionPhase {
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/__tests__/build-lambda-resource-tags.util.spec.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/__tests__/build-lambda-resource-tags.util.spec.ts
new file mode 100644
index 00000000000..096810a418e
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/__tests__/build-lambda-resource-tags.util.spec.ts
@@ -0,0 +1,54 @@
+import { LAMBDA_SDK_CLIENT_CHECKSUM_TAG } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/constants/lambda-driver.constant';
+import { buildLambdaResourceTags } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/build-lambda-resource-tags.util';
+
+describe('buildLambdaResourceTags', () => {
+ it.each<{
+ resourceTags: Record<string, string> | undefined;
+ checksum: string | null;
+ expected: Record<string, string> | undefined;
+ }>([
+ {
+ resourceTags: {
+ Environment: 'production',
+ [LAMBDA_SDK_CLIENT_CHECKSUM_TAG]: 'configured-checksum',
+ },
+ checksum: 'current-sdk',
+ expected: {
+ Environment: 'production',
+ [LAMBDA_SDK_CLIENT_CHECKSUM_TAG]: 'current-sdk',
+ },
+ },
+ {
+ resourceTags: undefined,
+ checksum: 'current-sdk',
+ expected: { [LAMBDA_SDK_CLIENT_CHECKSUM_TAG]: 'current-sdk' },
+ },
+ {
+ resourceTags: { Environment: 'production' },
+ checksum: null,
+ expected: { Environment: 'production' },
+ },
+ { resourceTags: undefined, checksum: null, expected: undefined },
+ ])(
+ 'combines configured tags and the authoritative SDK checksum ($checksum, $resourceTags)',
+ ({ resourceTags, checksum, expected }) => {
+ expect(
+ buildLambdaResourceTags({
+ resourceTags,
+ sdkClientCoreChecksum: checksum,
+ }),
+ ).toEqual(expected);
+ },
+ );
+
+ it('does not mutate the configured tags', () => {
+ const resourceTags = { Environment: 'production' };
+
+ buildLambdaResourceTags({
+ resourceTags,
+ sdkClientCoreChecksum: 'current-sdk',
+ });
+
+ expect(resourceTags).toEqual({ Environment: 'production' });
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/__tests__/is-lambda-resource-tags.util.spec.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/__tests__/is-lambda-resource-tags.util.spec.ts
new file mode 100644
index 00000000000..f00808505ea
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/__tests__/is-lambda-resource-tags.util.spec.ts
@@ -0,0 +1,46 @@
+import {
+ LAMBDA_PREBUILT_BUNDLE_CHECKSUM_TAG,
+ LAMBDA_SDK_CLIENT_CHECKSUM_TAG,
+} from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/constants/lambda-driver.constant';
+import { isLambdaResourceTags } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/is-lambda-resource-tags.util';
+
+describe('isLambdaResourceTags', () => {
+ it.each([
+ {},
+ { Environment: 'production', Owner: '' },
+ { Équipe: 'Opérations' },
+ { ['k'.repeat(128)]: 'v'.repeat(256) },
+ Object.fromEntries(
+ Array.from({ length: 48 }, (_, index) => [`key-${index}`, 'value']),
+ ),
+ ])('accepts valid deployment tags %p', (tags) => {
+ expect(isLambdaResourceTags(tags)).toBe(true);
+ });
+
+ it.each<{ tags: unknown }>([
+ { tags: null },
+ { tags: [] },
+ { tags: 'not an object' },
+ { tags: { Owner: 42 } },
+ { tags: { Owner: true } },
+ { tags: { Owner: null } },
+ { tags: { Owner: ['team'] } },
+ { tags: { Owner: { name: 'team' } } },
+ { tags: { '': 'value' } },
+ { tags: { ['k'.repeat(129)]: 'value' } },
+ { tags: { Owner: 'v'.repeat(257) } },
+ { tags: { 'aws:owner': 'team' } },
+ { tags: { 'AWS:owner': 'team' } },
+ { tags: { [LAMBDA_PREBUILT_BUNDLE_CHECKSUM_TAG]: 'checksum' } },
+ { tags: { [LAMBDA_SDK_CLIENT_CHECKSUM_TAG]: 'checksum' } },
+ { tags: { 'bad?key': 'value' } },
+ { tags: { Owner: 'bad?value' } },
+ {
+ tags: Object.fromEntries(
+ Array.from({ length: 49 }, (_, index) => [`key-${index}`, 'value']),
+ ),
+ },
+ ])('rejects invalid deployment tags $tags', ({ tags }) => {
+ expect(isLambdaResourceTags(tags)).toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/build-lambda-resource-tags.util.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/build-lambda-resource-tags.util.ts
new file mode 100644
index 00000000000..6dfc4ce56a3
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/build-lambda-resource-tags.util.ts
@@ -0,0 +1,23 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { LAMBDA_SDK_CLIENT_CHECKSUM_TAG } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/constants/lambda-driver.constant';
+
+export const buildLambdaResourceTags = ({
+ resourceTags,
+ sdkClientCoreChecksum,
+}: {
+ resourceTags?: Record<string, string>;
+ sdkClientCoreChecksum?: string | null;
+}): Record<string, string> | undefined => {
+ const tags = { ...resourceTags };
+
+ if (isDefined(sdkClientCoreChecksum)) {
+ tags[LAMBDA_SDK_CLIENT_CHECKSUM_TAG] = sdkClientCoreChecksum;
+ }
+
+ if (Object.keys(tags).length === 0) {
+ return undefined;
+ }
+
+ return tags;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/is-lambda-resource-tags.util.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/is-lambda-resource-tags.util.ts
new file mode 100644
index 00000000000..efccae0276c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/utils/is-lambda-resource-tags.util.ts
@@ -0,0 +1,38 @@
+import { isString } from '@sniptt/guards';
+import { isPlainObject } from 'twenty-shared/utils';
+
+import {
+ LAMBDA_PREBUILT_BUNDLE_CHECKSUM_TAG,
+ LAMBDA_SDK_CLIENT_CHECKSUM_TAG,
+} from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/constants/lambda-driver.constant';
+
+// Executors also add SDK and bundle checksums to the 50-tag budget.
+const MAX_CONFIGURED_LAMBDA_RESOURCE_TAGS = 48;
+const TAG_CHARACTERS = /^[\p{L}\p{Z}\p{N}_.:/=+\-@]*$/u;
+
+export const isLambdaResourceTags = (
+ value: unknown,
+): value is Record<string, string> => {
+ if (!isPlainObject(value)) {
+ return false;
+ }
+
+ const entries = Object.entries(value);
+
+ if (entries.length > MAX_CONFIGURED_LAMBDA_RESOURCE_TAGS) {
+ return false;
+ }
+
+ return entries.every(
+ ([key, tagValue]) =>
+ key.length > 0 &&
+ Array.from(key).length <= 128 &&
+ !key.toLowerCase().startsWith('aws:') &&
+ key !== LAMBDA_PREBUILT_BUNDLE_CHECKSUM_TAG &&
+ key !== LAMBDA_SDK_CLIENT_CHECKSUM_TAG &&
+ TAG_CHARACTERS.test(key) &&
+ isString(tagValue) &&
+ Array.from(tagValue).length <= 256 &&
+ TAG_CHARACTERS.test(tagValue),
+ );
+};
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 ebcf85678a1..78849effc31 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
@@ -88,6 +88,9 @@ export class LogicFunctionDriverFactory extends DriverFactoryBase<LogicFunctionD
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,
});
@@ -109,6 +112,8 @@ export class LogicFunctionDriverFactory extends DriverFactoryBase<LogicFunctionD
layerBucket,
layerBucketRegion,
resourceNamespace,
+ resourceTags:
+ Object.keys(resourceTags).length > 0 ? resourceTags : undefined,
sdkClientArchiveService: this.sdkClientArchiveService,
});
}
diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
index c536b3f365c..6dee587acab 100644
--- a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
+++ b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
@@ -23,6 +23,7 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { type LoggerOptions } from 'typeorm/logger/LoggerOptions';
+import { IsLambdaResourceTags } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/decorators/is-lambda-resource-tags.decorator';
import { LogicFunctionDriverType } from 'src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface';
import { type AwsRegion } from 'src/engine/core-modules/twenty-config/interfaces/aws-region.interface';
import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';
@@ -802,6 +803,18 @@ export class ConfigVariables {
@IsOptional()
LOGIC_FUNCTION_LAMBDA_SUBHOSTING_ROLE?: string;
+ @ConfigVariablesMetadata({
+ group: ConfigVariablesGroup.LOGIC_FUNCTION_CONFIG,
+ description:
+ 'Resource tags applied when creating AWS Lambda functions (JSON object with up to 48 string values)',
+ type: ConfigVariableType.JSON,
+ })
+ @ValidateIf(
+ (env) => env.LOGIC_FUNCTION_TYPE === LogicFunctionDriverType.LAMBDA,
+ )
+ @IsLambdaResourceTags()
+ LOGIC_FUNCTION_LAMBDA_RESOURCE_TAGS: Record<string, string> = {};
+
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.LOGIC_FUNCTION_CONFIG,
isSensitive: true,