From d2f9fe6325f7a85c760bb5cf7d15f1e6a81cc176 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 17 Jan 2023 12:34:49 +0100
Subject: [PATCH] Fix jinja2 white spaces issues reported by ansible-lint
This replaces double spaces by single spaces, fixes spaces in slices,
adds spaces before brackets and fixes bracket placing in when clauses.
---
tests/group/test_group_idoverrideuser.yml | 2 +-
.../test_hbacrule_member_case_insensitive.yml | 2 +-
.../test_netgroup_member_case_insensitive.yml | 60 +++++++++----------
tests/permission/test_permission.yml | 8 +--
tests/pwpolicy/test_pwpolicy.yml | 10 ++--
tests/sudocmdgroup/test_sudocmdgroup.yml | 2 +-
.../test_sudorule_member_case_insensitive.yml | 48 +++++++--------
tests/user/test_users_absent.yml | 2 +-
tests/user/test_users_present_slice.yml | 4 +-
tests/vault/test_vault_symmetric.yml | 4 +-
10 files changed, 70 insertions(+), 72 deletions(-)
diff --git a/tests/group/test_group_idoverrideuser.yml b/tests/group/test_group_idoverrideuser.yml
index e468b88b..71d640a6 100644
--- a/tests/group/test_group_idoverrideuser.yml
+++ b/tests/group/test_group_idoverrideuser.yml
@@ -103,4 +103,4 @@
kdestroy -A -q -c idoverride_cache
when:
- when: ipa_version is version("4.8.7", ">=") and trust_test_is_supported | default(false)
+ when: ipa_version is version("4.8.7", ">=") and trust_test_is_supported | default(false)
diff --git a/tests/hbacrule/test_hbacrule_member_case_insensitive.yml b/tests/hbacrule/test_hbacrule_member_case_insensitive.yml
index 160f8713..e37163de 100644
--- a/tests/hbacrule/test_hbacrule_member_case_insensitive.yml
+++ b/tests/hbacrule/test_hbacrule_member_case_insensitive.yml
@@ -193,7 +193,7 @@
- "{{ hbacsvc_list[0] | upper }}"
- "{{ hbacsvc_list[1] | upper }}"
hbacsvcgroup:
- - "{{ hbacsvcgroup_list[0] | upper }}"
+ - "{{ hbacsvcgroup_list[0] | upper }}"
register: result
failed_when: result.changed or result.failed
diff --git a/tests/netgroup/test_netgroup_member_case_insensitive.yml b/tests/netgroup/test_netgroup_member_case_insensitive.yml
index e98100fe..7a0968c0 100644
--- a/tests/netgroup/test_netgroup_member_case_insensitive.yml
+++ b/tests/netgroup/test_netgroup_member_case_insensitive.yml
@@ -92,11 +92,11 @@
ipanetgroup:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "hostgroup{{ item | lower }}"
- host: "{{ item | lower }}.{{ ipaserver_domain }}"
- group: "{{ item | lower }}"
- user: "user{{ item | lower }}"
- netgroup: "netgroup{{ item | lower }}"
+ hostgroup: "hostgroup{{ item | lower }}"
+ host: "{{ item | lower }}.{{ ipaserver_domain }}"
+ group: "{{ item | lower }}"
+ user: "user{{ item | lower }}"
+ netgroup: "netgroup{{ item | lower }}"
action: member
loop: "{{ groups_present }}"
register: result
@@ -106,11 +106,11 @@
ipanetgroup:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "hostgroup{{ item | upper }}"
- host: "{{ item | upper }}.{{ ipaserver_domain }}"
- group: "{{ item | upper }}"
- user: "user{{ item | upper }}"
- netgroup: "netgroup{{ item | upper }}"
+ hostgroup: "hostgroup{{ item | upper }}"
+ host: "{{ item | upper }}.{{ ipaserver_domain }}"
+ group: "{{ item | upper }}"
+ user: "user{{ item | upper }}"
+ netgroup: "netgroup{{ item | upper }}"
action: member
loop: "{{ groups_present }}"
register: result
@@ -135,11 +135,11 @@
ipanetgroup:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "hostgroup{{ item | lower }}"
- host: "{{ item | lower }}.{{ ipaserver_domain }}"
- group: "{{ item | lower }}"
- user: "user{{ item | lower }}"
- netgroup: "netgroup{{ item | lower }}"
+ hostgroup: "hostgroup{{ item | lower }}"
+ host: "{{ item | lower }}.{{ ipaserver_domain }}"
+ group: "{{ item | lower }}"
+ user: "user{{ item | lower }}"
+ netgroup: "netgroup{{ item | lower }}"
action: member
state: absent
loop: "{{ groups_present }}"
@@ -150,11 +150,11 @@
ipanetgroup:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "hostgroup{{ item | upper }}"
- host: "{{ item | upper }}.{{ ipaserver_domain }}"
- group: "{{ item | upper }}"
- user: "user{{ item | upper }}"
- netgroup: "netgroup{{ item | upper }}"
+ hostgroup: "hostgroup{{ item | upper }}"
+ host: "{{ item | upper }}.{{ ipaserver_domain }}"
+ group: "{{ item | upper }}"
+ user: "user{{ item | upper }}"
+ netgroup: "netgroup{{ item | upper }}"
action: member
state: absent
loop: "{{ groups_present }}"
@@ -165,11 +165,11 @@
ipanetgroup:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "hostgroup{{ item | upper }}"
- host: "{{ item | upper }}.{{ ipaserver_domain }}"
- group: "{{ item | upper }}"
- user: "user{{ item | upper }}"
- netgroup: "netgroup{{ item | upper }}"
+ hostgroup: "hostgroup{{ item | upper }}"
+ host: "{{ item | upper }}.{{ ipaserver_domain }}"
+ group: "{{ item | upper }}"
+ user: "user{{ item | upper }}"
+ netgroup: "netgroup{{ item | upper }}"
action: member
loop: "{{ groups_present }}"
register: result
@@ -179,11 +179,11 @@
ipanetgroup:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "hostgroup{{ item | lower }}"
- host: "{{ item | lower }}.{{ ipaserver_domain }}"
- group: "{{ item | lower }}"
- user: "user{{ item | lower }}"
- netgroup: "netgroup{{ item | lower }}"
+ hostgroup: "hostgroup{{ item | lower }}"
+ host: "{{ item | lower }}.{{ ipaserver_domain }}"
+ group: "{{ item | lower }}"
+ user: "user{{ item | lower }}"
+ netgroup: "netgroup{{ item | lower }}"
action: member
loop: "{{ groups_present }}"
register: result
diff --git a/tests/permission/test_permission.yml b/tests/permission/test_permission.yml
index 99054644..5b27a769 100644
--- a/tests/permission/test_permission.yml
+++ b/tests/permission/test_permission.yml
@@ -247,7 +247,7 @@
register: result
failed_when: result.changed or result.failed
- - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries"
+ - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries"
ipapermission:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -259,7 +259,7 @@
register: result
failed_when: not result.changed or result.failed
- - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" again
+ - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries" again
ipapermission:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -271,7 +271,7 @@
register: result
failed_when: result.changed or result.failed
- - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries"
+ - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries"
ipapermission:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -284,7 +284,7 @@
register: result
failed_when: not result.changed or result.failed
- - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" again
+ - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries" again
ipapermission:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
diff --git a/tests/pwpolicy/test_pwpolicy.yml b/tests/pwpolicy/test_pwpolicy.yml
index 9d60a92c..871406fb 100644
--- a/tests/pwpolicy/test_pwpolicy.yml
+++ b/tests/pwpolicy/test_pwpolicy.yml
@@ -176,12 +176,10 @@
minlength: ""
register: result
failed_when:
- result.changed or (
- result.failed and not (
- "an internal error has occurred" in result.msg
- or "int() argument must be" in result.msg
- )
- )
+ result.changed or
+ (result.failed and not
+ ("an internal error has occurred" in result.msg or
+ "int() argument must be" in result.msg))
when: ipa_version is version("4.9", ">=")
- name: Ensure minlength is not cleared due to FreeIPA issue
diff --git a/tests/sudocmdgroup/test_sudocmdgroup.yml b/tests/sudocmdgroup/test_sudocmdgroup.yml
index 39f222f8..ae0441b7 100644
--- a/tests/sudocmdgroup/test_sudocmdgroup.yml
+++ b/tests/sudocmdgroup/test_sudocmdgroup.yml
@@ -88,7 +88,7 @@
KRB5CCNAME="verify_sudocmdgroup" ipa sudocmdgroup-show network --all
kdestroy -A -q -c verify_sudocmdgroup
register: result
- failed_when: result.failed or not("/usr/sbin/ifconfig" in result.stdout and "/usr/sbin/iwlist" in result.stdout)
+ failed_when: result.failed or not ("/usr/sbin/ifconfig" in result.stdout and "/usr/sbin/iwlist" in result.stdout)
- name: Ensure sudocmdgroup, with sudocmds, is absent
ipasudocmdgroup:
diff --git a/tests/sudorule/test_sudorule_member_case_insensitive.yml b/tests/sudorule/test_sudorule_member_case_insensitive.yml
index 582e8204..cc212406 100644
--- a/tests/sudorule/test_sudorule_member_case_insensitive.yml
+++ b/tests/sudorule/test_sudorule_member_case_insensitive.yml
@@ -147,10 +147,10 @@
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
cmdcategory: all
- hostgroup: "{{ item | lower }}"
- host: "{{ item | lower }}.{{ ipa_domain }}"
- group: "{{ item | lower }}"
- user: "user{{ item | lower }}"
+ hostgroup: "{{ item | lower }}"
+ host: "{{ item | lower }}.{{ ipa_domain }}"
+ group: "{{ item | lower }}"
+ user: "user{{ item | lower }}"
loop: "{{ groups_present }}"
register: result
failed_when: result.failed or result.changed
@@ -160,10 +160,10 @@
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
cmdcategory: all
- hostgroup: "{{ item | upper }}"
- host: "{{ item | upper }}.{{ ipa_domain }}"
- group: "{{ item | upper }}"
- user: "user{{ item | upper }}"
+ hostgroup: "{{ item | upper }}"
+ host: "{{ item | upper }}.{{ ipa_domain }}"
+ group: "{{ item | upper }}"
+ user: "user{{ item | upper }}"
loop: "{{ groups_present }}"
register: result
failed_when: result.failed or result.changed
@@ -186,10 +186,10 @@
ipasudorule:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "{{ item | lower }}"
- host: "{{ item | lower }}.{{ ipa_domain }}"
- group: "{{ item | lower }}"
- user: "user{{ item | lower }}"
+ hostgroup: "{{ item | lower }}"
+ host: "{{ item | lower }}.{{ ipa_domain }}"
+ group: "{{ item | lower }}"
+ user: "user{{ item | lower }}"
action: member
state: absent
loop: "{{ groups_present }}"
@@ -200,10 +200,10 @@
ipasudorule:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "{{ item | upper }}"
- host: "{{ item | upper }}.{{ ipa_domain }}"
- group: "{{ item | upper }}"
- user: "user{{ item | upper }}"
+ hostgroup: "{{ item | upper }}"
+ host: "{{ item | upper }}.{{ ipa_domain }}"
+ group: "{{ item | upper }}"
+ user: "user{{ item | upper }}"
action: member
state: absent
loop: "{{ groups_present }}"
@@ -214,10 +214,10 @@
ipasudorule:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "{{ item | upper }}"
- host: "{{ item | upper }}.{{ ipa_domain }}"
- group: "{{ item | upper }}"
- user: "user{{ item | upper }}"
+ hostgroup: "{{ item | upper }}"
+ host: "{{ item | upper }}.{{ ipa_domain }}"
+ group: "{{ item | upper }}"
+ user: "user{{ item | upper }}"
action: member
loop: "{{ groups_present }}"
register: result
@@ -227,10 +227,10 @@
ipasudorule:
ipaadmin_password: SomeADMINpassword
name: "{{ item }}"
- hostgroup: "{{ item | lower }}"
- host: "{{ item | lower }}.{{ ipa_domain }}"
- group: "{{ item | lower }}"
- user: "user{{ item | lower }}"
+ hostgroup: "{{ item | lower }}"
+ host: "{{ item | lower }}.{{ ipa_domain }}"
+ group: "{{ item | lower }}"
+ user: "user{{ item | lower }}"
action: member
loop: "{{ groups_present }}"
register: result
diff --git a/tests/user/test_users_absent.yml b/tests/user/test_users_absent.yml
index 23670510..59a15fea 100644
--- a/tests/user/test_users_absent.yml
+++ b/tests/user/test_users_absent.yml
@@ -14,7 +14,7 @@
- name: Create dict with user names
ansible.builtin.set_fact:
- user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}"
+ user_names: "{{ user_names | default([]) + [{'name': item.name}] }}"
loop: "{{ users }}"
- name: Users absent len:{{ users | length }}
diff --git a/tests/user/test_users_present_slice.yml b/tests/user/test_users_present_slice.yml
index 904be415..c3274974 100644
--- a/tests/user/test_users_present_slice.yml
+++ b/tests/user/test_users_present_slice.yml
@@ -19,5 +19,5 @@
- name: Users present
ipauser:
ipaadmin_password: SomeADMINpassword
- users: "{{ users[item:item+slice_size] }}"
- loop: "{{ range(0,users | length, slice_size) | list }}"
+ users: "{{ users[item : item + slice_size] }}"
+ loop: "{{ range(0, users | length, slice_size) | list }}"
diff --git a/tests/vault/test_vault_symmetric.yml b/tests/vault/test_vault_symmetric.yml
index 89ee1424..344ea691 100644
--- a/tests/vault/test_vault_symmetric.yml
+++ b/tests/vault/test_vault_symmetric.yml
@@ -267,7 +267,7 @@
salt: MTIzNDU2Nzg5MDEyMzQ1Ngo=
new_password: SomeVAULTpassword
register: result
- failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
+ failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
- name: Try to change symmetric vault salt, without providing `new_password`
ipavault:
@@ -276,7 +276,7 @@
salt: MTIzNDU2Nzg5MDEyMzQ1Ngo=
password: SomeVAULTpassword
register: result
- failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
+ failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
- name: Try to change symmetric vault salt, using wrong password.
ipavault:
--
GitLab