Skip to content

Commit ea04456

Browse files
committed
[Path] Cleanup
1 parent a6efb7a commit ea04456

8 files changed

Lines changed: 30 additions & 67 deletions

File tree

path/plugins/filter/default.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ DOCUMENTATION:
44
name: default
55
author:
66
- Manala (@manala)
7-
short_description: Apply default values to a path dict or a list of path dict
7+
short_description: Apply default values to a path dict or a list of path dicts
88
description:
9-
- Returns a path dictor a list of path dicts with default values applied for missing keys.
10-
positional: _input, _paths
9+
- Returns a path dict or a list of path dicts with default values applied for missing keys.
10+
positional: _input, default_paths
1111
options:
1212
_input:
13-
description: A path dict, or a list of path dict.
13+
description: A path dict, or a list of path dicts.
1414
type: raw
1515
required: true
1616
_default_paths:
17-
description: A list of path dict containing default values to apply.
17+
description: A list of path dicts containing default values to apply.
1818
type: dict
1919
required: true
2020
state:

path/tests/integration/targets/match/tasks/main.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

path/tests/integration/targets/path/tasks/absent.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,10 @@
4949
loop: "{{ fixtures }}"
5050

5151
- name: absent | Converge
52-
vars:
53-
__path: "{{ item | manala.path.root(root) }}"
54-
manala.path.path: "{{ __path }}"
55-
loop: "{{ paths }}"
52+
manala.path.path: "{{ item }}"
53+
loop: "{{ paths | manala.path.root(root) }}"
5654
loop_control:
57-
label: "{{ __path | manala.path.label }}"
55+
label: "{{ item | manala.path.label }}"
5856

5957
- name: absent | Stats
6058
ansible.builtin.stat:

path/tests/integration/targets/path/tasks/defaults.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@
3434
- {path: "{{ root.path }}", state: directory}
3535

3636
- name: defaults | Converge
37-
vars:
38-
__path: "{{ item | manala.path.root(root)
39-
| manala.path.default(default_file, state='file')
40-
| manala.path.default(default_directory, state='directory')
41-
}}"
42-
manala.path.path: "{{ __path }}"
43-
loop: "{{ paths }}"
37+
manala.path.path: "{{ item }}"
38+
loop: "{{ paths
39+
| manala.path.root(root)
40+
| manala.path.default(default_file, state='file')
41+
| manala.path.default(default_directory, state='directory')
42+
}}"
4443
loop_control:
45-
label: "{{ __path | manala.path.label }}"
44+
label: "{{ item | manala.path.label }}"
4645
register: converge
4746

4847
- name: defaults | Stats

path/tests/integration/targets/path/tasks/directory.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@
3636
loop: "{{ fixtures }}"
3737

3838
- name: directory | Converge
39-
vars:
40-
__path: "{{ item | manala.path.root(root) }}"
41-
manala.path.path: "{{ __path }}"
42-
loop: "{{ paths }}"
39+
manala.path.path: "{{ item }}"
40+
loop: "{{ paths | manala.path.root(root) }}"
4341
loop_control:
44-
label: "{{ __path | manala.path.label }}"
42+
label: "{{ item | manala.path.label }}"
4543

4644
- name: directory | Stats
4745
ansible.builtin.stat:

path/tests/integration/targets/path/tasks/exclusify.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@
4343
register: found
4444

4545
- name: exclusify | Converge
46-
vars:
47-
__path: "{{ item | manala.path.root(root) }}"
48-
manala.path.path: "{{ __path }}"
49-
loop: "{{ paths | manala.path.exclusify(found.paths) }}"
46+
manala.path.path: "{{ item }}"
47+
loop: "{{ paths
48+
| manala.path.exclusify(found.paths)
49+
| manala.path.root(root)
50+
}}"
5051
loop_control:
51-
label: "{{ __path | manala.path.label }}"
52+
label: "{{ item | manala.path.label }}"
5253

5354
- name: exclusify | Stats
5455
ansible.builtin.stat:

path/tests/integration/targets/path/tasks/file.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,10 @@
5353
loop: "{{ fixtures }}"
5454

5555
- name: file | Converge
56-
vars:
57-
__path: "{{ item | manala.path.root(root) }}"
58-
manala.path.path: "{{ __path }}"
59-
loop: "{{ paths }}"
56+
manala.path.path: "{{ item }}"
57+
loop: "{{ paths | manala.path.root(root) }}"
6058
loop_control:
61-
label: "{{ __path | manala.path.label }}"
59+
label: "{{ item | manala.path.label }}"
6260

6361
- name: file | Stats
6462
ansible.builtin.stat:

path/tests/integration/targets/path/tasks/link.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333
loop: "{{ fixtures }}"
3434

3535
- name: link | Converge
36-
vars:
37-
__path: "{{ item | manala.path.root(root) }}"
38-
manala.path.path: "{{ __path }}"
39-
loop: "{{ paths }}"
36+
manala.path.path: "{{ item }}"
37+
loop: "{{ paths | manala.path.root(root) }}"
4038
loop_control:
41-
label: "{{ __path | manala.path.label }}"
39+
label: "{{ item | manala.path.label }}"
4240

4341
- name: link | Stats
4442
ansible.builtin.stat:

0 commit comments

Comments
 (0)