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

We only use msgpack > 1.0 now

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-07-31 14:44:55 -07:00 • committed by Gareth J. Greenaway
parent d8d6bf1630
commit 85504a91a6
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/transport/tcp.py
View file

@ -25,7 +25,6 @@ import tornado.iostream
import tornado.netutil
import tornado.tcpclient
import tornado.tcpserver
from tornado.locks import Lock
import salt.master
import salt.payload
@ -808,7 +807,7 @@ class MessageClient:
ip_bracket(self.host, strip=True),
self.port,
ssl_options=self.opts.get("ssl"),
**kwargs
**kwargs,
)
except Exception as exc: # pylint: disable=broad-except
log.warning(
@ -1497,13 +1496,7 @@ class _TCPPubServerPublisher:
self.path = path
self._closing = False
self.stream = None
# msgpack deprecated `encoding` starting with version 0.5.2
if salt.utils.msgpack.version >= (0, 5, 2):
# Under Py2 we still want raw to be set to True
msgpack_kwargs = {"raw": False}
else:
msgpack_kwargs = {"encoding": "utf-8"}
self.unpacker = salt.utils.msgpack.Unpacker(**msgpack_kwargs)
self.unpacker = salt.utils.msgpack.Unpacker(raw=False)
self._connecting_future = None
def connected(self):

4
tests/pytests/unit/test_auth.py
View file

@ -159,7 +159,9 @@ def auth_acl_master_opts(master_opts):
master_opts["sign_pub_messages"] = False
master_opts["con_cache"] = ""
master_opts["external_auth"] = {}
master_opts["external_auth"] = {"pam": {"test_user": [{"alpha_minion": ["test.ping"]}]}}
master_opts["external_auth"] = {
"pam": {"test_user": [{"alpha_minion": ["test.ping"]}]}
}
yield master_opts