From 6cb28764d3db9946990acc6b6db9b1cdc4e6cfc2 Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 13 Oct 2020 14:22:40 +0200 Subject: [PATCH 01/10] fix import --- robotframework_pykafka/robotframework_pykafka.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/robotframework_pykafka.py b/robotframework_pykafka/robotframework_pykafka.py index 6c8218e..e475f9e 100644 --- a/robotframework_pykafka/robotframework_pykafka.py +++ b/robotframework_pykafka/robotframework_pykafka.py @@ -1,6 +1,6 @@ #!/bin/python3 -from kafka_helper import * +import robotframework_pykafka.kafka_helper from robot.api import logger from robot.api.deco import keyword From d7292e1b26bdf90c45c9c8b2f4ab3f12a19fe60f Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 13 Oct 2020 15:30:08 +0200 Subject: [PATCH 02/10] fix import --- robotframework_pykafka/kafka_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index ccaa494..a489163 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -5,7 +5,7 @@ import time from pykafka import KafkaClient from pykafka.common import OffsetType -from utils import * +from robotframework_pykafka.utils import * ################################################## # Kafka helper class. From e0785f04ea081d834d9799195daa779c4e6519fc Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 13 Oct 2020 15:32:40 +0200 Subject: [PATCH 03/10] fix import --- robotframework_pykafka/robotframework_pykafka.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/robotframework_pykafka.py b/robotframework_pykafka/robotframework_pykafka.py index e475f9e..c6f4f90 100644 --- a/robotframework_pykafka/robotframework_pykafka.py +++ b/robotframework_pykafka/robotframework_pykafka.py @@ -1,6 +1,6 @@ #!/bin/python3 -import robotframework_pykafka.kafka_helper +from robotframework_pykafka.kafka_helper import * from robot.api import logger from robot.api.deco import keyword From 6a768f158ead2377510e1cb0381218933582fde5 Mon Sep 17 00:00:00 2001 From: adrszad Date: Thu, 17 Dec 2020 12:00:13 +0100 Subject: [PATCH 04/10] increase consumer timeout to 3s --- robotframework_pykafka/kafka_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index ccaa494..7f2edb4 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -93,7 +93,7 @@ def _getConsumer(self, topicName, consumerGroupName = None, setOffsetToEarliest auto_offset_reset = offsetType, auto_commit_enable = True, reset_offset_on_start = True, - consumer_timeout_ms = 1000) + consumer_timeout_ms = 3000) self._consumers[(top, cgn)] = c return c From 9d66a62071936e8c8453b68e341e6094311f1592 Mon Sep 17 00:00:00 2001 From: adrszad Date: Thu, 17 Dec 2020 12:02:52 +0100 Subject: [PATCH 05/10] increase consumer timeout to 3s --- robotframework_pykafka/kafka_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index a489163..e59920f 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -93,7 +93,7 @@ def _getConsumer(self, topicName, consumerGroupName = None, setOffsetToEarliest auto_offset_reset = offsetType, auto_commit_enable = True, reset_offset_on_start = True, - consumer_timeout_ms = 1000) + consumer_timeout_ms = 3000) self._consumers[(top, cgn)] = c return c From 3aa91100af497e26b3617c44f367dcd4b2a53a3e Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 9 Feb 2021 08:55:37 +0100 Subject: [PATCH 06/10] Update kafka_helper.py revert timeout to 1s --- robotframework_pykafka/kafka_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index 7f2edb4..ccaa494 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -93,7 +93,7 @@ def _getConsumer(self, topicName, consumerGroupName = None, setOffsetToEarliest auto_offset_reset = offsetType, auto_commit_enable = True, reset_offset_on_start = True, - consumer_timeout_ms = 3000) + consumer_timeout_ms = 1000) self._consumers[(top, cgn)] = c return c From 7f3808da49169810f859fd2ef7285bf57f9ef500 Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 9 Feb 2021 08:58:00 +0100 Subject: [PATCH 07/10] Update kafka_helper.py connect to ssl kafka with cafile --- robotframework_pykafka/kafka_helper.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index ccaa494..bc7563b 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -46,7 +46,17 @@ def __init__(self, kafkaBrokerHostname = None, kafkaBrokerVersion = None): raise e # Get a kafka client - self._client = KafkaClient(hosts = self._kafkaHost, broker_version = self._kafkaBrokerVersion) + try: + self._cafile = os.environ['CAFILE'] + finally: + pass + + if self._cafile: + config = SslConfig(cafile=self._cafile) + self._client = KafkaClient(hosts=self._kafkaHost, broker_version=self._kafkaBrokerVersion, + ssl_config=config) + else: + self._client = KafkaClient(hosts=self._kafkaHost, broker_version=self._kafkaBrokerVersion) self._producers = dict() From 0a048d0a4b3985cca85841555718ffa86b9f9116 Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 9 Feb 2021 09:22:15 +0100 Subject: [PATCH 08/10] Update kafka_helper.py handle negative scenario for cafile --- robotframework_pykafka/kafka_helper.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index bc7563b..d69079a 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -17,7 +17,7 @@ class kafka_helper: # 1. constructor parameters if they are non-None and non-empty # 2. environment variables KAFKA_HOST and KAFKA_BROKER_VERSION # 3. default values (localhost and 2.3) - def __init__(self, kafkaBrokerHostname = None, kafkaBrokerVersion = None): + def __init__(self, kafkaBrokerHostname=None, kafkaBrokerVersion=None, cafile=None): # Determine the kafka host self._kafkaHost = "" @@ -45,12 +45,16 @@ def __init__(self, kafkaBrokerHostname = None, kafkaBrokerVersion = None): except Exception as e: raise e + self._cafile = "" + if cafile: + self._cafile = cafile + else: + try: + self._cafile = os.environ['CAFILE'] + except KeyError: + pass + # Get a kafka client - try: - self._cafile = os.environ['CAFILE'] - finally: - pass - if self._cafile: config = SslConfig(cafile=self._cafile) self._client = KafkaClient(hosts=self._kafkaHost, broker_version=self._kafkaBrokerVersion, From 303d162d8b6486d804f3ff1d45c3b231807c437c Mon Sep 17 00:00:00 2001 From: adrszad Date: Tue, 9 Feb 2021 09:28:43 +0100 Subject: [PATCH 09/10] Update kafka_helper.py decrease timeout to default --- robotframework_pykafka/kafka_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index 9f5be74..415ebc0 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -107,7 +107,7 @@ def _getConsumer(self, topicName, consumerGroupName = None, setOffsetToEarliest auto_offset_reset = offsetType, auto_commit_enable = True, reset_offset_on_start = True, - consumer_timeout_ms = 3000) + consumer_timeout_ms = 1000) self._consumers[(top, cgn)] = c return c From 753d9ebf2aa76102274b81b6907abd70778d16fb Mon Sep 17 00:00:00 2001 From: adrszad Date: Mon, 22 Mar 2021 15:54:49 +0100 Subject: [PATCH 10/10] Update kafka_helper.py fix indentation --- robotframework_pykafka/kafka_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotframework_pykafka/kafka_helper.py b/robotframework_pykafka/kafka_helper.py index 415ebc0..a31b198 100644 --- a/robotframework_pykafka/kafka_helper.py +++ b/robotframework_pykafka/kafka_helper.py @@ -17,7 +17,7 @@ class kafka_helper: # 1. constructor parameters if they are non-None and non-empty # 2. environment variables KAFKA_HOST and KAFKA_BROKER_VERSION # 3. default values (localhost and 2.3) - def __init__(self, kafkaBrokerHostname=None, kafkaBrokerVersion=None, cafile=None): + def __init__(self, kafkaBrokerHostname=None, kafkaBrokerVersion=None, cafile=None): # Determine the kafka host self._kafkaHost = ""