Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion deploy_config_generator/site_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ def load_file(self, path):
data = dict_merge(data, include_data)
del data['include']
if 'secrets_files' in data:
for idx, secrets_file in enumerate(data['secrets_files']):
secrets_files = self._template.render_template(data['secrets_files'])
if not isinstance(secrets_files, list):
secrets_files = [secrets_files]
for idx, secrets_file in enumerate(secrets_files):
if not secrets_file.startswith('/'):
# Normalize secrets file path based on location of parent file
data['secrets_files'][idx] = os.path.join(os.path.dirname(path), secrets_file)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def run(self):

setup(
name='deploy-config-generator',
version='2.30.0',
version='2.30.1',
url='https://github.com/ApplauseOSS/deploy-config-generator',
license='MIT',
description='Utility to generate service deploy configurations',
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/secrets/site_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins:
# Enable 'dummy' plugin, which is disabled by default
enabled: true
secrets_files:
- secrets.yaml
# The seemingly needless template is there just to make sure templates are evaluated
- secret{{ 's' }}.yaml
# This is here to make sure we don't blow up when a secrets file doesn't exist
- secrets.doesnotexist.yaml
Loading