Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for expanding environment variables in configuration files. #378

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Added support for expanding environment variables in configuration files. #378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
101d1fb
Added environment variable expension in configuration files.
gorkemmulayim Feb 19, 2019
ac978c0
Added missing test cases.
gorkemmulayim Feb 19, 2019
968c104
Fixed idna version for python2.6 builds.
gorkemmulayim Feb 20, 2019
c1a0453
Fixes lint error.
gorkemmulayim Mar 1, 2019
08bc62b
Packaged requirements into single pip command to prevent version conf…
gorkemmulayim Mar 29, 2019
e7e4a58
Fixes incorrect default configuration test resources.
gorkemmulayim Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/unit/resources/environment_variable.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a=${ENVIRONMENT_VARIABLE}
8 changes: 8 additions & 0 deletions tests/unit/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ def test_get_properties(self):
'd\\=': '4', 'e\\:': '5', 'f': '==6',
'g': '= 7', 'h': ':8', 'i': '9', 'j': '${ENVIRONMENT_VARIABLE}'})

@patch('prestoadmin.config.os.path.expandvars', return_value='environment_variable_value')
def test_expending_environment_variable(self, environment_variables):
config_file = os.path.join(DIR, 'resources', 'environment_variable.properties')
conf = config.get_conf_from_properties_file(config_file)
self.assertTrue(environment_variables.called)
self.assertEqual({'a': 'environment_variable_value'}, conf)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we have an real test that is using actual environment variable, to see the configuration with expanded environment variables.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the late reply. I will work on this as well as automation failures.



@patch('__builtin__.open')
def test_get_properties_ignores_whitespace(self, open_mock):
file_manager = open_mock.return_value.__enter__.return_value
Expand Down