ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-26 20:31:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[stable-1] mysql_info: fix TypeError failure when there are databases that do not contain tables (#209)

Browse source 
* mysql_info: fix TypeError failure when there are databases that do not contain tables (#205)

* mysql_info: fix TypeError failure when there are databases that do not contain tables

* Add changelog fragment

(cherry picked from commit a1f419d541)

* Fix sanity errors
This commit is contained in:
Andrew Klychkov 2021-08-20 10:50:34 +03:00 • committed by GitHub
parent f49206d3b3
commit dbcc7e7e60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/modules/mysql_info.py
View file

@ -474,6 +474,9 @@ class MySQL_Info(object):
self.info['databases'][db['name']] = {}
if not exclude_fields or 'db_size' not in exclude_fields:
if db['size'] is None:
db['size'] = 0
self.info['databases'][db['name']]['size'] = int(db['size'])
# If empty dbs are not needed in the returned dict, exit from the method

2
plugins/modules/mysql_user.py
View file

@ -389,7 +389,7 @@ def sanitize_requires(tls_requires):
if tls_requires:
for key in tls_requires.keys():
sanitized_requires[key.upper()] = tls_requires[key]
if any([key in ["CIPHER", "ISSUER", "SUBJECT"] for key in sanitized_requires.keys()]):
if any(key in ["CIPHER", "ISSUER", "SUBJECT"] for key in sanitized_requires.keys()):
sanitized_requires.pop("SSL", None)
sanitized_requires.pop("X509", None)
return sanitized_requires