From 957fcf919b2787876e21f88a616284b849c13cb7 Mon Sep 17 00:00:00 2001 From: Niko Virtala Date: Wed, 30 Nov 2022 19:10:46 +0200 Subject: [PATCH] fix(lambda): allow tokens in kafka consumer group id (#22993) - fix(lambda): allow token kafka consumer group id - fix(lambda): typo in kafka consumer group id validation Fixes: #22932 ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../@aws-cdk/aws-lambda/lib/event-source-mapping.ts | 6 +++++- .../aws-lambda/test/event-source-mapping.test.ts | 10 +++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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',