Fix Salt Syndic return events missing fun_args

This fixes issue saltstack#45823 which is the fun_args value missing from the Salt Syndic returns.
keslerm · Nov 7, 2022 · e1f4863 · e1f4863
1 parent 76d47e7
commit e1f4863
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/changelog/45823.fixed b/changelog/45823.fixed
@@ -0,0 +1 @@
+Fix fun_args missing from syndic returns
diff --git a/salt/master.py b/salt/master.py
@@ -1743,8 +1743,8 @@ def _syndic_return(self, load):
                     ret["master_id"] = load["master_id"]
                 if "fun" in load:
                     ret["fun"] = load["fun"]
-                if "arg" in load:
-                    ret["fun_args"] = load["arg"]
+                if "fun_args" in load:
+                    ret["fun_args"] = load["fun_args"]
                 if "out" in load:
                     ret["out"] = load["out"]
                 if "sig" in load:

diff --git a/salt/minion.py b/salt/minion.py
@@ -3683,7 +3683,7 @@ def _process_event(self, raw):
                 # __'s to make sure it doesn't print out on the master cli
                 jdict["__master_id__"] = master
             ret = {}
-            for key in "return", "retcode", "success":
+            for key in "return", "retcode", "success", "fun_args":
                 if key in data:
                     ret[key] = data[key]
             jdict[data["id"]] = ret