cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update file.py's help doc, and narrow down diff logic, for recent pull 56353 (#59069)

Browse source 
* Limiting when path_content is generated

path_content will be empty and unnecessary in all scenarios except when changing the state of a folder to absent, so adding in a check to limit when this parameter is defined
This commit is contained in:
Iain Madder 2019-08-13 17:59:13 +01:00 committed by Sam Doran
parent a20848bf66
commit 1b1216d2d1
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/files/file.py
View file

@ -33,7 +33,8 @@ options:
state: state:
description: description:
- If C(absent), directories will be recursively deleted, and files or symlinks will - If C(absent), directories will be recursively deleted, and files or symlinks will
be unlinked. Note that C(absent) will not cause C(file) to fail if the C(path) does be unlinked. In the case of a directory, if C(diff) is declared, you will see the files and folders deleted listed
under C(path_contents). Note that C(absent) will not cause C(file) to fail if the C(path) does
not exist as the state did not change. not exist as the state did not change.
- If C(directory), all intermediate subdirectories will be created if they - If C(directory), all intermediate subdirectories will be created if they
do not exist. Since Ansible 1.7 they will be created with the supplied permissions. do not exist. Since Ansible 1.7 they will be created with the supplied permissions.
@ -377,7 +378,7 @@ def initial_diff(path, state, prev_state):
if prev_state != state: if prev_state != state:
diff['before']['state'] = prev_state diff['before']['state'] = prev_state
diff['after']['state'] = state diff['after']['state'] = state
if state == 'absent': if state == 'absent' and prev_state == 'directory':
walklist = { walklist = {
'directories': [], 'directories': [],
'files': [], 'files': [],

18
test/integration/targets/file/tasks/main.yml
View file

@ -266,21 +266,25 @@
- name: check what would be removed if folder state was absent and diff is enabled - name: check what would be removed if folder state was absent and diff is enabled
file: file:
path: "{{ output_dir }}" path: "{{ item }}"
state: absent state: absent
check_mode: yes check_mode: yes
diff: yes diff: yes
with_items:
- "{{ output_dir }}"
- "{{ output_dir }}/foobar/fileA"
register: folder_absent_result register: folder_absent_result
- name: assert that the absent check lists expected files and folders - name: 'assert that the "absent" state lists expected files and folders for only directories'
assert: assert:
that: that:
- folder_absent_result.diff.before.path_content is defined - folder_absent_result.results[0].diff.before.path_content is defined
- test_folder in folder_absent_result.diff.before.path_content.directories - folder_absent_result.results[1].diff.before.path_content is not defined
- test_file in folder_absent_result.diff.before.path_content.files - test_folder in folder_absent_result.results[0].diff.before.path_content.directories
- test_file in folder_absent_result.results[0].diff.before.path_content.files
vars: vars:
test_folder: "{{ folder_absent_result.path }}/foobar" test_folder: "{{ folder_absent_result.results[0].path }}/foobar"
test_file: "{{ folder_absent_result.path }}/foobar/fileA" test_file: "{{ folder_absent_result.results[0].path }}/foobar/fileA"
- name: Change ownership of a directory with recurse=no(default) - name: Change ownership of a directory with recurse=no(default)
file: path={{output_dir}}/foobar owner=1234 file: path={{output_dir}}/foobar owner=1234