Make use of fully-qualified collection name

tersmitten · tersmitten · commit a2eb154383c8 · 2023-10-02T14:54:46.000+02:00
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -4,6 +4,6 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
   roles:
     - ../../../
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -4,10 +4,10 @@
   become: true
   tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../defaults/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../defaults/main.yml"
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
   handlers:
-    - import_tasks: "{{ playbook_dir }}/../../tests/handlers/main.yml"
+    - ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/handlers/main.yml"
diff --git a/requirements.yml b/requirements.yml
@@ -1,3 +1,4 @@
 # requirements file
 ---
-collections: []
+collections:
+  - name: community.mysql
diff --git a/tasks/chown.yml b/tasks/chown.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: change owner (and group)
-  file:
+  ansible.builtin.file:
     path: "{{ item.path }}"
     owner: "{{ item.owner | default('www-data') }}"
     group: "{{ item.group | default(item.owner) | default('www-data') }}"
diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | create (data) directories
-  file:
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     owner: root
diff --git a/tasks/core.yml b/tasks/core.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: core | check download
-  command: >
+  ansible.builtin.command: >
     test -f {{ item.path }}/wp-load.php
   register: _check_download
   failed_when: false
@@ -11,7 +11,7 @@
     - wordpress-core-is-downloaded
 
 - name: core | download
-  command: >
+  ansible.builtin.command: >
     wp-cli core download
     --allow-root --no-color --path='{{ item.item.path }}'
     --locale='{{ item.item.locale | default('en_US') }}'
@@ -21,7 +21,7 @@
     - wordpress-core-downloaded
 
 - name: core | configure
-  command: >
+  ansible.builtin.command: >
     wp-cli core config
     --allow-root --no-color --path='{{ item.path }}'
     --dbname='{{ item.dbname }}'
@@ -36,7 +36,7 @@
     - wordpress-core-configure
 
 - name: core | identify installation
-  command: >
+  ansible.builtin.command: >
     wp-cli core is-installed
     --allow-root --no-color --path='{{ item.path }}'
   register: _check_installation
@@ -47,7 +47,7 @@
     - wordpress-core-is-installed
 
 - name: core | install
-  command: >
+  ansible.builtin.command: >
     wp-cli core install
     --allow-root --no-color --path='{{ item.item.path }}'
     --url='{{ item.item.url }}' --title='{{ item.item.title }}'
@@ -60,7 +60,7 @@
     - wordpress-core-install
 
 - name: core | check install
-  command: >
+  ansible.builtin.command: >
     wp-cli core is-installed
     --allow-root --no-color --path='{{ item.path }}'
   changed_when: false
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,60 +1,70 @@
 # tasks file
 ---
-- include: wp-cli.yml
+- name: wp-cli
+  ansible.builtin.import_tasks: wp-cli.yml
   tags:
     - configuration
     - wordpress
     - wordpress-wp-cli
 
-- include: core.yml
+- name: core
+  ansible.builtin.import_tasks: core.yml
   tags:
     - configuration
     - wordpress
     - wordpress-core
 
-- include: configure.yml
+- name: configure
+  ansible.builtin.import_tasks: configure.yml
   tags:
     - configuration
     - wordpress
     - wordpress-configure
 
-- include: wp-cron.yml
+- name: wp-cron
+  ansible.builtin.import_tasks: wp-cron.yml
   tags:
     - configuration
     - wordpress
     - wordpress-wp-cron
 
-- include: themes.yml
+- name: themes
+  ansible.builtin.import_tasks: themes.yml
   tags:
     - configuration
     - wordpress
     - wordpress-themes
 
-- include: plugins.yml
+- name: plugins
+  ansible.builtin.import_tasks: plugins.yml
   tags:
     - configuration
     - wordpress
     - wordpress-plugins
 
-- include: users.yml
+- name: users
+  ansible.builtin.import_tasks: users.yml
   tags:
     - configuration
     - wordpress
     - wordpress-users
 
-- include: options.yml
+- name: options
+  ansible.builtin.import_tasks: options.yml
   tags:
     - configuration
     - wordpress
     - wordpress-options
 
-- include: queries.yml
+- name: queries
+  ansible.builtin.import_tasks: queries.yml
   tags:
     - configuration
     - wordpress
     - wordpress-queries
 
-- include: chown.yml
+- name: chown
+  ansible.builtin.import_tasks: chown.yml
   tags:
     - configuration
     - wordpress
diff --git a/tasks/options.yml b/tasks/options.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: add options
-  command: >
+  ansible.builtin.command: >
     wp-cli option
     --allow-root --no-color --path='{{ item.0.path }}'
     {{ item.1.command }} '{{ item.1.name }}' '{{ item.1.value }}' --autoload={{ 'yes' if item.1.autoload | default(true) else 'no' }}
@@ -16,7 +16,7 @@
     - wordpress-options-add
 
 - name: update options
-  command: >
+  ansible.builtin.command: >
     wp-cli option
     --allow-root --no-color --path='{{ item.0.path }}'
     {{ item.1.command }} '{{ item.1.name }}' '{{ item.1.value }}'
@@ -30,7 +30,7 @@
     - wordpress-options-update
 
 - name: delete options
-  command: >
+  ansible.builtin.command: >
     wp-cli option
     --allow-root --no-color --path='{{ item.0.path }}'
     {{ item.1.command }} '{{ item.1.name }}'
diff --git a/tasks/plugins.yml b/tasks/plugins.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: plugins | identify installation
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' plugin is-installed {{ item.1.name }}
   register: _check_installation_plugins
   failed_when: false
@@ -14,7 +14,7 @@
     - wordpress-plugins-is-installed-plugin
 
 - name: plugins | install | wordpress.org
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.item.0.path }}'
     {{ '--force' if item.item.1.force | default(false) else '' }} plugin install {{ item.item.1.name }}
   with_items: "{{ _check_installation_plugins.results | default([]) }}"
@@ -28,7 +28,7 @@
     - wordpress-plugins-install-plugin-wordpress_org
 
 - name: plugins | install | zip | copy
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.item.1.zip }}"
     dest: "{{ wordpress_data_path }}/plugins/{{ item.item.1.name }}.zip"
     owner: root
@@ -46,7 +46,7 @@
     - wordpress-plugins-install-plugin-zip-copy
 
 - name: plugins | install | zip | install
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.item.0.path }}'
     {{ '--force' if item.item.1.force | default(false) else '' }} plugin install {{ wordpress_data_path }}/plugins/{{ item.item.1.name }}.zip
   with_items: "{{ _check_installation_plugins.results | default([]) }}"
@@ -61,7 +61,7 @@
     - wordpress-plugins-install-plugin-zip-install
 
 - name: plugins | install | url
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.item.0.path }}'
     {{ '--force' if item.item.1.force | default(false) else '' }} plugin install {{ item.item.1.url }}
   with_items: "{{ _check_installation_plugins.results | default([]) }}"
@@ -75,7 +75,7 @@
     - wordpress-plugins-install-plugin-url
 
 - name: plugins | check install
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' plugin is-installed {{ item.1.name }}
   changed_when: false
   with_subelements:
@@ -86,7 +86,7 @@
     - wordpress-plugins-check-install-plugin
 
 - name: plugins | activate
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' plugin activate {{ item.1.name }}
   register: _check_activate_plugin
   changed_when: "'Success: Plugin' in _check_activate_plugin.stdout and not 'already' in _check_activate_plugin.stdout"
@@ -100,7 +100,7 @@
     - wordpress-plugins-activate-plugin
 
 - name: plugins | deactivate
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' plugin deactivate {{ item.1.name }}
   register: _check_deactivate_plugin
   changed_when: "'Success: Plugin' in _check_deactivate_plugin.stdout and not 'already' in _check_deactivate_plugin.stdout"
diff --git a/tasks/queries.yml b/tasks/queries.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: queries | execute queries
-  command: >
+  ansible.builtin.command: >
     wp-cli db query
     --allow-root --no-color --path='{{ item.0.path }}'
     "{{ item.1 }}; SELECT ROW_COUNT();"
diff --git a/tasks/themes.yml b/tasks/themes.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: themes | identify installation
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' theme is-installed {{ item.1.name }}
   register: _check_installation_themes
   failed_when: false
@@ -14,7 +14,7 @@
     - wordpress-themes-is-installed-theme
 
 - name: themes | install
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.item.0.path }}' theme install {{ item.item.1.name }}
   with_items: "{{ _check_installation_themes.results | default([]) }}"
   when:
@@ -24,7 +24,7 @@
     - wordpress-themes-install-theme
 
 - name: themes | check install
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' theme is-installed {{ item.1.name }}
   changed_when: false
   with_subelements:
@@ -35,7 +35,7 @@
     - wordpress-themes-install-theme-check
 
 - name: themes | activate
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --path='{{ item.0.path }}' theme activate {{ item.1.name }}
   register: _check_activate_theme
   changed_when: "'Success: Switched to' in _check_activate_theme.stdout"
diff --git a/tasks/users.yml b/tasks/users.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: users | copy file
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.users.src }}"
     dest: "{{ wordpress_data_path }}/users/{{ item.dbname }}.csv"
     owner: root
@@ -14,7 +14,7 @@
     - wordpress-users-copy-file
 
 - name: users | install
-  command: >
+  ansible.builtin.command: >
     wp-cli user import-csv
     --allow-root --no-color --path='{{ item.item.path }}'
     {{ wordpress_data_path }}/users/{{ item.item.dbname }}.csv
diff --git a/tasks/wp-cli.yml b/tasks/wp-cli.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: wp-cli | install
-  get_url:
+  ansible.builtin.get_url:
     url: https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
     dest: "{{ wordpress_wp_cli_install_dir }}/wp-cli"
     force: true
@@ -12,7 +12,7 @@
     - wordpress-wp-cli-install
 
 - name: wp-cli | check
-  command: >
+  ansible.builtin.command: >
     wp-cli --allow-root --no-color --info
   register: _check_info
   failed_when: "'WP-CLI' not in _check_info.stdout"
diff --git a/tasks/wp-cron.yml b/tasks/wp-cron.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: wp-cron | disable wp-cron
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ item.path }}/wp-config.php"
     line: "{{ wordpress_disable_wp_cron_line }}"
     insertafter: '^\<\?php'
@@ -14,7 +14,7 @@
     - wordpress-wp-cron-disable-wp-cron
 
 - name: wp-cron | enable wp-cron
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ item.path }}/wp-config.php"
     line: "{{ wordpress_disable_wp_cron_line }}"
     state: absent
@@ -24,7 +24,7 @@
     - wordpress-wp-cron-enable-wp-cron
 
 - name: wp-cron | enable crond
-  cron:
+  ansible.builtin.cron:
     name: "{{ item.name }}"
     state: "{{ 'present' if item.cron is defined and item.cron.use_crond | default(false) else 'absent' }}"
     job: "wget -O /dev/null {{ item.url }}/wp-cron.php > /dev/null 2>&1"
diff --git a/tests/handlers/main.yml b/tests/handlers/main.yml
diff --git a/tests/tasks/pre.yml b/tests/tasks/pre.yml
diff --git a/tests/test.yml b/tests/test.yml
diff --git a/tests/vagrant.yml b/tests/vagrant.yml
