From b527c2704df00c4ddb28495509e1d7409c5b18a7 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Tue, 18 Jan 2022 18:11:01 +0100
Subject: [PATCH] feat(shared): add suffix to shared config models
---
shared/README.md | 8 ++++----
shared/libretime_shared/config.py | 4 ++--
shared/tests/config_test.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/shared/README.md b/shared/README.md
index 7ebd53333..df062624d 100644
--- a/shared/README.md
+++ b/shared/README.md
@@ -19,15 +19,15 @@ Load your configuration using a subclass of `libretime_shared.config.BaseConfig`
```py
from pydantic import BaseModel
-from libretime_shared.config import RabbitMQ, BaseConfig
+from libretime_shared.config import RabbitMQConfig, BaseConfig
-class Analyzer(BaseModel):
+class AnalyzerConfig(BaseModel):
bpm_enabled: bool = False
bpm_track_max_length: int
class Config(BaseConfig):
- rabbitmq: RabbitMQ
- analyzer: Analyzer
+ rabbitmq: RabbitMQConfig
+ analyzer: AnalyzerConfig
config = Config(filepath="/etc/libretime/config.yml")
```
diff --git a/shared/libretime_shared/config.py b/shared/libretime_shared/config.py
index b2b3eaaa7..caacb2b16 100644
--- a/shared/libretime_shared/config.py
+++ b/shared/libretime_shared/config.py
@@ -99,7 +99,7 @@ class BaseConfig(BaseModel):
# pylint: disable=too-few-public-methods
-class Database(BaseModel):
+class DatabaseConfig(BaseModel):
host: str = "localhost"
port: int = 5432
name: str = "libretime"
@@ -108,7 +108,7 @@ class Database(BaseModel):
# pylint: disable=too-few-public-methods
-class RabbitMQ(BaseModel):
+class RabbitMQConfig(BaseModel):
host: str = "localhost"
port: int = 5672
name: str = "libretime"
diff --git a/shared/tests/config_test.py b/shared/tests/config_test.py
index 96ef0dd9f..63e732fc9 100644
--- a/shared/tests/config_test.py
+++ b/shared/tests/config_test.py
@@ -4,13 +4,13 @@ from unittest import mock
from pytest import mark, raises
-from libretime_shared.config import BaseConfig, Database
+from libretime_shared.config import BaseConfig, DatabaseConfig
# pylint: disable=too-few-public-methods
class FixtureConfig(BaseConfig):
api_key: str
- database: Database
+ database: DatabaseConfig
FIXTURE_CONFIG_RAW = """