Use FQCNs. (#1180)

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

@@ -8,8 +8,8 @@
 # and should not be used as examples of how to write Ansible roles #
 ####################################################################
 
-- include_tasks: test_secrets.yml
+- ansible.builtin.include_tasks: test_secrets.yml
   when: docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=')
 
-- fail: msg="Too old docker / docker-py version to run docker_secrets tests!"
+- ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_secrets tests!"
   when: not(docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)

tests/integration/targets/docker_secret/tasks/test_secrets.yml

@@ -5,101 +5,101 @@
 
 - block:
     - name: Make sure we're not already using Docker swarm
-      docker_swarm:
+      community.docker.docker_swarm:
         state: absent
         force: true
 
     - name: Create a Swarm cluster
-      docker_swarm:
+      community.docker.docker_swarm:
         state: present
         advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
 
     - name: Parameter name should be required
-      docker_secret:
+      community.docker.docker_secret:
         state: present
       ignore_errors: true
       register: output
 
     - name: assert failure when called with no name
-      assert:
+      ansible.builtin.assert:
         that:
           - 'output.failed'
           - 'output.msg == "missing required arguments: name"'
 
     - name: Test parameters
-      docker_secret:
+      community.docker.docker_secret:
         name: foo
         state: present
       ignore_errors: true
       register: output
 
     - name: assert failure when called with no data
-      assert:
+      ansible.builtin.assert:
         that:
           - 'output.failed'
           - 'output.msg == "state is present but any of the following are missing: data, data_src"'
 
     - name: Create secret
-      docker_secret:
+      community.docker.docker_secret:
         name: db_password
         data: opensesame!
         state: present
       register: output
 
     - name: Create variable secret_id
-      set_fact:
+      ansible.builtin.set_fact:
         secret_id: "{{ output.secret_id }}"
 
     - name: Inspect secret
-      command: "docker secret inspect {{ secret_id }}"
+      ansible.builtin.command: "docker secret inspect {{ secret_id }}"
       register: inspect
       ignore_errors: true
 
-    - debug: var=inspect
+    - ansible.builtin.debug: var=inspect
 
     - name: assert secret creation succeeded
-      assert:
+      ansible.builtin.assert:
         that:
           - "'db_password' in inspect.stdout"
           - "'ansible_key' in inspect.stdout"
       when: inspect is not failed
-    - assert:
+    - ansible.builtin.assert:
         that:
           - "'is too new. Maximum supported API version is' in inspect.stderr"
       when: inspect is failed
 
     - name: Create secret again
-      docker_secret:
+      community.docker.docker_secret:
         name: db_password
         data: opensesame!
         state: present
       register: output
 
     - name: assert create secret is idempotent
-      assert:
+      ansible.builtin.assert:
         that:
           - not output.changed
 
     - name: Write secret into file
-      copy:
+      ansible.builtin.copy:
         dest: "{{ remote_tmp_dir }}/data"
         content: |-
           opensesame!
 
     - name: Create secret again (from file)
-      docker_secret:
+      community.docker.docker_secret:
         name: db_password
         data_src: "{{ remote_tmp_dir }}/data"
         state: present
       register: output
 
     - name: assert create secret is idempotent
-      assert:
+      ansible.builtin.assert:
         that:
           - not output.changed
 
     - name: Create secret again (base64)
-      docker_secret:
+      community.docker.docker_secret:
         name: db_password
         data: b3BlbnNlc2FtZSE=
         data_is_b64: true
@@ -107,42 +107,42 @@
       register: output
 
     - name: assert create secret (base64) is idempotent
-      assert:
+      ansible.builtin.assert:
         that:
           - not output.changed
 
     - name: Update secret
-      docker_secret:
+      community.docker.docker_secret:
         name: db_password
         data: newpassword!
         state: present
       register: output
 
     - name: assert secret was updated
-      assert:
+      ansible.builtin.assert:
         that:
           - output.changed
           - output.secret_id != secret_id
 
     - name: Remove secret
-      docker_secret:
+      community.docker.docker_secret:
         name: db_password
         state: absent
 
     - name: Check that secret is removed
-      command: "docker secret inspect {{ secret_id }}"
+      ansible.builtin.command: "docker secret inspect {{ secret_id }}"
       register: output
       ignore_errors: true
 
     - name: assert secret was removed
-      assert:
+      ansible.builtin.assert:
         that:
           - output.failed
 
   # Rolling update
 
     - name: Create rolling secret
-      docker_secret:
+      community.docker.docker_secret:
         name: rolling_password
         data: opensesame!
         rolling_versions: true
@@ -150,31 +150,31 @@
       register: original_output
 
     - name: Create variable secret_id
-      set_fact:
+      ansible.builtin.set_fact:
         secret_id: "{{ original_output.secret_id }}"
 
     - name: Inspect secret
-      command: "docker secret inspect {{ secret_id }}"
+      ansible.builtin.command: "docker secret inspect {{ secret_id }}"
       register: inspect
       ignore_errors: true
 
-    - debug: var=inspect
+    - ansible.builtin.debug: var=inspect
 
     - name: assert secret creation succeeded
-      assert:
+      ansible.builtin.assert:
         that:
           - "'rolling_password' in inspect.stdout"
           - "'ansible_key' in inspect.stdout"
           - "'ansible_version' in inspect.stdout"
           - original_output.secret_name == 'rolling_password_v1'
       when: inspect is not failed
-    - assert:
+    - ansible.builtin.assert:
         that:
           - "'is too new. Maximum supported API version is' in inspect.stderr"
       when: inspect is failed
 
     - name: Create secret again
-      docker_secret:
+      community.docker.docker_secret:
         name: rolling_password
         data: newpassword!
         rolling_versions: true
@@ -182,7 +182,7 @@
       register: new_output
 
     - name: assert that new version is created
-      assert:
+      ansible.builtin.assert:
         that:
           - new_output.changed
           - new_output.secret_id != original_output.secret_id
@@ -190,33 +190,33 @@
           - new_output.secret_name == 'rolling_password_v2'
 
     - name: Remove rolling secrets
-      docker_secret:
+      community.docker.docker_secret:
         name: rolling_password
         rolling_versions: true
         state: absent
 
     - name: Check that secret is removed
-      command: "docker secret inspect {{ original_output.secret_id }}"
+      ansible.builtin.command: "docker secret inspect {{ original_output.secret_id }}"
       register: output
       ignore_errors: true
 
     - name: assert secret was removed
-      assert:
+      ansible.builtin.assert:
         that:
           - output.failed
 
     - name: Check that secret is removed
-      command: "docker secret inspect {{ new_output.secret_id }}"
+      ansible.builtin.command: "docker secret inspect {{ new_output.secret_id }}"
       register: output
       ignore_errors: true
 
     - name: assert secret was removed
-      assert:
+      ansible.builtin.assert:
         that:
           - output.failed
 
   always:
     - name: Remove Swarm cluster
-      docker_swarm:
+      community.docker.docker_swarm:
         state: absent
         force: true