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 2

Fix mismatch function argument between cassandra_cql and cassandra_cql_return (#56404)

Browse source 
* Revert "Support original API"

This reverts commit 377fbbc7b7.

* add test case for cassandra_cql async param

* remove warning message
add test for async args

* mocking cassandra.query.dict_factory to avoid test failure

* Blacken changed files

* add cassandra-driver at requirements/static/linux.in
change virtualname for salt/module/cassandra

* add missing asynchronous args

* add diff from jenkins instend running pre-commit

* add diff from jenkins instend of running pre-commit after merged with
master

* changed name salt/module/cassandra.py to salt/module/cassandra_mod.py and set its __virtualname__ is 'cassandra'
add cassandra to mac, window requirements.

* fix for pre-commit
change cassandra test module name

* Fix req files

* Add reqs again

Co-authored-by: Daniel A. Wozniak <dwozniak@saltstack.com>
Co-authored-by: Joe Eacott <31625359+xeacott@users.noreply.github.com>
Co-authored-by: Joe Eacott <jeacott22@hotmail.com>
This commit is contained in:
gwiyeong 2020-05-22 07:42:40 +09:00 • committed by GitHub
parent 78ee5ae692
commit d0dff37419
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 119 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/modules/all/index.rst
View file

@ -92,8 +92,8 @@ execution modules
btrfs
cabal
capirca_acl
cassandra
cassandra_cql
cassandra_mod
celery
ceph
chassis

6
doc/ref/modules/all/salt.modules.cassandra.rst
View file

@ -1,6 +0,0 @@
======================
salt.modules.cassandra
======================
.. automodule:: salt.modules.cassandra
:members:

6
doc/ref/modules/all/salt.modules.cassandra_mod.rst Normal file
View file

@ -0,0 +1,6 @@
==========================
salt.modules.cassandra_mod
==========================
.. automodule:: salt.modules.cassandra_mod
:members:

3
requirements/static/darwin.in
View file

@ -36,3 +36,6 @@ Genshi
Cheetah3==3.1.0
Mako
wempy; python_version <'3'
# cassandra
cassandra-driver>=2.0

3
requirements/static/linux.in
View file

@ -48,3 +48,6 @@ Genshi
Cheetah3==3.1.0
Mako
wempy; python_version <'3'
# cassandra
cassandra-driver>=2.0

4
requirements/static/py3.5/darwin.txt
View file

@ -18,6 +18,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -40,6 +41,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
@ -110,7 +112,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.5/linux.txt
View file

@ -17,6 +17,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -24,6 +25,7 @@ chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
click==7.1.1 # via geomet
contextlib2==0.5.5 # via cherrypy
croniter==0.3.29
cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert
@ -37,6 +39,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
@ -111,7 +114,7 @@ salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
setuptools-scm==3.2.0
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.5/windows.txt
View file

@ -16,12 +16,14 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
cffi==1.12.2
chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.5 # via cherrypy
cherrypy==17.4.1
click==7.1.2 # via geomet
colorama==0.4.1 # via pytest
contextlib2==0.5.5 # via cherrypy
cryptography==2.6.1
@ -36,6 +38,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5
gitpython==2.1.10
google-auth==1.6.3 # via kubernetes
@ -105,7 +108,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
sed==0.3.1
setproctitle==1.1.10
six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pathlib2, pygit2, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, virtualenv, websocket-client
six==1.12.0 # via cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, kubernetes, mock, more-itertools, moto, packaging, pathlib2, pygit2, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, virtualenv, websocket-client
smmap2==2.0.5
strict-rfc3339==0.7
tempora==1.14.1 # via portend

4
requirements/static/py3.6/darwin.txt
View file

@ -18,6 +18,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -40,6 +41,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
@ -109,7 +111,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.6/linux.txt
View file

@ -17,6 +17,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -24,6 +25,7 @@ chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
click==7.1.1 # via geomet
contextlib2==0.5.5 # via cherrypy
croniter==0.3.29
cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert
@ -37,6 +39,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
@ -110,7 +113,7 @@ salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
setuptools-scm==3.2.0
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.6/windows.txt
View file

@ -16,12 +16,14 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
cffi==1.12.2
chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.5 # via cherrypy
cherrypy==17.4.1
click==7.1.2 # via geomet
colorama==0.4.1 # via pytest
contextlib2==0.5.5 # via cherrypy
cryptography==2.6.1
@ -36,6 +38,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5
gitpython==2.1.10
google-auth==1.6.3 # via kubernetes
@ -104,7 +107,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
sed==0.3.1
setproctitle==1.1.10
six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pygit2, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, virtualenv, websocket-client
six==1.12.0 # via cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, kubernetes, mock, more-itertools, moto, packaging, pygit2, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, virtualenv, websocket-client
smmap2==2.0.5
strict-rfc3339==0.7
tempora==1.14.1 # via portend

4
requirements/static/py3.7/darwin.txt
View file

@ -18,6 +18,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -40,6 +41,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
@ -108,7 +110,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.7/linux.txt
View file

@ -17,6 +17,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -24,6 +25,7 @@ chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
click==7.1.1 # via geomet
contextlib2==0.5.5 # via cherrypy
croniter==0.3.29
cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert
@ -37,6 +39,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
@ -109,7 +112,7 @@ salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
setuptools-scm==3.2.0
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.7/windows.txt
View file

@ -15,12 +15,14 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
cffi==1.12.2
chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.5 # via cherrypy
cherrypy==17.4.1
click==7.1.2 # via geomet
colorama==0.4.1 # via pytest
contextlib2==0.5.5 # via cherrypy
cryptography==2.6.1
@ -35,6 +37,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5
gitpython==2.1.10
google-auth==1.6.3 # via kubernetes
@ -102,7 +105,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
sed==0.3.1
setproctitle==1.1.10
six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pygit2, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, virtualenv, websocket-client
six==1.12.0 # via cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, kubernetes, mock, more-itertools, moto, packaging, pygit2, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, virtualenv, websocket-client
smmap2==2.0.5
strict-rfc3339==0.7
tempora==1.14.1 # via portend

4
requirements/static/py3.8/darwin.txt
View file

@ -18,6 +18,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -40,6 +41,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
@ -107,7 +109,7 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

5
requirements/static/py3.8/linux.txt
View file

@ -18,6 +18,7 @@ boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cached-property==1.5.1 # via pygit2
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -25,6 +26,7 @@ chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
click==7.1.1 # via geomet
contextlib2==0.5.5 # via cherrypy
croniter==0.3.29
cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert
@ -38,6 +40,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
@ -109,7 +112,7 @@ salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
setuptools-scm==3.2.0
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

7
requirements/static/py3.9/darwin.txt
View file

@ -18,6 +18,7 @@ boto3==1.13.5
boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -40,6 +41,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.15
google-auth==1.6.3 # via kubernetes
@ -107,8 +109,9 @@ s3transfer==0.3.3 # via boto3
salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==3.0.1 # via gitdb2
smmap==3.0.4 # via smmap2
strict-rfc3339==0.7
tempora==1.14.1 # via portend
terminal==0.4.0 # via ntc-templates

5
requirements/static/py3.9/linux.txt
View file

@ -18,6 +18,7 @@ boto==2.49.0
botocore==1.16.5 # via boto3, moto, s3transfer
cached-property==1.5.1 # via pygit2
cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2019.3.9
certvalidator==0.11.1 # via vcert
cffi==1.12.2
@ -25,6 +26,7 @@ chardet==3.0.4 # via requests
cheetah3==3.1.0
cheroot==6.5.4 # via cherrypy
cherrypy==17.3.0
click==7.1.1 # via geomet
contextlib2==0.5.5 # via cherrypy
croniter==0.3.29
cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert
@ -38,6 +40,7 @@ ecdsa==0.13.3 # via python-jose
filelock==3.0.12 # via virtualenv
future==0.17.1 # via python-jose, textfsm
genshi==0.7.3
geomet==0.1.2 # via cassandra-driver
gitdb2==2.0.5 # via gitpython
gitpython==2.1.11
google-auth==1.6.3 # via kubernetes
@ -109,7 +112,7 @@ salttesting==2017.6.1
scp==0.13.2 # via junos-eznc
setproctitle==1.1.10
setuptools-scm==3.2.0
six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
smmap2==2.0.5 # via gitdb2
strict-rfc3339==0.7
tempora==1.14.1 # via portend

3
requirements/static/windows.in
View file

@ -38,3 +38,6 @@ Genshi
Cheetah3==3.1.0
Mako
wempy; python_version <'3'
# cassandra
cassandra-driver>=2.0

11
salt/modules/cassandra_cql.py
View file

@ -424,6 +424,7 @@ def cql_query_with_prepare(
query,
statement_name,
statement_arguments,
asynchronous=False,
callback_errors=None,
contact_points=None,
port=None,
@ -444,8 +445,11 @@ def cql_query_with_prepare(
:type statement_name: str
:param statement_arguments: Bind parameters for the SQL statement
:type statement_arguments: list[str]
:param async: Run this query in asynchronous mode
:type async: bool
:param asynchronous: Run this query in asynchronous mode
:type asynchronous: bool
:param async: Run this query in asynchronous mode (an alias to 'asynchronous')
NOTE: currently it overrides 'asynchronous' and it will be dropped in version Sodium!
:type async: bool
:param callback_errors: Function to call after query runs if there is an error
:type callback_errors: Function callable
:param contact_points: The Cassandra cluster addresses, can either be a string or a list of IPs.
@ -475,7 +479,8 @@ def cql_query_with_prepare(
statement_arguments=['John']
"""
# Backward-compatibility with Python 3.7: "async" is a reserved word
asynchronous = kwargs.get("async", False)
if "async" in kwargs:
asynchronous = kwargs.get("async", False)
try:
cluster, session = _connect(
contact_points=contact_points,

0
salt/modules/cassandra.py → salt/modules/cassandra_mod.py
View file

44
tests/unit/modules/test_cassandra_cql.py
View file

@ -94,3 +94,47 @@ class CassandraCQLReturnerTestCase(TestCase, LoaderModuleMockMixin):
self.assertEqual(
cassandra_cql._get_ssl_opts(), None # pylint: disable=protected-access
)
def test_valid_asynchronous_args(self):
mock_execute = MagicMock(return_value={})
mock_execute_async = MagicMock(return_value={})
mock_context = {
"cassandra_cql_returner_cluster": MagicMock(return_value={}),
"cassandra_cql_returner_session": MagicMock(
execute=mock_execute,
execute_async=mock_execute_async,
prepare=lambda _: MagicMock(
bind=lambda _: None
), # mock prepared_statement
row_factory=None,
),
"cassandra_cql_prepared": {},
}
with patch.dict(cassandra_cql.__context__, mock_context):
cassandra_cql.cql_query_with_prepare(
"SELECT now() from system.local;", "select_now", [], asynchronous=True
)
self.assert_called_once(mock_execute_async)
def test_valid_async_args(self):
mock_execute = MagicMock(return_value={})
mock_execute_async = MagicMock(return_value={})
mock_context = {
"cassandra_cql_returner_cluster": MagicMock(return_value={}),
"cassandra_cql_returner_session": MagicMock(
execute=mock_execute,
execute_async=mock_execute_async,
prepare=lambda _: MagicMock(bind=lambda _: None),
# mock prepared_statement
row_factory=None,
),
"cassandra_cql_prepared": {},
}
kwargs = {"async": True} # to avoid syntax error in python 3.7
with patch.dict(cassandra_cql.__context__, mock_context):
cassandra_cql.cql_query_with_prepare(
"SELECT now() from system.local;", "select_now", [], **kwargs
)
self.assert_called_once(mock_execute_async)

4
tests/unit/modules/test_cassandra.py → tests/unit/modules/test_cassandra_mod.py
View file

@ -5,7 +5,7 @@
# Import Python libs
from __future__ import absolute_import, print_function, unicode_literals
import salt.modules.cassandra as cassandra
import salt.modules.cassandra_mod as cassandra
# Import Salt Libs
from salt.ext import six
@ -18,7 +18,7 @@ from tests.support.unit import TestCase
class CassandraTestCase(TestCase, LoaderModuleMockMixin):
"""
Test cases for salt.modules.cassandra
Test cases for salt.modules.cassandra_mod
"""
def setup_loader_modules(self):