diff --git a/changelogs/fragments/716-synchronize-link-dest-changed.yml b/changelogs/fragments/716-synchronize-link-dest-changed.yml new file mode 100644 index 0000000..458da36 --- /dev/null +++ b/changelogs/fragments/716-synchronize-link-dest-changed.yml @@ -0,0 +1,5 @@ +bugfixes: + - synchronize - report ``changed`` correctly when ``link_dest`` is used. Previously the module + reported no change as soon as rsync listed one unchanged file, even if other files were + transferred, deleted or had their attributes updated + (https://github.com/ansible-collections/ansible.posix/issues/716). diff --git a/plugins/modules/synchronize.py b/plugins/modules/synchronize.py index 37b080a..ee966b2 100644 --- a/plugins/modules/synchronize.py +++ b/plugins/modules/synchronize.py @@ -632,8 +632,10 @@ def main(): return module.fail_json(msg=err, rc=rc, cmd=cmdstr) if link_dest: - # a leading period indicates no change - changed = (changed_marker + '.') not in out + # -vv also itemizes unchanged items: a period, the file type, then + # spaces (e.g. '.f foo'). Every other itemized line is a change. + items = [line[len(changed_marker):] for line in out.splitlines() if line.startswith(changed_marker)] + changed = any(not (item.startswith('.') and item[2:3] == ' ') for item in items) else: changed = changed_marker in out diff --git a/tests/integration/targets/synchronize/tasks/main.yml b/tests/integration/targets/synchronize/tasks/main.yml index d6dcdad..0c6e923 100644 --- a/tests/integration/targets/synchronize/tasks/main.yml +++ b/tests/integration/targets/synchronize/tasks/main.yml @@ -299,6 +299,102 @@ - directory_a - directory_b +- name: Setup - directories for link_dest change detection + ansible.builtin.file: + state: directory + path: "{{ output_dir }}/{{ item }}" + mode: "0750" + loop: + - link_dest_src + - link_dest_dst + - link_dest_base + +- name: Setup - create source files for link_dest change detection + ansible.builtin.copy: + dest: "{{ output_dir }}/link_dest_src/{{ item }}" + mode: "0640" + content: hello world + loop: + - foo.txt + - bar.txt + # the module's output marker in a file name must not count as a change + - "<>baz.txt" + +- name: Synchronize a directory using link_dest + ansible.posix.synchronize: + src: "{{ output_dir }}/link_dest_src/" + dest: "{{ output_dir }}/link_dest_dst/" + link_dest: + - "{{ output_dir }}/link_dest_base" + register: sync_initial + delegate_to: "{{ inventory_hostname }}" + +- name: Synchronize the same directory again using link_dest + ansible.posix.synchronize: + src: "{{ output_dir }}/link_dest_src/" + dest: "{{ output_dir }}/link_dest_dst/" + link_dest: + - "{{ output_dir }}/link_dest_base" + register: sync_unchanged + delegate_to: "{{ inventory_hostname }}" + +- name: Change the content of one source file only + ansible.builtin.copy: + dest: "{{ output_dir }}/link_dest_src/bar.txt" + mode: "0640" + content: goodbye world + +# rsync -vv still lists the unchanged foo.txt, which used to hide the change +- name: Synchronize using link_dest after a content change + ansible.posix.synchronize: + src: "{{ output_dir }}/link_dest_src/" + dest: "{{ output_dir }}/link_dest_dst/" + link_dest: + - "{{ output_dir }}/link_dest_base" + register: sync_content + delegate_to: "{{ inventory_hostname }}" + +- name: Change the permissions of one source file only + ansible.builtin.file: + path: "{{ output_dir }}/link_dest_src/foo.txt" + mode: "0600" + +- name: Synchronize using link_dest after a permission change + ansible.posix.synchronize: + src: "{{ output_dir }}/link_dest_src/" + dest: "{{ output_dir }}/link_dest_dst/" + link_dest: + - "{{ output_dir }}/link_dest_base" + register: sync_mode + delegate_to: "{{ inventory_hostname }}" + +- name: Synchronize again using link_dest after the changes + ansible.posix.synchronize: + src: "{{ output_dir }}/link_dest_src/" + dest: "{{ output_dir }}/link_dest_dst/" + link_dest: + - "{{ output_dir }}/link_dest_base" + register: sync_unchanged_again + delegate_to: "{{ inventory_hostname }}" + +- name: Ensure link_dest reports a change only when something changed + ansible.builtin.assert: + that: + - sync_initial is changed + - sync_unchanged is not changed + - sync_content is changed + - sync_mode is changed + - sync_unchanged_again is not changed + +- name: Cleanup + ansible.builtin.file: + state: absent + path: "{{ output_dir }}/{{ item }}" + loop: + - link_dest_src + - link_dest_dst + - link_dest_base + - name: Setup - test for source with working dir with spaces in path ansible.builtin.file: state: directory