From 198298b2d03084470e9e7c65a50e3b72b2f78a7a Mon Sep 17 00:00:00 2001 From: Thomas Woerner <twoerner@redhat.com> Date: Tue, 20 Dec 2022 13:55:03 +0100 Subject: [PATCH] user: Use FQCN for ansible.builtin Use Fully Qualified Collection Name (FQCN) for ansible builtins. This is ansible.builtin.set_fact instead of set_fact for example and aplies for all actions that are part of ansible.builtin. All the replaced ansible.builtins: assert, command, copy, debug, fail, fetch, file, import_playbook, import_tasks, include_role, include_tasks, include_vars, package, set_fact, shell, slurp, stat, systemd --- playbooks/user/ensure_user_with_randompassword.yml | 2 +- playbooks/user/ensure_users_with_randompasswords.yml | 4 ++-- tests/user/certificate/test_user_certificate.yml | 4 ++-- tests/user/certificate/test_users_certificate.yml | 4 ++-- tests/user/certmapdata/test_user_certmapdata.yml | 4 ++-- tests/user/certmapdata/test_users_certmapdata.yml | 4 ++-- tests/user/create_users_json.yml | 4 ++-- tests/user/test_user_client_context.yml | 6 +++--- tests/user/test_user_random.yml | 6 +++--- tests/user/test_users_absent.yml | 6 +++--- tests/user/test_users_invalid_cert.yml | 4 ++-- tests/user/test_users_present.yml | 4 ++-- tests/user/test_users_present_slice.yml | 6 +++--- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/playbooks/user/ensure_user_with_randompassword.yml b/playbooks/user/ensure_user_with_randompassword.yml index ee821f0a..6c0f8295 100644 --- a/playbooks/user/ensure_user_with_randompassword.yml +++ b/playbooks/user/ensure_user_with_randompassword.yml @@ -15,5 +15,5 @@ register: ipauser - name: Print generated random password - debug: + ansible.builtin.debug: var: ipauser.user.randompassword diff --git a/playbooks/user/ensure_users_with_randompasswords.yml b/playbooks/user/ensure_users_with_randompasswords.yml index c0398877..17783f58 100644 --- a/playbooks/user/ensure_users_with_randompasswords.yml +++ b/playbooks/user/ensure_users_with_randompasswords.yml @@ -20,9 +20,9 @@ register: ipauser - name: Print generated random password for user1 - debug: + ansible.builtin.debug: var: ipauser.user.user1.randompassword - name: Print generated random password for user2 - debug: + ansible.builtin.debug: var: ipauser.user.user2.randompassword diff --git a/tests/user/certificate/test_user_certificate.yml b/tests/user/certificate/test_user_certificate.yml index 09dacbb3..cad033aa 100644 --- a/tests/user/certificate/test_user_certificate.yml +++ b/tests/user/certificate/test_user_certificate.yml @@ -6,7 +6,7 @@ tasks: - name: Generate self-signed certificates. - shell: + ansible.builtin.shell: cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" @@ -81,7 +81,7 @@ failed_when: not result.changed or result.failed - name: Remove certificate files. # noqa: deprecated-command-syntax - shell: + ansible.builtin.shell: cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no diff --git a/tests/user/certificate/test_users_certificate.yml b/tests/user/certificate/test_users_certificate.yml index d649f848..55d73e23 100644 --- a/tests/user/certificate/test_users_certificate.yml +++ b/tests/user/certificate/test_users_certificate.yml @@ -6,7 +6,7 @@ tasks: - name: Generate self-signed certificates. - shell: + ansible.builtin.shell: cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" @@ -94,7 +94,7 @@ failed_when: not result.changed or result.failed - name: Remove certificate files. # noqa: deprecated-command-syntax - shell: + ansible.builtin.shell: cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no diff --git a/tests/user/certmapdata/test_user_certmapdata.yml b/tests/user/certmapdata/test_user_certmapdata.yml index 0257b23b..7bb71ddd 100644 --- a/tests/user/certmapdata/test_user_certmapdata.yml +++ b/tests/user/certmapdata/test_user_certmapdata.yml @@ -6,7 +6,7 @@ tasks: - name: Generate self-signed certificates. - shell: + ansible.builtin.shell: cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" @@ -226,7 +226,7 @@ failed_when: not result.changed or result.failed - name: Remove certificate files. # noqa: deprecated-command-syntax - shell: + ansible.builtin.shell: cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no diff --git a/tests/user/certmapdata/test_users_certmapdata.yml b/tests/user/certmapdata/test_users_certmapdata.yml index 491face6..83a4ce8c 100644 --- a/tests/user/certmapdata/test_users_certmapdata.yml +++ b/tests/user/certmapdata/test_users_certmapdata.yml @@ -6,7 +6,7 @@ tasks: - name: Generate self-signed certificates. - shell: + ansible.builtin.shell: cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" @@ -162,7 +162,7 @@ failed_when: not result.changed or result.failed - name: Remove certificate files. # noqa: deprecated-command-syntax - shell: + ansible.builtin.shell: cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no diff --git a/tests/user/create_users_json.yml b/tests/user/create_users_json.yml index f066b0b5..15c3701f 100644 --- a/tests/user/create_users_json.yml +++ b/tests/user/create_users_json.yml @@ -4,10 +4,10 @@ tasks: - name: Check if users.json exists - stat: + ansible.builtin.stat: path: users.json register: register_stat_users - name: Create users.json - command: /bin/bash users.sh 500 + ansible.builtin.command: /bin/bash users.sh 500 when: not register_stat_users.stat.exists diff --git a/tests/user/test_user_client_context.yml b/tests/user/test_user_client_context.yml index b4a37a35..fbb75dbc 100644 --- a/tests/user/test_user_client_context.yml +++ b/tests/user/test_user_client_context.yml @@ -6,7 +6,7 @@ tasks: - name: Include FreeIPA facts. - include_tasks: ../env_freeipa_facts.yml + ansible.builtin.include_tasks: ../env_freeipa_facts.yml # Test will only be executed if host is not a server. - name: Execute with server context in the client. @@ -27,13 +27,13 @@ # in upstream CI. - name: Test user using client context, in client host. - import_playbook: test_user.yml + ansible.builtin.import_playbook: test_user.yml when: groups['ipaclients'] vars: ipa_test_host: ipaclients - name: Test user using client context, in server host. - import_playbook: test_user.yml + ansible.builtin.import_playbook: test_user.yml when: groups['ipaclients'] is not defined or not groups['ipaclients'] vars: ipa_context: client diff --git a/tests/user/test_user_random.yml b/tests/user/test_user_random.yml index ce56abb0..205f057d 100644 --- a/tests/user/test_user_random.yml +++ b/tests/user/test_user_random.yml @@ -26,7 +26,7 @@ ipauser.failed - name: Print generated random password - debug: + ansible.builtin.debug: var: ipauser.user.randompassword - name: User user1 absent @@ -56,11 +56,11 @@ ipauser.failed - name: Print generated random password for user1 - debug: + ansible.builtin.debug: var: ipauser.user.user1.randompassword - name: Print generated random password for user2 - debug: + ansible.builtin.debug: var: ipauser.user.user2.randompassword - name: Users user1 and user2 absent diff --git a/tests/user/test_users_absent.yml b/tests/user/test_users_absent.yml index 6195374d..23670510 100644 --- a/tests/user/test_users_absent.yml +++ b/tests/user/test_users_absent.yml @@ -1,6 +1,6 @@ --- - name: Include create_users_json.yml - import_playbook: create_users_json.yml + ansible.builtin.import_playbook: create_users_json.yml - name: Test users absent hosts: ipaserver @@ -9,11 +9,11 @@ tasks: - name: Include users.json - include_vars: + ansible.builtin.include_vars: file: users.json # noqa 505 - name: Create dict with user names - set_fact: + ansible.builtin.set_fact: user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}" loop: "{{ users }}" diff --git a/tests/user/test_users_invalid_cert.yml b/tests/user/test_users_invalid_cert.yml index 50112ce5..50600e69 100644 --- a/tests/user/test_users_invalid_cert.yml +++ b/tests/user/test_users_invalid_cert.yml @@ -6,7 +6,7 @@ tasks: - name: Generate self-signed certificates. - shell: + ansible.builtin.shell: cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" @@ -55,7 +55,7 @@ failed_when: not result.changed or result.failed - name: Remove certificate files. # noqa: deprecated-command-syntax - shell: + ansible.builtin.shell: cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2] become: no diff --git a/tests/user/test_users_present.yml b/tests/user/test_users_present.yml index 75dfdbfd..0a3279fa 100644 --- a/tests/user/test_users_present.yml +++ b/tests/user/test_users_present.yml @@ -1,6 +1,6 @@ --- - name: Include create_users_json.yml - import_playbook: create_users_json.yml + ansible.builtin.import_playbook: create_users_json.yml - name: Test users present hosts: ipaserver @@ -9,7 +9,7 @@ tasks: - name: Include users.json - include_vars: + ansible.builtin.include_vars: file: users.json # noqa 505 - name: Users present len:{{ users | length }} diff --git a/tests/user/test_users_present_slice.yml b/tests/user/test_users_present_slice.yml index 8f1c6dd4..904be415 100644 --- a/tests/user/test_users_present_slice.yml +++ b/tests/user/test_users_present_slice.yml @@ -1,6 +1,6 @@ --- - name: Include create_users_json.yml - import_playbook: create_users_json.yml + ansible.builtin.import_playbook: create_users_json.yml - name: Test users present slice hosts: ipaserver @@ -11,10 +11,10 @@ slice_size: 500 tasks: - name: Include users.json - include_vars: + ansible.builtin.include_vars: file: users.json # noqa 505 - name: Size of users slice. - debug: + ansible.builtin.debug: msg: "{{ users | length }}" - name: Users present ipauser: -- GitLab