From 4a3cfa6a32cdcdb927a8544c45fdb4280472c5d6 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 12 Jul 2020 13:35:55 +0200 Subject: [PATCH] Fixups (#2) * Add changelog fragments from c.g. * Adjust version_added to 0.1.0, which comes closer to the truth. * Add changelogs/.plugin-cache.yaml to gitignore. --- .gitignore | 1 + changelogs/config.yaml | 2 +- ...er_fix_overriding_password_to_the_same.yml | 2 ++ .../618-mysql_user_add_missed_privileges.yml | 2 ++ plugins/modules/mysql_db.py | 22 +++++++++---------- plugins/modules/mysql_info.py | 2 +- plugins/modules/mysql_query.py | 2 +- plugins/modules/mysql_replication.py | 14 ++++++------ plugins/modules/mysql_user.py | 8 +++---- plugins/modules/mysql_variables.py | 4 ++-- 10 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 changelogs/fragments/609-mysql_user_fix_overriding_password_to_the_same.yml create mode 100644 changelogs/fragments/618-mysql_user_add_missed_privileges.yml diff --git a/.gitignore b/.gitignore index cb85741..f440722 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /tests/output/ +/changelogs/.plugin-cache.yaml # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/changelogs/config.yaml b/changelogs/config.yaml index 0bc62d6..559e6c4 100644 --- a/changelogs/config.yaml +++ b/changelogs/config.yaml @@ -25,5 +25,5 @@ sections: - Bugfixes - - known_issues - Known Issues -title: Community.Mysql +title: Community MySQL Collection trivial_section_name: trivial diff --git a/changelogs/fragments/609-mysql_user_fix_overriding_password_to_the_same.yml b/changelogs/fragments/609-mysql_user_fix_overriding_password_to_the_same.yml new file mode 100644 index 0000000..9ad0c08 --- /dev/null +++ b/changelogs/fragments/609-mysql_user_fix_overriding_password_to_the_same.yml @@ -0,0 +1,2 @@ +bugfixes: +- mysql_user - fix overriding password to the same (https://github.com/ansible-collections/community.general/issues/543). diff --git a/changelogs/fragments/618-mysql_user_add_missed_privileges.yml b/changelogs/fragments/618-mysql_user_add_missed_privileges.yml new file mode 100644 index 0000000..cf7a583 --- /dev/null +++ b/changelogs/fragments/618-mysql_user_add_missed_privileges.yml @@ -0,0 +1,2 @@ +bugfixes: +- mysql_user - add missed privileges to support (https://github.com/ansible-collections/community.general/issues/617). diff --git a/plugins/modules/mysql_db.py b/plugins/modules/mysql_db.py index 39ac400..17658e0 100644 --- a/plugins/modules/mysql_db.py +++ b/plugins/modules/mysql_db.py @@ -73,7 +73,7 @@ options: required: no default: no type: bool - version_added: '0.2.0' + version_added: '0.1.0' force: description: - Continue dump or import even if we get an SQL error. @@ -81,7 +81,7 @@ options: required: no type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' master_data: description: - Option to dump a master replication server to produce a dump file @@ -95,21 +95,21 @@ options: type: int choices: [0, 1, 2] default: 0 - version_added: '0.2.0' + version_added: '0.1.0' skip_lock_tables: description: - Skip locking tables for read. Used when I(state=dump), ignored otherwise. required: no type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' dump_extra_args: description: - Provide additional arguments for mysqldump. Used when I(state=dump) only, ignored otherwise. required: no type: str - version_added: '0.2.0' + version_added: '0.1.0' use_shell: description: - Used to prevent C(Broken pipe) errors when the imported I(target) file is compressed. @@ -118,7 +118,7 @@ options: required: no type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' unsafe_login_password: description: - If C(no), the module will safely use a shell-escaped version of the I(login_password) value. @@ -126,7 +126,7 @@ options: - Used only when I(state) is C(import) or C(dump) and I(login_password) is passed, ignored otherwise. type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' restrict_config_file: description: - Read only passed I(config_file). @@ -136,14 +136,14 @@ options: - If this behavior is undesirable, use C(yes) to read only named option file. type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' check_implicit_admin: description: - Check if mysql allows login as root/nopassword before trying supplied credentials. - If success, passed I(login_user)/I(login_password) will be ignored. type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' config_overrides_defaults: description: - If C(yes), connection parameters from I(config_file) will override the default @@ -152,7 +152,7 @@ options: - It needs Python 3.5+ as the default interpreter on a target host. type: bool default: no - version_added: '0.2.0' + version_added: '0.1.0' seealso: - module: community.mysql.mysql_info @@ -309,7 +309,7 @@ executed_commands: returned: if executed type: list sample: ["CREATE DATABASE acme"] - version_added: '0.2.0' + version_added: '0.1.0' ''' import os diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py index eafe9c4..6f67e17 100644 --- a/plugins/modules/mysql_info.py +++ b/plugins/modules/mysql_info.py @@ -37,7 +37,7 @@ options: - "Supports elements: C(db_size). Unsupported elements will be ignored" type: list elements: str - version_added: '0.2.0' + version_added: '0.1.0' return_empty_dbs: description: - Includes names of empty databases to returned dictionary. diff --git a/plugins/modules/mysql_query.py b/plugins/modules/mysql_query.py index 88ea34e..9b8fd2d 100644 --- a/plugins/modules/mysql_query.py +++ b/plugins/modules/mysql_query.py @@ -15,7 +15,7 @@ description: - Runs arbitrary MySQL queries. - Pay attention, the module does not support check mode! All queries will be executed in autocommit mode. -version_added: '0.2.0' +version_added: '0.1.0' options: query: description: diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py index bf242ba..49a497d 100644 --- a/plugins/modules/mysql_replication.py +++ b/plugins/modules/mysql_replication.py @@ -28,7 +28,7 @@ options: C(getslave) (SHOW SLAVE STATUS), C(startslave) (START SLAVE), C(stopslave) (STOP SLAVE), - C(resetmaster) (RESET MASTER) - supported since community.mysql 0.2.0, + C(resetmaster) (RESET MASTER) - supported since community.mysql 0.1.0, C(resetslave) (RESET SLAVE), C(resetslaveall) (RESET SLAVE ALL). type: str @@ -115,14 +115,14 @@ options: - Available since MariaDB 10.0.2. choices: [current_pos, slave_pos, disabled] type: str - version_added: '0.2.0' + version_added: '0.1.0' master_delay: description: - Time lag behind the master's state (in seconds). - Available from MySQL 5.6. - For more information see U(https://dev.mysql.com/doc/refman/8.0/en/replication-delayed.html). type: int - version_added: '0.2.0' + version_added: '0.1.0' connection_name: description: - Name of the master connection. @@ -130,7 +130,7 @@ options: - Mutually exclusive with I(channel). - For more information see U(https://mariadb.com/kb/en/library/multi-source-replication/). type: str - version_added: '0.2.0' + version_added: '0.1.0' channel: description: - Name of replication channel. @@ -138,13 +138,13 @@ options: - Mutually exclusive with I(connection_name). - For more information see U(https://dev.mysql.com/doc/refman/8.0/en/replication-multi-source.html). type: str - version_added: '0.2.0' + version_added: '0.1.0' fail_on_error: description: - Fails on error when calling mysql. type: bool default: False - version_added: '0.2.0' + version_added: '0.1.0' notes: - If an empty value for the parameter of string type is needed, use an empty string. @@ -231,7 +231,7 @@ queries: returned: always type: list sample: ["CHANGE MASTER TO MASTER_HOST='master2.example.com',MASTER_PORT=3306"] - version_added: '0.2.0' + version_added: '0.1.0' ''' import os diff --git a/plugins/modules/mysql_user.py b/plugins/modules/mysql_user.py index f9c9aa8..c8212c8 100644 --- a/plugins/modules/mysql_user.py +++ b/plugins/modules/mysql_user.py @@ -89,17 +89,17 @@ options: description: - User's plugin to authenticate (``CREATE USER user IDENTIFIED WITH plugin``). type: str - version_added: '0.2.0' + version_added: '0.1.0' plugin_hash_string: description: - User's plugin hash string (``CREATE USER user IDENTIFIED WITH plugin AS plugin_hash_string``). type: str - version_added: '0.2.0' + version_added: '0.1.0' plugin_auth_string: description: - User's plugin auth_string (``CREATE USER user IDENTIFIED WITH plugin BY plugin_auth_string``). type: str - version_added: '0.2.0' + version_added: '0.1.0' resource_limits: description: - Limit the user for certain server resources. Provided since MySQL 5.6 / MariaDB 10.2. @@ -107,7 +107,7 @@ options: C(MAX_CONNECTIONS_PER_HOUR: num), C(MAX_USER_CONNECTIONS: num)." - Used when I(state=present), ignored otherwise. type: dict - version_added: '0.2.0' + version_added: '0.1.0' notes: - "MySQL server installs with default login_user of 'root' and no password. To secure this user diff --git a/plugins/modules/mysql_variables.py b/plugins/modules/mysql_variables.py index 01ab8c2..9ce1b81 100644 --- a/plugins/modules/mysql_variables.py +++ b/plugins/modules/mysql_variables.py @@ -42,7 +42,7 @@ options: type: str choices: ['global', 'persist', 'persist_only'] default: global - version_added: '0.2.0' + version_added: '0.1.0' seealso: - module: community.mysql.mysql_info @@ -73,7 +73,7 @@ queries: returned: if executed type: list sample: ["SET GLOBAL `read_only` = 1"] - version_added: '0.2.0' + version_added: '0.1.0' ''' import os