From 70828101f96dd9272d5ae667053884adff9a5a70 Mon Sep 17 00:00:00 2001 From: Jonas Beck Date: Tue, 1 Apr 2025 09:52:18 +0200 Subject: [PATCH] chore(events): update kafkaConsumerConfig name Signed-off-by: Jonas Beck --- .../src/publisher/KafkaConsumerClient.ts | 2 +- .../src/publisher/config.test.ts | 32 +++++++++---------- .../src/publisher/config.ts | 6 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts b/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts index 124eb4f1cb..16c2734aef 100644 --- a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts +++ b/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts @@ -54,7 +54,7 @@ export class KafkaConsumerClient { logCreator: LoggerServiceCreator(logger), }); - this.consumers = config.kafkaConsumerConfig.map(consumerConfig => + this.consumers = config.kafkaConsumerConfigs.map(consumerConfig => KafkaConsumingEventPublisher.fromConfig({ kafkaClient: this.kafka, config: consumerConfig, diff --git a/plugins/events-backend-module-kafka/src/publisher/config.test.ts b/plugins/events-backend-module-kafka/src/publisher/config.test.ts index 88c1d9747c..083c206c77 100644 --- a/plugins/events-backend-module-kafka/src/publisher/config.test.ts +++ b/plugins/events-backend-module-kafka/src/publisher/config.test.ts @@ -57,21 +57,21 @@ describe('readConfig', () => { const publisherConfigs = readConfig(config); - expect(publisherConfigs.kafkaConsumerConfig.length).toBe(2); + expect(publisherConfigs.kafkaConsumerConfigs.length).toBe(2); expect(publisherConfigs.kafkaConfig.clientId).toEqual('backstage-events'); expect(publisherConfigs.kafkaConfig.brokers).toEqual([ 'kafka1:9092', 'kafka2:9092', ]); - expect(publisherConfigs.kafkaConsumerConfig[0].backstageTopic).toEqual( + expect(publisherConfigs.kafkaConsumerConfigs[0].backstageTopic).toEqual( 'fake1', ); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.groupId, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.groupId, ).toEqual('my-group'); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerSubscribeConfig.topics, + publisherConfigs.kafkaConsumerConfigs[0].consumerSubscribeConfig.topics, ).toEqual(['topic-A']); }); @@ -157,41 +157,41 @@ describe('readConfig', () => { }); // Consumer configuration - expect(publisherConfigs.kafkaConsumerConfig.length).toBe(2); - expect(publisherConfigs.kafkaConsumerConfig[0].backstageTopic).toEqual( + expect(publisherConfigs.kafkaConsumerConfigs.length).toBe(2); + expect(publisherConfigs.kafkaConsumerConfigs[0].backstageTopic).toEqual( 'fake1', ); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.groupId, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.groupId, ).toEqual('my-group'); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerSubscribeConfig.topics, + publisherConfigs.kafkaConsumerConfigs[0].consumerSubscribeConfig.topics, ).toEqual(['topic-A']); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.sessionTimeout, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.sessionTimeout, ).toBe(20000); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.rebalanceTimeout, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.rebalanceTimeout, ).toBe(50000); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.heartbeatInterval, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.heartbeatInterval, ).toBe(2000); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.metadataMaxAge, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.metadataMaxAge, ).toBe(400000); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig .maxBytesPerPartition, ).toBe(50000); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.minBytes, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.minBytes, ).toBe(2); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.maxBytes, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.maxBytes, ).toBe(500000); expect( - publisherConfigs.kafkaConsumerConfig[0].consumerConfig.maxWaitTimeInMs, + publisherConfigs.kafkaConsumerConfigs[0].consumerConfig.maxWaitTimeInMs, ).toBe(4000); }); }); diff --git a/plugins/events-backend-module-kafka/src/publisher/config.ts b/plugins/events-backend-module-kafka/src/publisher/config.ts index b62598ab80..f5e4379edd 100644 --- a/plugins/events-backend-module-kafka/src/publisher/config.ts +++ b/plugins/events-backend-module-kafka/src/publisher/config.ts @@ -30,7 +30,7 @@ export interface KafkaConsumerConfig { */ export interface KafkaEventSourceConfig { kafkaConfig: KafkaConfig; - kafkaConsumerConfig: KafkaConsumerConfig[]; + kafkaConsumerConfigs: KafkaConsumerConfig[]; } const CONFIG_PREFIX_PUBLISHER = @@ -55,7 +55,7 @@ export const readConfig = (config: Config): KafkaEventSourceConfig => { const sasl = kafkaConfig.getOptional('sasl') as KafkaConfig['sasl']; const retry = kafkaConfig.getOptional('retry') as KafkaConfig['retry']; - const kafkaConsumerConfig: KafkaConsumerConfig[] = kafkaConfig + const kafkaConsumerConfigs: KafkaConsumerConfig[] = kafkaConfig .getConfigArray('topics') .map(topic => { return { @@ -91,6 +91,6 @@ export const readConfig = (config: Config): KafkaEventSourceConfig => { enforceRequestTimeout, retry, }, - kafkaConsumerConfig, + kafkaConsumerConfigs, }; };