Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mysql_db dump/import add missing SSL mode #570

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/add_ssl_mode_for_dump_and_import.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- mysql_db - Implement `check_hostname` parameter for state dump and import.
12 changes: 8 additions & 4 deletions plugins/modules/mysql_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@


def db_dump(module, host, user, password, db_name, target, all_databases, port,
config_file, socket=None, ssl_cert=None, ssl_key=None, ssl_ca=None,
config_file, socket=None, check_hostname=False, ssl_cert=None, ssl_key=None, ssl_ca=None,
single_transaction=None, quick=None, ignore_tables=None, hex_blob=None,
encoding=None, force=False, master_data=0, skip_lock_tables=False,
dump_extra_args=None, unsafe_password=False, restrict_config_file=False,
Expand All @@ -396,6 +396,8 @@
else:
cmd += " --password=%s" % password

if check_hostname:
cmd += " --ssl"

Check warning on line 400 in plugins/modules/mysql_db.py

View check run for this annotation

Codecov / codecov/patch

plugins/modules/mysql_db.py#L400

Added line #L400 was not covered by tests
if ssl_cert is not None:
cmd += " --ssl-cert=%s" % shlex_quote(ssl_cert)
if ssl_key is not None:
Expand Down Expand Up @@ -460,7 +462,7 @@


def db_import(module, host, user, password, db_name, target, all_databases, port, config_file,
socket=None, ssl_cert=None, ssl_key=None, ssl_ca=None, encoding=None, force=False,
socket=None, check_hostname=False, ssl_cert=None, ssl_key=None, ssl_ca=None, encoding=None, force=False,
use_shell=False, unsafe_password=False, restrict_config_file=False,
check_implicit_admin=False):
if not os.path.exists(target):
Expand All @@ -486,6 +488,8 @@
else:
cmd.append("--password=%s" % password)

if check_hostname:
cmd.append("--ssl")

Check warning on line 492 in plugins/modules/mysql_db.py

View check run for this annotation

Codecov / codecov/patch

plugins/modules/mysql_db.py#L492

Added line #L492 was not covered by tests
if ssl_cert is not None:
cmd.append("--ssl-cert=%s" % shlex_quote(ssl_cert))
if ssl_key is not None:
Expand Down Expand Up @@ -729,7 +733,7 @@
module.exit_json(changed=True, db=db_name, db_list=db)
rc, stdout, stderr = db_dump(module, login_host, login_user,
login_password, db, target, all_databases,
login_port, config_file, socket, ssl_cert, ssl_key,
login_port, config_file, socket, check_hostname, ssl_cert, ssl_key,
ssl_ca, single_transaction, quick, ignore_tables,
hex_blob, encoding, force, master_data, skip_lock_tables,
dump_extra_args, unsafe_login_password, restrict_config_file,
Expand All @@ -751,7 +755,7 @@
login_password, db, target,
all_databases,
login_port, config_file,
socket, ssl_cert, ssl_key, ssl_ca,
socket, check_hostname, ssl_cert, ssl_key, ssl_ca,
encoding, force, use_shell, unsafe_login_password,
restrict_config_file, check_implicit_admin)
if rc != 0:
Expand Down