Thanks to visit codestin.com
Credit goes to github.com

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
1 change: 1 addition & 0 deletions changelog/68224.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added the ability to pass the context to pyobjects renderer
6 changes: 5 additions & 1 deletion salt/renderers/pyobjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,13 @@ def load_states():
__context__["pyobjects_states"] = states


def render(template, saltenv="base", sls="", salt_data=True, **kwargs):
def render(template, saltenv="base", sls="", salt_data=True, context=None, **kwargs):
if "pyobjects_states" not in __context__:
load_states()

if context is None:
context = {}

# these hold the scope that our sls file will be executed with
_globals = {}

Expand Down Expand Up @@ -423,6 +426,7 @@ def render(template, saltenv="base", sls="", salt_data=True, **kwargs):
"__sls__": sls,
}
)
_globals.update(context)
except NameError:
pass

Expand Down
6 changes: 4 additions & 2 deletions tests/pytests/unit/utils/test_pyobjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,17 @@ def readlines(): # pylint: disable=no-method-argument
return [
"#!pyobjects",
"state_id = __sls__ + '_' + __opts__['id']",
"File.directory(state_id, name='/tmp', mode='1777', owner='root', group='root')",
"File.directory(state_id, name='/tmp', mode='1777', owner=passed_owner, group=passed_group)",
]

return Template


@pytest.mark.slow_test
def test_opts_and_sls_access(pyobjects_template):
ret = pyobjects.render(pyobjects_template, sls="pyobj.runtest")
context = {"passed_owner": "root", "passed_group": "root"}

ret = pyobjects.render(pyobjects_template, sls="pyobj.runtest", context=context)
assert ret == OrderedDict(
[
(
Expand Down