saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Salt Syndic return events missing fun_args

Browse source 
This fixes issue #45823 which is the fun_args value missing from the
Salt Syndic returns.
This commit is contained in:
Morgan Kesler 2022-10-05 14:52:23 -04:00 • committed by rridley
parent 76d47e7f7b
commit e1f4863039
No known key found for this signature in database
GPG key ID: 955CC2652C6C6FB9
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/45823.fixed Normal file
View file

@ -0,0 +1 @@
Fix fun_args missing from syndic returns

4
salt/master.py
View file

@ -1743,8 +1743,8 @@ class AESFuncs(TransportMethods):
ret["master_id"] = load["master_id"] ret["master_id"] = load["master_id"]
if "fun" in load: if "fun" in load:
ret["fun"] = load["fun"] ret["fun"] = load["fun"]
if "arg" in load: if "fun_args" in load:
ret["fun_args"] = load["arg"] ret["fun_args"] = load["fun_args"]
if "out" in load: if "out" in load:
ret["out"] = load["out"] ret["out"] = load["out"]
if "sig" in load: if "sig" in load:

2
salt/minion.py
View file

@ -3683,7 +3683,7 @@ class SyndicManager(MinionBase):
# __'s to make sure it doesn't print out on the master cli # __'s to make sure it doesn't print out on the master cli
jdict["__master_id__"] = master jdict["__master_id__"] = master
ret = {} ret = {}
for key in "return", "retcode", "success": for key in "return", "retcode", "success", "fun_args":
if key in data: if key in data:
ret[key] = data[key] ret[key] = data[key]
jdict[data["id"]] = ret jdict[data["id"]] = ret