From 9d47ffc2b92944492f9a48ead82c3c391550673b Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:54:26 +0100
Subject: [PATCH] sudo*: 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
---
tests/sudocmd/test_sudocmd_client_context.yml | 6 +++---
tests/sudocmdgroup/test_sudocmdgroup.yml | 2 +-
tests/sudocmdgroup/test_sudocmdgroup_client_context.yml | 6 +++---
tests/sudorule/test_sudorule_categories.yml | 2 +-
tests/sudorule/test_sudorule_client_context.yml | 6 +++---
tests/sudorule/test_sudorule_member_case_insensitive.yml | 6 +++---
tests/sudorule/test_sudorule_single_hostnames.yml | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/sudocmd/test_sudocmd_client_context.yml b/tests/sudocmd/test_sudocmd_client_context.yml
index ce8c307d..c10f7ffe 100644
--- a/tests/sudocmd/test_sudocmd_client_context.yml
+++ b/tests/sudocmd/test_sudocmd_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 sudocmd using client context, in client host.
- import_playbook: test_sudocmd.yml
+ ansible.builtin.import_playbook: test_sudocmd.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test sudocmd using client context, in server host.
- import_playbook: test_sudocmd.yml
+ ansible.builtin.import_playbook: test_sudocmd.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/sudocmdgroup/test_sudocmdgroup.yml b/tests/sudocmdgroup/test_sudocmdgroup.yml
index 59f63061..39f222f8 100644
--- a/tests/sudocmdgroup/test_sudocmdgroup.yml
+++ b/tests/sudocmdgroup/test_sudocmdgroup.yml
@@ -83,7 +83,7 @@
failed_when: result.changed or result.failed
- name: Verify sudocmdgroup creation with sudocmds
- shell: |
+ ansible.builtin.shell: |
echo SomeADMINpassword | kinit -c verify_sudocmdgroup admin
KRB5CCNAME="verify_sudocmdgroup" ipa sudocmdgroup-show network --all
kdestroy -A -q -c verify_sudocmdgroup
diff --git a/tests/sudocmdgroup/test_sudocmdgroup_client_context.yml b/tests/sudocmdgroup/test_sudocmdgroup_client_context.yml
index 96d39a83..ff4e9c8e 100644
--- a/tests/sudocmdgroup/test_sudocmdgroup_client_context.yml
+++ b/tests/sudocmdgroup/test_sudocmdgroup_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 sudocmdgroup using client context, in client host.
- import_playbook: test_sudocmdgroup.yml
+ ansible.builtin.import_playbook: test_sudocmdgroup.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test sudocmdgroup using client context, in server host.
- import_playbook: test_sudocmdgroup.yml
+ ansible.builtin.import_playbook: test_sudocmdgroup.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/sudorule/test_sudorule_categories.yml b/tests/sudorule/test_sudorule_categories.yml
index 3b8c1926..5fdf24d9 100644
--- a/tests/sudorule/test_sudorule_categories.yml
+++ b/tests/sudorule/test_sudorule_categories.yml
@@ -6,7 +6,7 @@
tasks:
- name: Get Domain from the server name
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
- name: Ensure sudorules are absent
diff --git a/tests/sudorule/test_sudorule_client_context.yml b/tests/sudorule/test_sudorule_client_context.yml
index 696cd670..9df585cb 100644
--- a/tests/sudorule/test_sudorule_client_context.yml
+++ b/tests/sudorule/test_sudorule_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 sudorule using client context, in client host.
- import_playbook: test_sudorule.yml
+ ansible.builtin.import_playbook: test_sudorule.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test sudorule using client context, in server host.
- import_playbook: test_sudorule.yml
+ ansible.builtin.import_playbook: test_sudorule.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/sudorule/test_sudorule_member_case_insensitive.yml b/tests/sudorule/test_sudorule_member_case_insensitive.yml
index ec1507af..724dabda 100644
--- a/tests/sudorule/test_sudorule_member_case_insensitive.yml
+++ b/tests/sudorule/test_sudorule_member_case_insensitive.yml
@@ -16,7 +16,7 @@
- block:
# SETUP
- name: Ensure domain name
- set_fact:
+ ansible.builtin.set_fact:
ipa_domain: ipa.test
when: ipa_domain is not defined
@@ -56,7 +56,7 @@
# TESTS
- name: Start tests.
- debug:
+ ansible.builtin.debug:
msg: "Tests are starting."
- name: Ensure sudorule exist with runasusers members
@@ -249,7 +249,7 @@
failed_when: result.failed or result.changed
- name: End tests.
- debug:
+ ansible.builtin.debug:
msg: "All tests executed."
always:
diff --git a/tests/sudorule/test_sudorule_single_hostnames.yml b/tests/sudorule/test_sudorule_single_hostnames.yml
index 38ccad9a..24acd8b6 100644
--- a/tests/sudorule/test_sudorule_single_hostnames.yml
+++ b/tests/sudorule/test_sudorule_single_hostnames.yml
@@ -8,7 +8,7 @@
- block:
# setup test environment
- name: Get Domain from the server name
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
when: ipaserver_domain is not defined
--
GitLab