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

Simplify payload unpacking.

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-11-23 15:57:45 -07:00 • committed by Daniel Wozniak
parent e7b99200c6
commit 10b714cf55
43 changed files with 742 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
requirements/base.txt
View file

@ -11,6 +11,7 @@ psutil>=5.0.0
packaging>=21.3
looseversion
tornado>=6.3.3
aiohttp>=3.9.0
# We need contextvars for salt-ssh.
# Even on python versions which ships with contextvars in the standard library!

28
requirements/static/ci/py3.10/darwin.txt
View file

@ -4,20 +4,28 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -119,8 +127,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
# aiosignal
future==0.18.3
@ -247,6 +256,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -546,8 +556,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/darwin.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt

28
requirements/static/ci/py3.10/freebsd.txt
View file

@ -4,20 +4,28 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -118,8 +126,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
# aiosignal
future==0.18.3
@ -250,6 +259,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -551,8 +561,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/freebsd.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt

25
requirements/static/ci/py3.10/linux.txt
View file

@ -6,13 +6,17 @@
#
aiohttp-retry==2.8.3
# via twilio
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
# aiohttp-retry
# etcd3-py
# twilio
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
ansible-core==2.15.0
# via ansible
ansible==8.0.0 ; python_version >= "3.9"
@ -25,10 +29,13 @@ asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -135,8 +142,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
# aiosignal
future==0.18.3
@ -276,6 +284,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -616,8 +625,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/linux.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt

28
requirements/static/ci/py3.10/windows.txt
View file

@ -4,14 +4,22 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.2
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -117,8 +125,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
# aiosignal
genshi==0.7.7
@ -228,6 +237,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
# yarl
packaging==23.1
@ -492,8 +502,10 @@ xmltodict==0.13.0
# pywinrm
yamllint==1.32.0
# via -r requirements/static/ci/windows.in
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt

24
requirements/static/ci/py3.11/darwin.txt
View file

@ -4,10 +4,15 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
@ -20,6 +25,7 @@ asn1crypto==1.5.1
# oscrypto
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# aiohttp
# jsonschema
# pytest
@ -119,8 +125,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# aiohttp
# aiosignal
future==0.18.3
@ -245,8 +252,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -550,8 +558,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/darwin.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt

24
requirements/static/ci/py3.11/freebsd.txt
View file

@ -4,10 +4,15 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
@ -20,6 +25,7 @@ asn1crypto==1.5.1
# oscrypto
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# aiohttp
# jsonschema
# pytest
@ -118,8 +124,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# aiohttp
# aiosignal
future==0.18.3
@ -248,8 +255,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -556,8 +564,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/freebsd.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt

21
requirements/static/ci/py3.11/linux.txt
View file

@ -6,13 +6,17 @@
#
aiohttp-retry==2.8.3
# via twilio
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
# aiohttp-retry
# etcd3-py
# twilio
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
@ -31,6 +35,7 @@ asn1crypto==1.5.1
# oscrypto
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# aiohttp
# jsonschema
# pytest
@ -133,8 +138,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# aiohttp
# aiosignal
future==0.18.3
@ -272,8 +278,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -619,8 +626,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/linux.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt

24
requirements/static/ci/py3.11/windows.txt
View file

@ -4,16 +4,22 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# pydantic
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
# jsonschema
# pytest
@ -117,8 +123,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
# aiosignal
genshi==0.7.7
@ -226,8 +233,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
# yarl
packaging==23.1
@ -498,8 +506,10 @@ xmltodict==0.13.0
# pywinrm
yamllint==1.32.0
# via -r requirements/static/ci/windows.in
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt

15
requirements/static/ci/py3.12/cloud.txt
View file

@ -4,12 +4,15 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
annotated-types==0.6.0
@ -29,6 +32,7 @@ asn1crypto==1.5.1
# oscrypto
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# jsonschema
@ -170,8 +174,9 @@ flaky==3.7.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# aiosignal
@ -348,8 +353,9 @@ msgpack==1.0.7
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# yarl
@ -799,8 +805,9 @@ yamlordereddictloader==0.4.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# junos-eznc
yarl==1.9.2
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
zc.lockfile==3.0.post1

4
requirements/static/ci/py3.12/darwin.txt
View file

@ -5,7 +5,9 @@
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
#
aiohttp==3.9.0
# via etcd3-py
# via
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0

27
requirements/static/ci/py3.12/docs.txt
View file

@ -4,12 +4,24 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
aiosignal==1.3.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# pydantic
attrs==23.1.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
autocommand==2.2.2
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -52,10 +64,16 @@ distro==1.8.0
# -r requirements/base.txt
docutils==0.20.1
# via sphinx
frozenlist==1.4.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# aiosignal
idna==3.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# requests
# yarl
imagesize==1.4.1
# via sphinx
immutables==0.15
@ -129,6 +147,11 @@ msgpack==1.0.7
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
multidict==6.0.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# yarl
myst-docutils[linkify]==1.0.0
# via -r requirements/static/ci/docs.in
packaging==23.1
@ -255,6 +278,10 @@ urllib3==1.26.18
# via
# -c requirements/static/ci/py3.12/linux.txt
# requests
yarl==1.9.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/py3.12/linux.txt

24
requirements/static/ci/py3.12/freebsd.txt
View file

@ -4,10 +4,15 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
@ -20,6 +25,7 @@ asn1crypto==1.5.1
# oscrypto
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# aiohttp
# jsonschema
# pytest
@ -118,8 +124,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# aiohttp
# aiosignal
future==0.18.3
@ -248,8 +255,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -556,8 +564,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/freebsd.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt

15
requirements/static/ci/py3.12/lint.txt
View file

@ -8,14 +8,17 @@ aiohttp-retry==2.8.3
# via
# -c requirements/static/ci/py3.12/linux.txt
# twilio
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# aiohttp-retry
# etcd3-py
# twilio
aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
annotated-types==0.6.0
@ -48,6 +51,7 @@ astroid==2.3.3
# via pylint
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# jsonschema
@ -176,8 +180,9 @@ filelock==3.13.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# virtualenv
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# aiosignal
@ -375,8 +380,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# yarl
@ -809,8 +815,9 @@ yamlordereddictloader==0.4.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# junos-eznc
yarl==1.9.2
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
zc.lockfile==3.0.post1

21
requirements/static/ci/py3.12/linux.txt
View file

@ -6,13 +6,17 @@
#
aiohttp-retry==2.8.3
# via twilio
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
# aiohttp-retry
# etcd3-py
# twilio
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -31,6 +35,7 @@ asn1crypto==1.5.1
# oscrypto
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# aiohttp
# jsonschema
# pytest
@ -133,8 +138,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.0
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# aiohttp
# aiosignal
future==0.18.3
@ -272,8 +278,9 @@ msgpack==1.0.7
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.2
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -619,8 +626,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/linux.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt

28
requirements/static/ci/py3.8/freebsd.txt
View file

@ -4,20 +4,28 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -118,8 +126,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
# aiosignal
future==0.18.3
@ -254,6 +263,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -555,8 +565,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/freebsd.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt

25
requirements/static/ci/py3.8/linux.txt
View file

@ -6,13 +6,17 @@
#
aiohttp-retry==2.8.3
# via twilio
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
# aiohttp-retry
# etcd3-py
# twilio
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
ansible-core==2.11.12
# via ansible
ansible==4.10.0 ; python_version < "3.9"
@ -25,10 +29,13 @@ asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -135,8 +142,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
# aiosignal
future==0.18.3
@ -280,6 +288,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -620,8 +629,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/linux.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt

28
requirements/static/ci/py3.8/windows.txt
View file

@ -4,14 +4,22 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.2
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -117,8 +125,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
# aiosignal
genshi==0.7.7
@ -232,6 +241,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
# yarl
packaging==23.1
@ -497,8 +507,10 @@ xmltodict==0.13.0
# pywinrm
yamllint==1.32.0
# via -r requirements/static/ci/windows.in
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt

28
requirements/static/ci/py3.9/darwin.txt
View file

@ -4,20 +4,28 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -119,8 +127,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
# aiosignal
future==0.18.3
@ -247,6 +256,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -546,8 +556,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/darwin.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt

28
requirements/static/ci/py3.9/freebsd.txt
View file

@ -4,20 +4,28 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -118,8 +126,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
# aiosignal
future==0.18.3
@ -250,6 +259,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -551,8 +561,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/freebsd.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt

25
requirements/static/ci/py3.9/linux.txt
View file

@ -6,13 +6,17 @@
#
aiohttp-retry==2.8.3
# via twilio
aiohttp==3.9.0
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
# aiohttp-retry
# etcd3-py
# twilio
aiosignal==1.3.1
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
ansible-core==2.15.0
# via ansible
ansible==8.0.0 ; python_version >= "3.9"
@ -25,10 +29,13 @@ asn1crypto==1.5.1
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -135,8 +142,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
# aiosignal
future==0.18.3
@ -278,6 +286,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
# yarl
napalm==4.1.0 ; sys_platform != "win32"
@ -618,8 +627,10 @@ yamllint==1.32.0
# via -r requirements/static/ci/linux.in
yamlordereddictloader==0.4.0
# via junos-eznc
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt

28
requirements/static/ci/py3.9/windows.txt
View file

@ -4,14 +4,22 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.0
# via etcd3-py
aiohttp==3.9.1
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
# etcd3-py
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.2
# via aiohttp
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
# jsonschema
# pytest-salt-factories
@ -117,8 +125,9 @@ filelock==3.13.1
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
# aiosignal
genshi==0.7.7
@ -228,6 +237,7 @@ msgpack==1.0.7
# pytest-salt-factories
multidict==6.0.4
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
# yarl
packaging==23.1
@ -493,8 +503,10 @@ xmltodict==0.13.0
# pywinrm
yamllint==1.32.0
# via -r requirements/static/ci/windows.in
yarl==1.9.2
# via aiohttp
yarl==1.9.4
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
zc.lockfile==3.0.post1
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt

22
requirements/static/pkg/py3.10/darwin.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -61,6 +75,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -101,6 +119,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -61,6 +75,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -101,6 +119,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.10/linux.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -61,6 +75,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -103,6 +121,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.10/windows.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -28,8 +36,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -67,6 +81,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -119,6 +137,8 @@ urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"
# via -r requirements/base.txt
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.11/darwin.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -26,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +75,10 @@ more-itertools==8.2.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -108,6 +124,8 @@ typing-extensions==4.8.0
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.11/freebsd.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -26,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +75,10 @@ more-itertools==5.0.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -110,6 +126,8 @@ typing-extensions==4.8.0
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.11/linux.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -26,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +75,10 @@ more-itertools==5.0.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -112,6 +128,8 @@ typing-extensions==4.8.0
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.11/windows.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -30,8 +36,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -69,6 +81,10 @@ more-itertools==8.2.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -126,6 +142,8 @@ urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"
# via -r requirements/base.txt
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.12/freebsd.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -26,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +75,10 @@ more-itertools==5.0.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -110,6 +126,8 @@ typing-extensions==4.8.0
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.12/linux.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -26,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +75,10 @@ more-itertools==5.0.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -112,6 +128,8 @@ typing-extensions==4.8.0
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

20
requirements/static/pkg/py3.12/windows.txt
View file

@ -4,8 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -30,8 +36,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -69,6 +81,10 @@ more-itertools==8.2.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -126,6 +142,8 @@ urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"
# via -r requirements/base.txt
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.8/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +77,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -103,6 +121,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.8/linux.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.8/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -63,6 +77,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -105,6 +123,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.8/windows.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.8/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -28,8 +36,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -69,6 +83,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -122,6 +140,8 @@ urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"
# via -r requirements/base.txt
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.9/darwin.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -61,6 +75,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -101,6 +119,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -61,6 +75,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -101,6 +119,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.9/linux.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -24,8 +32,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -61,6 +75,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -103,6 +121,8 @@ typing-extensions==4.8.0
# via pydantic
urllib3==1.26.18
# via requests
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

22
requirements/static/pkg/py3.9/windows.txt
View file

@ -4,6 +4,14 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.9.1
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via aiohttp
autocommand==2.2.2
# via jaraco.text
certifi==2023.07.22
@ -28,8 +36,14 @@ cryptography==41.0.7
# pyopenssl
distro==1.8.0
# via -r requirements/base.txt
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via requests
# via
# requests
# yarl
immutables==0.15
# via contextvars
importlib-metadata==6.6.0
@ -67,6 +81,10 @@ more-itertools==9.1.0
# jaraco.text
msgpack==1.0.7
# via -r requirements/base.txt
multidict==6.0.4
# via
# aiohttp
# yarl
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
@ -120,6 +138,8 @@ urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"
# via -r requirements/base.txt
yarl==1.9.4
# via aiohttp
zc.lockfile==3.0.post1
# via cherrypy
zipp==3.16.2

17
salt/transport/tcp.py
View file

@ -354,8 +354,8 @@ class PublishClient(salt.transport.base.PublishClient):
# TODO: For some reason we need to decode here for things
# to work. Fix this.
body = salt.payload.loads(messages)
#body = salt.utils.msgpack.loads(messages)
#body = salt.transport.frame.decode_embedded_strs(body)
# body = salt.utils.msgpack.loads(messages)
# body = salt.transport.frame.decode_embedded_strs(body)
else:
body = messages
return body
@ -369,9 +369,6 @@ class PublishClient(salt.transport.base.PublishClient):
await asyncio.sleep(0.001)
if timeout == 0:
for msg in self.unpacker:
print("^" * 80)
print(f"RECV {msg!r}")
print("^" * 80)
return msg[b"body"]
try:
events, _, _ = select.select([self._stream.socket], [], [], 0)
@ -393,9 +390,6 @@ class PublishClient(salt.transport.base.PublishClient):
return
self.unpacker.feed(byts)
for msg in self.unpacker:
print("^" * 80)
print(f"RECV {msg!r}")
print("^" * 80)
return msg[b"body"]
elif timeout:
try:
@ -410,9 +404,6 @@ class PublishClient(salt.transport.base.PublishClient):
return
else:
for msg in self.unpacker:
print("^" * 80)
print(f"RECV {msg!r}")
print("^" * 80)
return msg[b"body"]
while not self._closing:
async with self._read_in_progress:
@ -430,9 +421,6 @@ class PublishClient(salt.transport.base.PublishClient):
continue
self.unpacker.feed(byts)
for msg in self.unpacker:
print("^" * 80)
print(f"RECV {msg!r}")
print("^" * 80)
return msg[b"body"]
async def on_recv_handler(self, callback):
@ -440,7 +428,6 @@ class PublishClient(salt.transport.base.PublishClient):
# Retry quickly, we may want to increase this if it's hogging cpu.
await asyncio.sleep(0.003)
while True:
print("On RECV READ")
msg = await self.recv()
if msg:
try:

27
salt/transport/ws.py
View file

@ -8,7 +8,6 @@ import warnings
import aiohttp
import aiohttp.web
import tornado.ioloop
from tornado.locks import Lock
import salt.payload
import salt.transport.base
@ -44,7 +43,6 @@ class PublishClient(salt.transport.base.PublishClient):
def __init__(self, opts, io_loop, **kwargs): # pylint: disable=W0231
self.opts = opts
self.io_loop = io_loop
self.unpacker = salt.utils.msgpack.Unpacker()
self.connected = False
self._closing = False
@ -52,8 +50,6 @@ class PublishClient(salt.transport.base.PublishClient):
self._closed = False
self.backoff = opts.get("tcp_reconnect_backoff", 1)
self.resolver = kwargs.get("resolver")
self._read_in_progress = Lock()
self.poller = None
self.host = kwargs.get("host", None)
@ -104,12 +100,11 @@ class PublishClient(salt.transport.base.PublishClient):
# pylint: enable=W1701
def _decode_messages(self, messages):
if not isinstance(messages, dict):
body =salt.payload.loads(messages)
body = salt.payload.loads(messages)
else:
body = messages
return body
async def getstream(self, **kwargs):
if self.source_ip or self.source_port:
kwargs.update(source_ip=self.source_ip, source_port=self.source_port)
@ -185,8 +180,6 @@ class PublishClient(salt.transport.base.PublishClient):
await self.connect()
await asyncio.sleep(0.001)
if timeout == 0:
for msg in self.unpacker:
return msg
try:
raw_msg = await asyncio.wait_for(self._ws.receive(), 0.0001)
except TimeoutError:
@ -195,9 +188,7 @@ class PublishClient(salt.transport.base.PublishClient):
if raw_msg.data == "close":
await self._ws.close()
if raw_msg.type == aiohttp.WSMsgType.BINARY:
self.unpacker.feed(raw_msg.data)
for msg in self.unpacker:
return msg
return salt.payload.loads(raw_msg.data, raw=True)
elif raw_msg.type == aiohttp.WSMsgType.ERROR:
log.error(
"ws connection closed with exception %s", self._ws.exception()
@ -205,19 +196,13 @@ class PublishClient(salt.transport.base.PublishClient):
elif timeout:
return await asyncio.wait_for(self.recv(), timeout=timeout)
else:
for msg in self.unpacker:
return msg
while True:
for msg in self.unpacker:
return msg
raw_msg = await self._ws.receive()
if raw_msg.type == aiohttp.WSMsgType.TEXT:
if raw_msg.data == "close":
await self._ws.close()
if raw_msg.type == aiohttp.WSMsgType.BINARY:
self.unpacker.feed(raw_msg.data)
for msg in self.unpacker:
return msg
return salt.payload.loads(raw_msg.data, raw=True)
elif raw_msg.type == aiohttp.WSMsgType.ERROR:
log.error(
"ws connection closed with exception %s",
@ -388,7 +373,7 @@ class PublishServer(salt.transport.base.DaemonizedPublishServer):
await self.puller.wait_closed()
async def pull_handler(self, reader, writer):
unpacker = salt.utils.msgpack.Unpacker()
unpacker = salt.utils.msgpack.Unpacker(raw=True)
while True:
data = await reader.read(1024)
unpacker.feed(data)
@ -445,11 +430,11 @@ class PublishServer(salt.transport.base.DaemonizedPublishServer):
"""
if not self.pub_writer:
await self.connect()
self.pub_writer.write(salt.payload.dumps(payload))
self.pub_writer.write(salt.payload.dumps(payload, use_bin_type=True))
await self.pub_writer.drain()
async def publish_payload(self, package, *args):
payload = salt.payload.dumps(package)
payload = salt.payload.dumps(package, use_bin_type=True)
for ws in list(self.clients):
try:
await ws.send_bytes(payload)

6
tests/pytests/functional/transport/server/test_publish_server.py
View file

@ -28,7 +28,11 @@ async def test_publsh_server(
try:
pub_client.on_recv(handle_msg)
msg = b"meh"
# TODO: Fix this inconsistancy.
if transport == "zeromq":
msg = b"meh"
else:
msg = {b"foo": b"bar"}
await pub_server.publish(msg)
await asyncio.wait_for(event.wait(), 1)
assert [msg] == messages