Skip to content

Commit

Permalink
add test for vault_and_env_config_resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
CaptainOfHacks committed Mar 11, 2022
1 parent 044b111 commit 843ccb7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
4 changes: 2 additions & 2 deletions ted_sws/adapters/config_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def _config_resolve(config_name: str, default_value: str = None):
return value


class VaultAndEnvConfigResolver(EnvConfigResolver):
class VaultAndEnvConfigResolver(ConfigResolverABC):
"""
This class aims to combine the search for configurations in Vault secrets and environmental variables.
"""
Expand All @@ -97,7 +97,7 @@ def _config_resolve(config_name: str, default_value: str = None):
os.environ[config_name] = str(value)
return value
else:
value = super()._config_resolve(config_name, default_value)
value = EnvConfigResolver._config_resolve(config_name, default_value)
logger.debug(
"[VAULT&ENV] Value of '" + str(config_name) + "' is " + str(value) + "(supplied default is '" + str(
default_value) + "')")
Expand Down
16 changes: 11 additions & 5 deletions tests/unit/test_config_resolver.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ted_sws import config
from ted_sws.adapters.config_resolver import EnvConfigResolver, VaultConfigResolver
from ted_sws.adapters.config_resolver import EnvConfigResolver, VaultConfigResolver, VaultAndEnvConfigResolver


def test_config_resolver():
Expand All @@ -8,9 +8,15 @@ def test_config_resolver():


def test_env_config_resolver():
config_resolver = EnvConfigResolver().config_resolve()
assert config_resolver is None
config_value = EnvConfigResolver().config_resolve()
assert config_value is None


def test_vault_config_resolver():
config_resolver = VaultConfigResolver().config_resolve()
assert config_resolver is None
config_value = VaultConfigResolver().config_resolve()
assert config_value is None


def test_vault_and_env_config_resolver():
config_value = VaultAndEnvConfigResolver().config_resolve()
assert config_value is None

0 comments on commit 843ccb7

Please sign in to comment.