Skip to content

merge_tops : throw better error if top is invalid #15

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

Draft
zaz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

merge_tops : throw better error if top is invalid #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions _modules/topd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# Import python libs
import fnmatch
import logging
import json # for error messages

# Import salt libs
import salt.fileclient
Expand Down Expand Up @@ -274,10 +275,19 @@ def merge_tops(tops):

# List of complied tops
for _top in tops:
# ensure _top is a valid dictionary
if not isinstance(_top, dict):
raise SaltRenderError('Expected dictionary from SALT envs to ' \
+ 'dictionary of VMs to states, but got: ' + json.dumps(_top))
# Compiled tops of one tops file
for ctops in _top.values():
# Targets in a list
for ctop in ctops:
# ensure ctop is a valid dictionary
if not isinstance(ctop, dict):
raise SaltRenderError('Expected dictionary from VMs to ' \
+ 'list of states, but got: ' + json.dumps(ctop) \
+ '. This was found in ' + json.dumps(_top))
for saltenv, targets in ctop.items():
if saltenv == 'include':
continue
Expand Down