From 563d34eb09f690130168de5ee6c08e4e1565ee1c Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 19 Apr 2024 18:18:31 +0200 Subject: [PATCH 1/3] make consumer dataclass compatible with older versions of dumps that dont have a mode set --- client/compose_client/library/models/definition/consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/compose_client/library/models/definition/consumer.py b/client/compose_client/library/models/definition/consumer.py index 5d3d91c..2d9dad0 100644 --- a/client/compose_client/library/models/definition/consumer.py +++ b/client/compose_client/library/models/definition/consumer.py @@ -21,12 +21,12 @@ class Consumer(Identifiable): target: REST_URL name: str - mode: Optional[str] headers: Dict[str, Any] timeout: float retry_backoff_every: int retry_backoff_delay: str retry_max: int + mode: Optional[str] = None @staticmethod def from_raw(raw: RawConsumer, domain_aliases: Dict[str, str]) -> 'Consumer': From 13cf14b23e3cf2156c16efd8534789296bfde16a Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 19 Apr 2024 18:27:56 +0200 Subject: [PATCH 2/3] default mode of consumer in client to IN_ORDER --- client/compose_client/library/models/definition/consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/compose_client/library/models/definition/consumer.py b/client/compose_client/library/models/definition/consumer.py index 2d9dad0..90258a7 100644 --- a/client/compose_client/library/models/definition/consumer.py +++ b/client/compose_client/library/models/definition/consumer.py @@ -26,7 +26,7 @@ class Consumer(Identifiable): retry_backoff_every: int retry_backoff_delay: str retry_max: int - mode: Optional[str] = None + mode: str = "IN_ORDER" @staticmethod def from_raw(raw: RawConsumer, domain_aliases: Dict[str, str]) -> 'Consumer': From e60ded915d30e8b9d7fb5a70374745b9402c6965 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 19 Apr 2024 18:36:19 +0200 Subject: [PATCH 3/3] add default to RawConsumer --- client/compose_client/library/models/raw/consumer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/compose_client/library/models/raw/consumer.py b/client/compose_client/library/models/raw/consumer.py index aac86a5..ade3ed2 100644 --- a/client/compose_client/library/models/raw/consumer.py +++ b/client/compose_client/library/models/raw/consumer.py @@ -25,7 +25,6 @@ class RawConsumer: retry_backoff_every: int retry_backoff_delay: str retry_max: int - mode: str url: REST_URL id: str @@ -34,6 +33,8 @@ class RawConsumer: health: str events: REST_URL + mode: str = "IN_ORDER" + @staticmethod def from_dict(dict: Dict[str, Any]) -> 'RawConsumer': ...