cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update the type of some arguments in mysql_db module (#3285)

Browse source 
login_password should not be logged, so mark it as 'no_log'
the others arguments are path to file, and so should be type='path',
which permit to remove the line handling '~' and shell variables.
This commit is contained in:
Michael Scherer 2016-04-11 16:57:24 +02:00 committed by Matt Clay
parent 7422ada2c8
commit c0179330c9
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/database/mysql/mysql_db.py
View file

@ -217,20 +217,20 @@ def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
login_user=dict(default=None), login_user=dict(default=None),
login_password=dict(default=None), login_password=dict(default=None, no_log=True),
login_host=dict(default="localhost"), login_host=dict(default="localhost"),
login_port=dict(default=3306, type='int'), login_port=dict(default=3306, type='int'),
login_unix_socket=dict(default=None), login_unix_socket=dict(default=None),
name=dict(required=True, aliases=['db']), name=dict(required=True, aliases=['db']),
encoding=dict(default=""), encoding=dict(default=""),
collation=dict(default=""), collation=dict(default=""),
target=dict(default=None), target=dict(default=None, type='path'),
state=dict(default="present", choices=["absent", "present","dump", "import"]), state=dict(default="present", choices=["absent", "present","dump", "import"]),
ssl_cert=dict(default=None), ssl_cert=dict(default=None, type='path'),
ssl_key=dict(default=None), ssl_key=dict(default=None, type='path'),
ssl_ca=dict(default=None), ssl_ca=dict(default=None, type='path'),
connect_timeout=dict(default=30, type='int'), connect_timeout=dict(default=30, type='int'),
config_file=dict(default="~/.my.cnf"), config_file=dict(default="~/.my.cnf", type='path'),
), ),
supports_check_mode=True supports_check_mode=True
) )
@ -252,15 +252,10 @@ def main():
ssl_ca = module.params["ssl_ca"] ssl_ca = module.params["ssl_ca"]
connect_timeout = module.params['connect_timeout'] connect_timeout = module.params['connect_timeout']
config_file = module.params['config_file'] config_file = module.params['config_file']
config_file = os.path.expanduser(os.path.expandvars(config_file))
login_password = module.params["login_password"] login_password = module.params["login_password"]
login_user = module.params["login_user"] login_user = module.params["login_user"]
login_host = module.params["login_host"] login_host = module.params["login_host"]
# make sure the target path is expanded for ~ and $HOME
if target is not None:
target = os.path.expandvars(os.path.expanduser(target))
if state in ['dump','import']: if state in ['dump','import']:
if target is None: if target is None:
module.fail_json(msg="with state=%s target is required" % (state)) module.fail_json(msg="with state=%s target is required" % (state))