diff --git a/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts b/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts index 9798a31c313f0..c0475dd206050 100644 --- a/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts +++ b/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts @@ -382,6 +382,10 @@ export class EventSourceMapping extends cdk.Resource implements IEventSourceMapp } private validateKafkaConsumerGroupIdOrThrow(kafkaConsumerGroupId: string) { + if (cdk.Token.isUnresolved(kafkaConsumerGroupId)) { + return; + } + if (kafkaConsumerGroupId.length > 200 ||kafkaConsumerGroupId.length < 1) { throw new Error('kafkaConsumerGroupId must be a valid string between 1 and 200 characters'); } @@ -389,7 +393,7 @@ export class EventSourceMapping extends cdk.Resource implements IEventSourceMapp const regex = new RegExp(/[a-zA-Z0-9-\/*:_+=.@-]*/); const patternMatch = regex.exec(kafkaConsumerGroupId); if (patternMatch === null || patternMatch[0] !== kafkaConsumerGroupId) { - throw new Error('kafkaConsumerGroupId contain ivalid characters. Allowed values are "[a-zA-Z0-9-\/*:_+=.@-]"'); + throw new Error('kafkaConsumerGroupId contains invalid characters. Allowed values are "[a-zA-Z0-9-\/*:_+=.@-]"'); } } } diff --git a/packages/@aws-cdk/aws-lambda/test/event-source-mapping.test.ts b/packages/@aws-cdk/aws-lambda/test/event-source-mapping.test.ts index 728cfd5d161ee..0fb2ee80e2330 100644 --- a/packages/@aws-cdk/aws-lambda/test/event-source-mapping.test.ts +++ b/packages/@aws-cdk/aws-lambda/test/event-source-mapping.test.ts @@ -159,7 +159,7 @@ describe('event source mapping', () => { eventSourceArn: 'arn:aws:kafka:us-east-1:123456789012:cluster/vpc-2priv-2pub/751d2973-a626-431c-9d4e-d7975eb44dd7-2', kafkaConsumerGroupId: 'some invalid', target: fn, - })).toThrow('kafkaConsumerGroupId contain ivalid characters. Allowed values are "[a-zA-Z0-9-\/*:_+=.@-]"'); + })).toThrow('kafkaConsumerGroupId contains invalid characters. Allowed values are "[a-zA-Z0-9-\/*:_+=.@-]"'); }); test('throws if kafkaConsumerGroupId is too long', () => { @@ -178,6 +178,14 @@ describe('event source mapping', () => { })).not.toThrow(); }); + test('not throws if kafkaConsumerGroupId is token', () => { + expect(() => new EventSourceMapping(stack, 'test', { + eventSourceArn: 'arn:aws:kafka:us-east-1:123456789012:cluster/vpc-2priv-2pub/751d2973-a626-431c-9d4e-d7975eb44dd7-2', + kafkaConsumerGroupId: cdk.Lazy.string({ produce: () => 'test' }), + target: fn, + })).not.toThrow(); + }); + test('not throws if kafkaConsumerGroupId is valid for amazon managed kafka', () => { expect(() => new EventSourceMapping(stack, 'test', { eventSourceArn: 'arn:aws:kafka:us-east-1:123456789012:cluster/vpc-2priv-2pub/751d2973-a626-431c-9d4e-d7975eb44dd7-2',