Simplify connector_name variables

This commit is contained in:
Laurent Indermuehle 2023-01-13 16:22:35 +01:00
commit 199b7a5b64
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
11 changed files with 44 additions and 26 deletions

View file

@ -8,7 +8,7 @@
- name: "{{ role_name }} | Setvars | Set Fact"
ansible.builtin.set_fact:
gateway_addr: "{{ ip_route_output.stdout }}"
connector_name: >-
connector_name_version: >-
{{ lookup(
'file',
'/root/ansible_collections/community/mysql/tests/integration/connector'
@ -21,7 +21,8 @@
- name: "{{ role_name }} | Setvars | Set Fact using above facts"
ansible.builtin.set_fact:
connector_ver: "{{ connector_name.split('=')[2].strip() }}"
connector_name: "{{ connector_name_version.split('=')[0].strip() }}"
connector_ver: "{{ connector_name_version.split('=')[2].strip() }}"
db_engine: "{{ db_engine_version.split(':')[0].strip() }}"
db_version: "{{ db_engine_version.split(':')[1].strip() }}"
mysql_command: >-
@ -42,6 +43,7 @@
vars:
msg: |-
connector_name: {{ connector_name }}
connector_ver: {{ connector_ver }}
db_engine: {{ db_engine }}
db_version: {{ db_version }}
ansible.builtin.debug:

View file

@ -17,9 +17,9 @@
shell: 'echo "" >> {{ config_file }}'
when:
- >
connector_name is not search('pymysql')
connector_name != 'pymysql'
or (
connector_name is search('pymysql')
connector_name == 'pymysql'
and connector_ver is version('0.9.3', '>=')
)
@ -30,9 +30,9 @@
mode: '0777'
when:
- >
connector_name is not search('pymysql')
connector_name != 'pymysql'
or (
connector_name is search('pymysql')
connector_name == 'pymysql'
and connector_ver is version('0.9.3', '>=')
)
@ -43,9 +43,9 @@
insertafter: EOF
when:
- >
connector_name is not search('pymysql')
connector_name != 'pymysql'
or (
connector_name is search('pymysql')
connector_name == 'pymysql'
and connector_ver is version('0.9.3', '>=')
)

View file

@ -54,12 +54,14 @@
- assert:
that:
- result is failed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
- assert:
that:
- result is succeeded
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- name: attempt connection with newly created user ignoring hostname
mysql_db:

View file

@ -53,12 +53,14 @@
- assert:
that:
- result is failed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
- assert:
that:
- result is succeeded
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- name: attempt connection with newly created user ignoring hostname
mysql_info:

View file

@ -53,12 +53,14 @@
- assert:
that:
- result is failed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
- assert:
that:
- result is succeeded
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- name: attempt connection with newly created user ignoring hostname
mysql_query:

View file

@ -343,7 +343,8 @@
that:
# PyMySQL driver throws a warning, so the following is correct
- result is not changed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
# Issue https://github.com/ansible-collections/community.mysql/issues/268
- assert:
@ -352,7 +353,8 @@
# if the state was changed or not.
# We assume that it was for DDL queryes by default in the code
- result is changed
when: connector_name is search('mysqlclient')
when:
- connector_name == 'mysqlclient'
- name: Drop db {{ test_db }}
mysql_query:

View file

@ -53,12 +53,14 @@
- assert:
that:
- result is failed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
- assert:
that:
- result is succeeded
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- name: attempt connection with newly created user ignoring hostname
mysql_replication:

View file

@ -56,13 +56,15 @@
assert:
that:
- result is failed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
- name: Issue-28 | Assert connection succeeded
assert:
that:
- result is succeeded
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- name: Issue-28 | Attempt connection with newly created user ignoring hostname
mysql_user:

View file

@ -370,9 +370,9 @@
- name: Plugin auth | Test plugin auth switching which doesn't work on pymysql < 0.9
when:
- >
connector_name is not search('pymysql')
connector_name != 'pymysql'
or (
connector_name is search('pymysql')
connector_name == 'pymysql'
and connector_ver is version('0.9', '>=')
)
block:

View file

@ -53,12 +53,14 @@
- assert:
that:
- result is failed
when: connector_name is search('pymysql')
when:
- connector_name == 'pymysql'
- assert:
that:
- result is succeeded
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- name: attempt connection with newly created user ignoring hostname
mysql_variables:

View file

@ -156,10 +156,12 @@
ignore_errors: true
- include: assert_var.yml changed=true output={{ oor_result }} var_name=max_connect_errors var_value=1
when: connector_name is not search('pymysql')
when:
- connector_name != 'pymysql'
- include: assert_fail_msg.yml output={{ oor_result }} msg='Truncated incorrect'
when: connector_name is search('pymysql')
when:
- connector_name == 'pymsql'
# ============================================================
# Verify mysql_variable fails when setting an incorrect value (incorrect type)