fix tests after keys returned have change in previous commit

This commit is contained in:
Laurent Indermuehle 2023-09-21 14:03:28 +02:00
parent ddd3812574
commit 62e9ad7812
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09

View file

@ -43,36 +43,36 @@
- name: Mysql_info users_privs | Prepare common tests users - name: Mysql_info users_privs | Prepare common tests users
community.mysql.mysql_user: community.mysql.mysql_user:
name: "{{ item.user }}" name: "{{ item.name }}"
host: "users_privs.com" host: "users_privs.com"
password: '*6C387FC3893DBA1E3BA155E74754DA6682D04747' password: '*6C387FC3893DBA1E3BA155E74754DA6682D04747'
encrypted: true encrypted: true
priv: "{{ item.privs }}" priv: "{{ item.priv }}"
resource_limits: "{{ item.resource_limits | default(omit) }}" resource_limits: "{{ item.resource_limits | default(omit) }}"
state: present state: present
loop: loop:
- user: users_privs_adm - name: users_privs_adm
privs: priv:
'*.*': 'ALL,GRANT' '*.*': 'ALL,GRANT'
- user: users_privs_schema - name: users_privs_schema
privs: priv:
'users_privs_db.*': 'SELECT,INSERT,UPDATE,DELETE' 'users_privs_db.*': 'SELECT,INSERT,UPDATE,DELETE'
- user: users_privs_table - name: users_privs_table
privs: priv:
'users_privs_db.t1': 'SELECT,INSERT,UPDATE' 'users_privs_db.t1': 'SELECT,INSERT,UPDATE'
- user: users_privs_col - name: users_privs_col
privs: priv:
'users_privs_db.t1': 'SELECT (id)' 'users_privs_db.t1': 'SELECT (id)'
resource_limits: resource_limits:
MAX_USER_CONNECTIONS: 100 MAX_USER_CONNECTIONS: 100
- user: users_privs_proc - name: users_privs_proc
privs: priv:
'PROCEDURE users_privs_db.get_all_items': 'EXECUTE' 'PROCEDURE users_privs_db.get_all_items': 'EXECUTE'
resource_limits: resource_limits:
MAX_USER_CONNECTIONS: 2 MAX_USER_CONNECTIONS: 2
MAX_CONNECTIONS_PER_HOUR: 60 MAX_CONNECTIONS_PER_HOUR: 60
- user: users_privs_multi - name: users_privs_multi
privs: priv:
'mysql.*': 'SELECT' 'mysql.*': 'SELECT'
'users_privs_db.*': 'SELECT' 'users_privs_db.*': 'SELECT'
- name: users_privs_usage_only - name: users_privs_usage_only
@ -81,18 +81,18 @@
- name: Mysql_info users_privs | Prepare tests users for MariaDB - name: Mysql_info users_privs | Prepare tests users for MariaDB
community.mysql.mysql_user: community.mysql.mysql_user:
name: "{{ item.user }}" name: "{{ item.name }}"
host: "users_privs.com" host: "users_privs.com"
plugin: "{{ item.plugin | default(omit) }}" plugin: "{{ item.plugin | default(omit) }}"
plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}" plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}"
plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}" plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}"
tls_require: "{{ item.tls_require | default(omit) }}" tls_require: "{{ item.tls_require | default(omit) }}"
priv: "{{ item.privs }}" priv: "{{ item.priv }}"
resource_limits: "{{ item.resource_limits | default(omit) }}" resource_limits: "{{ item.resource_limits | default(omit) }}"
state: present state: present
loop: loop:
- user: users_privs_socket # Only for MariaDB - name: users_privs_socket # Only for MariaDB
privs: priv:
'*.*': 'ALL' '*.*': 'ALL'
plugin: 'unix_socket' plugin: 'unix_socket'
when: when:
@ -100,7 +100,7 @@
- name: Mysql_info users_privs | Prepare tests users for MySQL - name: Mysql_info users_privs | Prepare tests users for MySQL
community.mysql.mysql_user: community.mysql.mysql_user:
name: "{{ item.user }}" name: "{{ item.name }}"
host: "users_privs.com" host: "users_privs.com"
password: "{{ item.password | default(omit) }}" password: "{{ item.password | default(omit) }}"
encrypted: true encrypted: true
@ -108,12 +108,12 @@
plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}" plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}"
plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}" plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}"
tls_require: "{{ item.tls_require | default(omit) }}" tls_require: "{{ item.tls_require | default(omit) }}"
priv: "{{ item.privs }}" priv: "{{ item.priv }}"
resource_limits: "{{ item.resource_limits | default(omit) }}" resource_limits: "{{ item.resource_limits | default(omit) }}"
state: present state: present
loop: loop:
- user: users_privs_sha256 # Only for MySQL - name: users_privs_sha256 # Only for MySQL
privs: priv:
'*.*': 'ALL' '*.*': 'ALL'
plugin_auth_string: plugin_auth_string:
'$5$/<w*D`L4\"F$WQiI1Pev.7atAh8udYs3wqlzgdfV8LXoy7rqSEC7NF2' '$5$/<w*D`L4\"F$WQiI1Pev.7atAh8udYs3wqlzgdfV8LXoy7rqSEC7NF2'
@ -123,7 +123,7 @@
- name: Mysql_info users_privs | Prepare tests users for MySQL 8+ - name: Mysql_info users_privs | Prepare tests users for MySQL 8+
community.mysql.mysql_user: community.mysql.mysql_user:
name: "{{ item.user }}" name: "{{ item.name }}"
host: "users_privs.com" host: "users_privs.com"
password: "{{ item.password | default(omit) }}" password: "{{ item.password | default(omit) }}"
encrypted: true encrypted: true
@ -131,12 +131,12 @@
plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}" plugin_auth_string: "{{ item.plugin_auth_string | default(omit) }}"
plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}" plugin_hash_string: "{{ item.plugin_hash_string | default(omit) }}"
tls_require: "{{ item.tls_require | default(omit) }}" tls_require: "{{ item.tls_require | default(omit) }}"
priv: "{{ item.privs }}" priv: "{{ item.priv }}"
resource_limits: "{{ item.resource_limits | default(omit) }}" resource_limits: "{{ item.resource_limits | default(omit) }}"
state: present state: present
loop: loop:
- user: users_privs_caching_sha2 # Only for MySQL 8+ - name: users_privs_caching_sha2 # Only for MySQL 8+
privs: priv:
'*.*': 'ALL' '*.*': 'ALL'
plugin_auth_string: plugin_auth_string:
'$A$005$61j/uF%Qb4-=O2xkeO82u2HNkF.lxDq0liO4U3xqi7bDUCbWM6HayRXWn1' '$A$005$61j/uF%Qb4-=O2xkeO82u2HNkF.lxDq0liO4U3xqi7bDUCbWM6HayRXWn1'
@ -155,7 +155,7 @@
- name: Recreate users from mysql_info users_privs result - name: Recreate users from mysql_info users_privs result
community.mysql.mysql_user: community.mysql.mysql_user:
name: "{{ item.user }}" name: "{{ item.name }}"
host: "{{ item.host }}" host: "{{ item.host }}"
plugin: "{{ item.plugin | default(omit) }}" plugin: "{{ item.plugin | default(omit) }}"
plugin_auth_string: "{{ item.auth_string | default(omit) }}" plugin_auth_string: "{{ item.auth_string | default(omit) }}"
@ -165,7 +165,7 @@
state: present state: present
loop: "{{ result.users_privs }}" loop: "{{ result.users_privs }}"
loop_control: loop_control:
label: "{{ item.user }}@{{ item.host }}" label: "{{ item.name }}@{{ item.host }}"
register: recreate_users_result register: recreate_users_result
failed_when: recreate_users_result is changed failed_when: recreate_users_result is changed