Release 1.4.1 commit (#159)

* mysql: revert changes made in PR 116

* Add changelog fragment

* Fix CI

* Fix CI

* Fix CI

* Update CI

* Fix CI

(cherry picked from commit 738343d64c)

.github/workflows/ansible-test-plugins.yml

@@ -61,7 +61,7 @@ jobs:
           - stable-2.9
           - stable-2.10
           - stable-2.11
-          - devel
+          #- devel
         python:
           - 3.6
         connector:

changelogs/CHANGELOG.rst

@@ -5,6 +5,49 @@ Community MySQL Collection Release Notes
 .. contents:: Topics
 
 
+v1.4.1
+======
+
+Release Summary
+---------------
+
+This is the patch release of the ``community.mysql`` collection.
+This changelog contains all changes to the modules in this collection
+that have been added after the release of ``community.mysql`` 1.4.0.
+
+Bugfixes
+--------
+
+- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
+
+v1.4.0
+======
+
+Release Summary
+---------------
+
+This is the minor release of the ``community.mysql`` collection.
+This changelog contains all changes to the modules in this collection
+that have been added after the release of ``community.mysql`` 1.3.0.'
+
+Major Changes
+-------------
+
+- mysql_user - the ``REQUIRESSL`` is an alias for the ``ssl`` key in the ``tls_requires`` option in ``community.mysql`` 2.0.0 and support will be dropped altogether in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/issues/121).
+
+Minor Changes
+-------------
+
+- mysql module utils - change deprecated connection parameters ``passwd`` and ``db`` to ``password`` and ``database`` (https://github.com/ansible-collections/community.mysql/pull/116).
+- mysql_collection - introduce codebabse split to handle divergences between MySQL and MariaDB (https://github.com/ansible-collections/community.mysql/pull/103).
+- mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
+- mysql_user - deprecate the ``REQUIRESSL`` privilege (https://github.com/ansible-collections/community.mysql/issues/101).
+
+Bugfixes
+--------
+
+- mysql_user - add support for ``REPLICA MONITOR`` privilege (https://github.com/ansible-collections/community.mysql/issues/105).
+
 v1.3.0
 ======
 

changelogs/changelog.yaml

@@ -235,3 +235,45 @@ releases:
     - 107-mysql_user_fix_grant_on_col_handling.yml
     - 97-mysql_replication_deprecate_offending_terminology.yml
     release_date: '2021-03-08'
+  1.4.0:
+    changes:
+      bugfixes:
+      - mysql_user - add support for ``REPLICA MONITOR`` privilege (https://github.com/ansible-collections/community.mysql/issues/105).
+      major_changes:
+      - mysql_user - the ``REQUIRESSL`` is an alias for the ``ssl`` key in the ``tls_requires``
+        option in ``community.mysql`` 2.0.0 and support will be dropped altogether
+        in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/issues/121).
+      minor_changes:
+      - mysql module utils - change deprecated connection parameters ``passwd`` and
+        ``db`` to ``password`` and ``database`` (https://github.com/ansible-collections/community.mysql/pull/116).
+      - mysql_collection - introduce codebabse split to handle divergences between
+        MySQL and MariaDB (https://github.com/ansible-collections/community.mysql/pull/103).
+      - mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
+      - mysql_user - deprecate the ``REQUIRESSL`` privilege (https://github.com/ansible-collections/community.mysql/issues/101).
+      release_summary: 'This is the minor release of the ``community.mysql`` collection.
+
+        This changelog contains all changes to the modules in this collection
+
+        that have been added after the release of ``community.mysql`` 1.3.0.'''
+    fragments:
+    - 1.4.0.yml
+    - 101-drop-requiressl-support.yml
+    - 103-mysql_and_mariadb_divergence.yml
+    - 108-mysql_priv_add_grant.yml
+    - 115-add_mysql_full_version_suffix_return_var.yml
+    - 116-change_deprecated_connection_ parameters.yml
+    release_date: '2021-04-16'
+  1.4.1:
+    changes:
+      bugfixes:
+      - mysql - revert changes of connector arguments made in pull request 116 causing
+        the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
+      release_summary: 'This is the patch release of the ``community.mysql`` collection.
+
+        This changelog contains all changes to the modules in this collection
+
+        that have been added after the release of ``community.mysql`` 1.4.0.'
+    fragments:
+    - 1.4.1.yml
+    - 153-mysql_revert_connector_changes.yml
+    release_date: '2021-04-23'

changelogs/fragments/101-drop-requiressl-support.yml

@@ -1,4 +0,0 @@
-minor_changes:
-  - mysql_user - deprecate the ``REQUIRESSL`` privilege (https://github.com/ansible-collections/community.mysql/issues/101).
-major_changes:
-  - mysql_user - the ``REQUIRESSL`` is an alias for the ``ssl`` key in the ``tls_requires`` option in ``community.mysql`` 2.0.0 and support will be dropped altogether in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/issues/121).

changelogs/fragments/103-mysql_and_mariadb_divergence.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- mysql_collection - introduce codebabse split to handle divergences between MySQL and MariaDB (https://github.com/ansible-collections/community.mysql/pull/103).

changelogs/fragments/108-mysql_priv_add_grant.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- mysql_user - add support for ``REPLICA MONITOR`` privilege (https://github.com/ansible-collections/community.mysql/issues/105).

changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).

changelogs/fragments/116-change_deprecated_connection_ parameters.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- mysql module utils - change deprecated connection parameters ``passwd`` and ``db`` to ``password`` and ``database`` (https://github.com/ansible-collections/community.mysql/pull/116).

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: community
 name: mysql
-version: 1.3.0
+version: 1.4.1
 readme: README.md
 authors:
   - Ansible community

plugins/module_utils/mysql.py

@@ -79,7 +79,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
     if login_user is not None:
         config['user'] = login_user
     if login_password is not None:
-        config['password'] = login_password
+        config['passwd'] = login_password
     if ssl_cert is not None:
         config['ssl']['cert'] = ssl_cert
     if ssl_key is not None:
@@ -87,7 +87,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
     if ssl_ca is not None:
         config['ssl']['ca'] = ssl_ca
     if db is not None:
-        config['database'] = db
+        config['db'] = db
     if connect_timeout is not None:
         config['connect_timeout'] = connect_timeout
     if check_hostname is not None: