dsw-config 4.8.2__tar.gz → 4.9.1__tar.gz

{dsw_config-4.8.2 → dsw_config-4.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-config
-Version: 4.8.2
+Version: 4.9.1
 Summary: Library for DSW config manipulation
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0

{dsw_config-4.8.2 → dsw_config-4.9.1}/dsw/config/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.8.2~b5b71d7',
-    built_at='2024-08-09 12:58:55Z',
-    sha='b5b71d73da30447467ce1f76fdc4b834db8370cd',
+    version='v4.9.1~7683c81',
+    built_at='2024-08-09 12:59:13Z',
+    sha='7683c812aa2f5a13563b62ef30e7041049eab35d',
     branch='HEAD',
-    tag='v4.8.2',
+    tag='v4.9.1',
 )

{dsw_config-4.8.2 → dsw_config-4.9.1}/dsw/config/keys.py

@@ -232,99 +232,30 @@ class _S3Keys(ConfigKeysContainer):
     )
 
 
-class _MailKeys(ConfigKeysContainer):
-    enabled = ConfigKey(
-        yaml_path=['mail', 'enabled'],
-        var_names=['MAIL_ENABLED'],
-        default=True,
-        cast=cast_bool,
-    )
-    name = ConfigKey(
-        yaml_path=['mail', 'name'],
-        var_names=['MAIL_NAME'],
-        default='',
-        cast=cast_str,
-    )
-    email = ConfigKey(
-        yaml_path=['mail', 'email'],
-        var_names=['MAIL_EMAIL'],
-        default='',
-        cast=cast_str,
-    )
-    host = ConfigKey(
-        yaml_path=['mail', 'host'],
-        var_names=['MAIL_HOST'],
-        default='',
-        cast=cast_str,
-    )
-    port = ConfigKey(
-        yaml_path=['mail', 'port'],
-        var_names=['MAIL_PORT'],
-        cast=cast_str,
-    )
-    ssl = ConfigKey(
-        yaml_path=['mail', 'ssl'],
-        var_names=[],
-        cast=cast_optional_str,
-    )
-    security = ConfigKey(
-        yaml_path=['mail', 'security'],
-        var_names=['MAIL_SECURITY'],
+class _AWSKeys(ConfigKeysContainer):
+    access_key_id = ConfigKey(
+        yaml_path=['aws', 'awsAccessKeyId'],
+        var_names=['AWS_AWS_ACCESS_KEY_ID'],
         cast=cast_optional_str,
     )
-    auth_enabled = ConfigKey(
-        yaml_path=['mail', 'authEnabled'],
-        var_names=[],
-        cast=cast_optional_bool,
-    )
-    username = ConfigKey(
-        yaml_path=['mail', 'username'],
-        var_names=['MAIL_USERNAME'],
+    secret_access_key = ConfigKey(
+        yaml_path=['aws', 'awsSecretAccessKey'],
+        var_names=['AWS_AWS_SECRET_ACCESS_KEY'],
         cast=cast_optional_str,
     )
-    password = ConfigKey(
-        yaml_path=['mail', 'password'],
-        var_names=['MAIL_PASSWORD'],
-        cast=cast_optional_str,
-    )
-    rate_limit_window = ConfigKey(
-        yaml_path=['mail', 'rateLimit', 'window'],
-        var_names=['MAIL_RATE_LIMIT_WINDOW'],
-        default=0,
-        cast=cast_int,
-    )
-    rate_limit_count = ConfigKey(
-        yaml_path=['mail', 'rateLimit', 'count'],
-        var_names=['MAIL_RATE_LIMIT_COUNT'],
-        default=0,
-        cast=cast_int,
-    )
-    timeout = ConfigKey(
-        yaml_path=['mail', 'timeout'],
-        var_names=['MAIL_TIMEOUT'],
-        default=10,
-        cast=cast_int,
-    )
-    dkim_selector = ConfigKey(
-        yaml_path=['mail', 'dkim', 'selector'],
-        var_names=['MAIL_DKIM_SELECTOR'],
-        default=None,
-        cast=cast_optional_str,
-    )
-    dkim_privkey_file = ConfigKey(
-        yaml_path=['mail', 'dkim', 'privkey_file'],
-        var_names=['MAIL_DKIM_PRIVKEY_FILE'],
-        default=None,
+    region = ConfigKey(
+        yaml_path=['aws', 'awsRegion'],
+        var_names=['AWS_AWS_REGION'],
         cast=cast_optional_str,
     )
 
 
 class ConfigKeys(ConfigKeysContainer):
+    aws = _AWSKeys
     cloud = _CloudKeys
     database = _DatabaseKeys
     general = _GeneralKeys
     logging = _LoggingKeys
-    mail = _MailKeys
     s3 = _S3Keys
     sentry = _SentryKeys
 

dsw_config-4.9.1/dsw/config/model.py

@@ -0,0 +1,92 @@
+from typing import Optional
+
+from .logging import prepare_logging, LOG_FILTER
+
+
+def _config_to_string(config: object):
+    lines = [f'{type(config).__name__}']
+    fields = (f for f in config.__dict__.keys() if not f.startswith('_'))
+    for field in fields:
+        v = str(getattr(config, field))
+        t = type(getattr(config, field)).__name__
+        lines.append(f'- {field} = {v} [{t}]')
+    return '\n'.join(lines)
+
+
+class ConfigModel:
+
+    def __str__(self):
+        return _config_to_string(self)
+
+
+class GeneralConfig(ConfigModel):
+
+    def __init__(self, environment: str, client_url: str, secret: str):
+        self.environment = environment
+        self.client_url = client_url
+        self.secret = secret
+
+
+class SentryConfig(ConfigModel):
+
+    def __init__(self, enabled: bool, workers_dsn: Optional[str],
+                 traces_sample_rate: Optional[float], max_breadcrumbs: Optional[int]):
+        self.enabled = enabled
+        self.workers_dsn = workers_dsn
+        self.traces_sample_rate = traces_sample_rate
+        self.max_breadcrumbs = max_breadcrumbs
+
+
+class DatabaseConfig(ConfigModel):
+
+    def __init__(self, connection_string: str, connection_timeout: int, queue_timout: int):
+        self.connection_string = connection_string
+        self.connection_timeout = connection_timeout
+        self.queue_timout = queue_timout
+
+
+class S3Config(ConfigModel):
+
+    def __init__(self, url: str, username: str, password: str,
+                 bucket: str, region: str):
+        self.url = url
+        self.username = username
+        self.password = password
+        self.bucket = bucket
+        self.region = region
+
+
+class LoggingConfig(ConfigModel):
+
+    def __init__(self, level: str, global_level: str, message_format: str,
+                 dict_config: Optional[dict] = None):
+        self.level = level
+        self.global_level = global_level
+        self.message_format = message_format
+        self.dict_config = dict_config
+
+    def apply(self):
+        prepare_logging(self)
+
+    @staticmethod
+    def set_logging_extra(key: str, value: str):
+        LOG_FILTER.set_extra(key, value)
+
+
+class AWSConfig(ConfigModel):
+
+    def __init__(self, access_key_id: Optional[str], secret_access_key: Optional[str],
+                 region: Optional[str]):
+        self.access_key_id = access_key_id
+        self.secret_access_key = secret_access_key
+        self.region = region
+
+    @property
+    def has_credentials(self) -> bool:
+        return self.access_key_id is not None and self.secret_access_key is not None
+
+
+class CloudConfig(ConfigModel):
+
+    def __init__(self, multi_tenant: bool):
+        self.multi_tenant = multi_tenant

{dsw_config-4.8.2 → dsw_config-4.9.1}/dsw/config/parser.py

@@ -5,7 +5,7 @@ from typing import List, Any, IO
 
 from .keys import ConfigKey, ConfigKeys
 from .model import GeneralConfig, SentryConfig, S3Config, \
-    DatabaseConfig, LoggingConfig, CloudConfig, MailConfig
+    DatabaseConfig, LoggingConfig, CloudConfig, AWSConfig
 
 
 class MissingConfigurationError(Exception):
@@ -129,21 +129,9 @@ class DSWConfigParser:
         )
 
     @property
-    def mail(self):
-        return MailConfig(
-            enabled=self.get(self.keys.mail.enabled),
-            name=self.get(self.keys.mail.name),
-            email=self.get(self.keys.mail.email),
-            host=self.get(self.keys.mail.host),
-            ssl=self.get(self.keys.mail.ssl),
-            port=self.get(self.keys.mail.port),
-            security=self.get(self.keys.mail.security),
-            auth_enabled=self.get(self.keys.mail.auth_enabled),
-            username=self.get(self.keys.mail.username),
-            password=self.get(self.keys.mail.password),
-            rate_limit_window=int(self.get(self.keys.mail.rate_limit_window)),
-            rate_limit_count=int(self.get(self.keys.mail.rate_limit_count)),
-            timeout=int(self.get(self.keys.mail.timeout)),
-            dkim_selector=self.get(self.keys.mail.dkim_selector),
-            dkim_privkey_file=self.get(self.keys.mail.dkim_privkey_file),
+    def aws(self) -> AWSConfig:
+        return AWSConfig(
+            access_key_id=self.get(self.keys.aws.access_key_id),
+            secret_access_key=self.get(self.keys.aws.secret_access_key),
+            region=self.get(self.keys.aws.region),
         )

{dsw_config-4.8.2 → dsw_config-4.9.1}/dsw_config.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-config
-Version: 4.8.2
+Version: 4.9.1
 Summary: Library for DSW config manipulation
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0

{dsw_config-4.8.2 → dsw_config-4.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-config'
-version = "4.8.2"
+version = "4.9.1"
 description = 'Library for DSW config manipulation'
 readme = 'README.md'
 keywords = ['dsw', 'config', 'yaml', 'parser']

dsw_config-4.8.2/dsw/config/model.py

@@ -1,166 +0,0 @@
-import pathlib
-from typing import Optional
-
-from .logging import prepare_logging, LOG_FILTER
-
-
-def _config_to_string(config: object):
-    lines = [f'{type(config).__name__}']
-    fields = (f for f in config.__dict__.keys() if not f.startswith('_'))
-    for field in fields:
-        v = str(getattr(config, field))
-        t = type(getattr(config, field)).__name__
-        lines.append(f'- {field} = {v} [{t}]')
-    return '\n'.join(lines)
-
-
-class ConfigModel:
-
-    def __str__(self):
-        return _config_to_string(self)
-
-
-class GeneralConfig(ConfigModel):
-
-    def __init__(self, environment: str, client_url: str, secret: str):
-        self.environment = environment
-        self.client_url = client_url
-        self.secret = secret
-
-
-class SentryConfig(ConfigModel):
-
-    def __init__(self, enabled: bool, workers_dsn: Optional[str],
-                 traces_sample_rate: Optional[float], max_breadcrumbs: Optional[int]):
-        self.enabled = enabled
-        self.workers_dsn = workers_dsn
-        self.traces_sample_rate = traces_sample_rate
-        self.max_breadcrumbs = max_breadcrumbs
-
-
-class DatabaseConfig(ConfigModel):
-
-    def __init__(self, connection_string: str, connection_timeout: int, queue_timout: int):
-        self.connection_string = connection_string
-        self.connection_timeout = connection_timeout
-        self.queue_timout = queue_timout
-
-
-class S3Config(ConfigModel):
-
-    def __init__(self, url: str, username: str, password: str,
-                 bucket: str, region: str):
-        self.url = url
-        self.username = username
-        self.password = password
-        self.bucket = bucket
-        self.region = region
-
-
-class LoggingConfig(ConfigModel):
-
-    def __init__(self, level: str, global_level: str, message_format: str,
-                 dict_config: Optional[dict] = None):
-        self.level = level
-        self.global_level = global_level
-        self.message_format = message_format
-        self.dict_config = dict_config
-
-    def apply(self):
-        prepare_logging(self)
-
-    @staticmethod
-    def set_logging_extra(key: str, value: str):
-        LOG_FILTER.set_extra(key, value)
-
-
-class CloudConfig(ConfigModel):
-
-    def __init__(self, multi_tenant: bool):
-        self.multi_tenant = multi_tenant
-
-
-class MailConfig(ConfigModel):
-
-    def __init__(self, enabled: bool, ssl: Optional[bool], name: str, email: str,
-                 host: str, port: Optional[int], security: Optional[str],
-                 auth_enabled: Optional[bool], username: Optional[str],
-                 password: Optional[str], rate_limit_window: int,
-                 rate_limit_count: int, timeout: int,
-                 dkim_selector: Optional[str] = None,
-                 dkim_privkey_file: Optional[str] = None):
-        self.enabled = enabled
-        self.name = name
-        self.email = email
-        self.host = host
-        self.security = 'plain'
-        if security is not None:
-            self.security = security.lower()
-        elif ssl is not None:
-            self.security = 'ssl' if ssl else 'plain'
-        self.port = port or self._default_port()
-        self.auth = auth_enabled
-        if self.auth is None:
-            self.auth = username is not None and password is not None
-        self.username = username
-        self.password = password
-        self.rate_limit_window = rate_limit_window
-        self.rate_limit_count = rate_limit_count
-        self.timeout = timeout
-        self.dkim_selector = dkim_selector
-        self.dkim_privkey_file = dkim_privkey_file
-        self.dkim_privkey = b''
-
-    def load_dkim_privkey(self):
-        if self.dkim_privkey_file is not None:
-            self.dkim_privkey = pathlib.Path(self.dkim_privkey_file).read_bytes()
-            self.dkim_privkey = self.dkim_privkey.replace(b'\r\n', b'\n')
-
-    @property
-    def use_dkim(self):
-        return self.dkim_selector is not None and len(self.dkim_privkey) > 0
-
-    @property
-    def login_user(self) -> str:
-        return self.username or ''
-
-    @property
-    def login_password(self) -> str:
-        return self.password or ''
-
-    @property
-    def is_plain(self):
-        return self.security == 'plain'
-
-    @property
-    def is_ssl(self):
-        return self.security == 'ssl'
-
-    @property
-    def is_tls(self):
-        return self.security == 'starttls' or self.security == 'tls'
-
-    def _default_port(self) -> int:
-        if self.is_plain:
-            return 25
-        if self.is_ssl:
-            return 465
-        return 587
-
-    def has_credentials(self) -> bool:
-        return self.username is not None and self.password is not None
-
-    def __str__(self):
-        return f'MailConfig\n' \
-               f'- enabled = {self.enabled}\n' \
-               f'- name = {self.name}\n' \
-               f'- email = {self.email}\n' \
-               f'- host = {self.host}\n' \
-               f'- port = {self.port}\n' \
-               f'- security = {self.security}\n' \
-               f'- auth = {self.auth}\n' \
-               f'- rate_limit_window = {self.rate_limit_window}\n' \
-               f'- rate_limit_count = {self.rate_limit_count}\n' \
-               f'- timeout = {self.timeout}\n' \
-               f'- dkim_selector = {self.dkim_selector}\n' \
-               f'- dkim_privkey_file = {self.dkim_privkey_file}\n'