Merge remote-tracking branch 'origin/main' into password_expiration_mysql_user

tests/integration/targets/setup_controller/tasks/verify.yml

@@ -56,8 +56,9 @@
     - name: Assert that we run the expected ansible version
       assert:
         that:
-          - >
-            "{{ ansible_version.major }}.{{ ansible_version.minor }}"
-            is version(test_ansible_version, '==')
+          - ansible_running_version == test_ansible_version
+      vars:
+        ansible_running_version:
+          "{{ ansible_version.major }}.{{ ansible_version.minor }}"
       when:
         - test_ansible_version != 'devel'  # Devel will change overtime

tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml

@@ -339,9 +339,7 @@
   assert:
     that:
       - result is changed
-      - result.db == db_name_value
-  vars:
-    db_name_value: "{{ db_name }}"
+      - result.db == db_name
 
 # - name: Dump and Import | Assert database was backed up successfully
 #   command: "file {{ db_file_name }}"

tests/integration/targets/test_mysql_replication/tasks/mysql_replication_channel.yml

@@ -34,10 +34,14 @@
 
     - assert:
         that:
-        - result is changed
-        - result.queries == result_query
+          - result is changed
+          - result.queries == result_query
       vars:
-        result_query: ["CHANGE MASTER TO MASTER_HOST='{{ mysql_host }}',MASTER_USER='{{ replication_user }}',MASTER_PASSWORD='********',MASTER_PORT={{ mysql_primary_port }},MASTER_LOG_FILE='{{ mysql_primary_status.File }}',MASTER_LOG_POS={{ mysql_primary_status.Position }} FOR CHANNEL '{{ test_channel }}'"]
+        result_query: ["CHANGE MASTER TO MASTER_HOST='{{ mysql_host }}',\
+          MASTER_USER='{{ replication_user }}',MASTER_PASSWORD='********',\
+          MASTER_PORT={{ mysql_primary_port }},MASTER_LOG_FILE=\
+          '{{ mysql_primary_status.File }}',MASTER_LOG_POS=\
+          {{ mysql_primary_status.Position }} FOR CHANNEL '{{ test_channel }}'"]
 
     # Test startreplica mode:
     - name: Start replica with channel
@@ -50,11 +54,11 @@
 
     - assert:
         that:
-        - result is changed
-        - result.queries == result_query or result_query2
+          - result is changed
+          - result.queries == result_query or result_query2
       vars:
         result_query: ["START SLAVE FOR CHANNEL '{{ test_channel }}'"]
-        result_query2:  ["START REPLICA FOR CHANNEL '{{ test_channel }}'"]
+        result_query2: ["START REPLICA FOR CHANNEL '{{ test_channel }}'"]
 
     # Test getreplica mode:
     - name: Get standby status with channel
@@ -67,14 +71,18 @@
 
     - assert:
         that:
-        - replica_status.Is_Replica == true
-        - replica_status.Master_Host == mysql_host_value
-        - replica_status.Exec_Master_Log_Pos == mysql_primary_status.Position
-        - replica_status.Master_Port == mysql_primary_port_value
-        - replica_status.Last_IO_Errno == 0
-        - replica_status.Last_IO_Error == ''
-        - replica_status.Channel_Name == test_channel_value
-        - replica_status is not changed
+          - replica_status.Is_Replica is truthy(convert_bool=True)
+          - replica_status.Master_Host == mysql_host_value
+          - replica_status.Exec_Master_Log_Pos == mysql_primary_status.Position
+          - replica_status.Master_Port == mysql_primary_port_value
+          - replica_status.Last_IO_Errno == 0
+          - replica_status.Last_IO_Error == ''
+          - replica_status.Channel_Name == test_channel_value
+          - replica_status is not changed
+      vars:
+        mysql_host_value: '{{ mysql_host }}'
+        mysql_primary_port_value: '{{ mysql_primary_port }}'
+        test_channel_value: '{{ test_channel }}'
       when: mysql8022_and_higher == false
       vars:
         mysql_host_value: '{{ mysql_host }}'
@@ -83,14 +91,18 @@
 
     - assert:
         that:
-        - replica_status.Is_Replica == true
-        - replica_status.Source_Host == mysql_host_value
-        - replica_status.Exec_Source_Log_Pos == mysql_primary_status.Position
-        - replica_status.Source_Port == mysql_primary_port_value
-        - replica_status.Last_IO_Errno == 0
-        - replica_status.Last_IO_Error == ''
-        - replica_status.Channel_Name == test_channel_value
-        - replica_status is not changed
+          - replica_status.Is_Replica is truthy(convert_bool=True)
+          - replica_status.Source_Host == mysql_host_value
+          - replica_status.Exec_Source_Log_Pos == mysql_primary_status.Position
+          - replica_status.Source_Port == mysql_primary_port_value
+          - replica_status.Last_IO_Errno == 0
+          - replica_status.Last_IO_Error == ''
+          - replica_status.Channel_Name == test_channel_value
+          - replica_status is not changed
+      vars:
+        mysql_host_value: '{{ mysql_host }}'
+        mysql_primary_port_value: '{{ mysql_primary_port }}'
+        test_channel_value: '{{ test_channel }}'
       when: mysql8022_and_higher == true
       vars:
         mysql_host_value: '{{ mysql_host }}'
@@ -109,8 +121,8 @@
 
     - assert:
         that:
-        - result is changed
-        - result.queries == result_query or result.queries == result_query2
+          - result is changed
+          - result.queries == result_query or result.queries == result_query2
       vars:
         result_query: ["STOP SLAVE FOR CHANNEL '{{ test_channel }}'"]
         result_query2: ["STOP REPLICA FOR CHANNEL '{{ test_channel }}'"]
@@ -126,8 +138,8 @@
 
     - assert:
         that:
-        - result is changed
-        - result.queries == result_query or result.queries == result_query2
+          - result is changed
+          - result.queries == result_query or result.queries == result_query2
       vars:
         result_query: ["RESET SLAVE FOR CHANNEL '{{ test_channel }}'"]
         result_query2: ["RESET REPLICA FOR CHANNEL '{{ test_channel }}'"]
@@ -143,8 +155,8 @@
 
     - assert:
         that:
-        - result is changed
-        - result.queries == result_query or result.queries == result_query2
+          - result is changed
+          - result.queries == result_query or result.queries == result_query2
       vars:
         result_query: ["RESET SLAVE ALL FOR CHANNEL '{{ test_channel }}'"]
         result_query2: ["RESET REPLICA ALL FOR CHANNEL '{{ test_channel }}'"]

tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml

@@ -158,9 +158,13 @@
       assert:
         that:
           - result is changed
-          - result.queries == result_query
+          - result.queries == expected_queries
       vars:
-        result_query: ["CHANGE MASTER TO MASTER_HOST='{{ mysql_host }}',MASTER_USER='{{ replication_user }}',MASTER_PASSWORD='********',MASTER_PORT={{ mysql_primary_port }},MASTER_LOG_FILE='{{ mysql_primary_status.File }}',MASTER_LOG_POS={{ mysql_primary_status.Position }},MASTER_SSL=0,MASTER_SSL_CA=''"]
+        expected_queries: ["CHANGE MASTER TO MASTER_HOST='{{ mysql_host }}',\
+          MASTER_USER='{{ replication_user }}',MASTER_PASSWORD='********',\
+          MASTER_PORT={{ mysql_primary_port }},MASTER_LOG_FILE=\
+          '{{ mysql_primary_status.File }}',MASTER_LOG_POS=\
+          {{ mysql_primary_status.Position }},MASTER_SSL=0,MASTER_SSL_CA=''"]
 
     # Test startreplica mode:
     - name: Start replica
@@ -187,32 +191,32 @@
     - name: Assert that getreplica returns expected values for MySQL older than 8.0.22 and Mariadb
       assert:
         that:
-          - replica_status.Is_Replica == true
+          - replica_status.Is_Replica is truthy(convert_bool=True)
           - replica_status.Master_Host == mysql_host_value
           - replica_status.Exec_Master_Log_Pos == mysql_primary_status.Position
           - replica_status.Master_Port == mysql_primary_port_value
           - replica_status.Last_IO_Errno == 0
           - replica_status.Last_IO_Error == ''
           - replica_status is not changed
-      when: mysql8022_and_higher == false
       vars:
         mysql_host_value: "{{ mysql_host }}"
         mysql_primary_port_value: "{{ mysql_primary_port }}"
+      when: mysql8022_and_higher is falsy(convert_bool=True)
 
     - name: Assert that getreplica returns expected values for MySQL newer than 8.0.22
       assert:
         that:
-          - replica_status.Is_Replica == true
+          - replica_status.Is_Replica is truthy(convert_bool=True)
           - replica_status.Source_Host == mysql_host_value
           - replica_status.Exec_Source_Log_Pos == mysql_primary_status.Position
           - replica_status.Source_Port == mysql_primary_port_value
           - replica_status.Last_IO_Errno == 0
           - replica_status.Last_IO_Error == ''
           - replica_status is not changed
-      when: mysql8022_and_higher == true
       vars:
         mysql_host_value: "{{ mysql_host }}"
         mysql_primary_port_value: "{{ mysql_primary_port }}"
+      when: mysql8022_and_higher is truthy(convert_bool=True)
 
     # Create test table and add data to it:
     - name: Create test table

tests/integration/targets/test_mysql_user/tasks/main.yml

@@ -119,10 +119,8 @@
     - name: Assert grant access for user1 on multiple database
       assert:
         that:
-          - db_name in result.stdout
-      with_items: "{{ db_names }}"
-      vars:
-        db_name: "{{ item }}"
+          - item in result.stdout
+      loop: "{{ db_names }}"
 
     - name: Show grants access for user2 on multiple database
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_2 }}'@'localhost'\""
@@ -131,10 +129,8 @@
     - name: Assert grant access for user2 on multiple database
       assert:
         that:
-          - db_name in result.stdout
-      with_items: "{{db_names}}"
-      vars:
-        db_name: "{{ item }}"
+          - item in result.stdout
+      loop: "{{db_names}}"
 
     - include_tasks: utils/remove_user.yml
       vars: