diff --git a/changelog/45823.fixed b/changelog/45823.fixed new file mode 100644 index 00000000000..e419ad4f7e9 --- /dev/null +++ b/changelog/45823.fixed @@ -0,0 +1 @@ +Fix fun_args missing from syndic returns diff --git a/salt/master.py b/salt/master.py index 86be0b759ef..4b9b8e2a198 100644 --- a/salt/master.py +++ b/salt/master.py @@ -1743,8 +1743,8 @@ class AESFuncs(TransportMethods): 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 index 544805fc621..f304a6ca207 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -3683,7 +3683,7 @@ class SyndicManager(MinionBase): # __'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