1
0

Compare commits

..

No commits in common. "44a4a917a13aae56517838a75b30c92c902ce2d1" and "3b92357186742ffa717a33287964718057207305" have entirely different histories.

View File

@ -118,19 +118,15 @@ class SecretLoader:
self.env_key_prefix = self._load_or_none(ENV_KEY_PREFIX)
if self.env_key_prefix is not None:
logger.info('Environment enabled with prefix: %s', self.env_key_prefix)
if self.env_key_prefix != self.env_key_prefix.upper():
msg = 'Prefix must be uppercase'
raise ValueError(msg)
if self.env_key_prefix.endswith('_'):
msg = 'Prefix must not end with _ (this will be added automatically)'
raise ValueError(msg)
assert (
self.env_key_prefix == self.env_key_prefix.upper()
), 'Prefix must be uppercase'
assert not self.env_key_prefix.endswith(
'_',
), 'Prefix must not end with _ (this will be added automatically)'
# Setup secrets path
self.secret_folder = Path(
self.hardcoded.get(ENV_KEY_SECRETS_DIRECTORY)
or self._load_or_none_env(ENV_KEY_SECRETS_DIRECTORY)
or DEFAULT_SECRETS_DIRECTORY,
)
self.secret_folder = Path(self.hardcoded.get(ENV_KEY_SECRETS_DIRECTORY) or self._load_or_none_env(ENV_KEY_SECRETS_DIRECTORY) or DEFAULT_SECRETS_DIRECTORY)
# Setup pass
self.pass_folder = self._load_or_none(ENV_KEY_PASS_FOLDER)
@ -210,12 +206,8 @@ class SecretLoader:
if self.pass_folder is None:
return None
process = subprocess.run( # noqa: S603
['/usr/bin/pass', 'show', f'{self.pass_folder}/{secret_name.lower()}'],
capture_output=True,
check=False,
shell=False,
)
cmd = ['pass', 'show', f'{self.pass_folder}/{secret_name.lower()}']
process = subprocess.run(cmd, capture_output=True, check=False)
if process.returncode:
return None