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

[2019.2] Addition validate checks for inotify beacon #52933

Merged
merged 2 commits into from
May 9, 2019
Merged

[2019.2] Addition validate checks for inotify beacon #52933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
482945d
adding some additional checks to the validation function in the inoti…
garethgreenaway May 7, 2019
6596014
Merge branch '2019.2' into inotify_validation_fixes
garethgreenaway May 8, 2019
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
4 changes: 4 additions & 0 deletions salt/beacons/inotify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ def validate(config):
if 'files' not in _config:
return False, 'Configuration for inotify beacon must include files.'
else:
if not isinstance(_config['files'], dict):
return False, ('Configuration for inotify beacon invalid, '
'files must be a dict.')

for path in _config.get('files'):

if not isinstance(_config['files'][path], dict):
Expand Down
27 changes: 25 additions & 2 deletions tests/unit/beacons/test_inotify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,33 @@ def setUp(self):
def tearDown(self):
shutil.rmtree(self.tmpdir, ignore_errors=True)

def test_non_list_config(self):
config = {}

ret = inotify.validate(config)

self.assertEqual(ret, (False, 'Configuration for inotify beacon must'
' be a list.'))

def test_empty_config(self):
config = [{}]
ret = inotify.beacon(config)
self.assertEqual(ret, [])
ret = inotify.validate(config)
_expected = (False, 'Configuration for inotify beacon must include files.')
self.assertEqual(ret, _expected)

def test_files_none_config(self):
config = [{'files': None}]
ret = inotify.validate(config)
_expected = (False, 'Configuration for inotify beacon invalid, '
'files must be a dict.')
self.assertEqual(ret, _expected)

def test_files_list_config(self):
config = [{'files': [{u'/importantfile': {u'mask': [u'modify']}}]}]
ret = inotify.validate(config)
_expected = (False, 'Configuration for inotify beacon invalid, '
'files must be a dict.')
self.assertEqual(ret, _expected)

def test_file_open(self):
path = os.path.realpath(__file__)
Expand Down