copy: ensure _original_basename is set: fixes #47050 (#47238)

* fixed #47050

* added changelog fragment

* added quick and basic test

* Revert "added quick and basic test"

This reverts commit 75f4141656.

* added better tests

* now also creating files to copy on the remote

* removed tests for recursive copying which is not supported by remote_src
This commit is contained in:
Moritz Grimm 2020-02-21 18:55:12 +01:00 committed by GitHub
parent d74ed41a4c
commit 79dfae9624
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 97 additions and 3 deletions

View file

@ -0,0 +1,3 @@
---
bugfixes:
- copy - Fixed copy module not working in case that remote_src is enabled and dest ends in a / (https://github.com/ansible/ansible/pull/47238)

View file

@ -574,8 +574,9 @@ def main():
)
# Special handling for recursive copy - create intermediate dirs
if _original_basename and dest.endswith(os.sep):
dest = os.path.join(dest, _original_basename)
if dest.endswith(os.sep):
if _original_basename:
dest = os.path.join(dest, _original_basename)
b_dest = to_bytes(dest, errors='surrogate_or_strict')
dirname = os.path.dirname(dest)
b_dirname = to_bytes(dirname, errors='surrogate_or_strict')

View file

@ -0,0 +1,43 @@
# src is a file, dest is a non-existent directory (2 levels of directories):
# checks that dest is created
- name: Ensure that dest top directory doesn't exist
file:
path: '{{ remote_dir }}/{{ item.dest.split("/")[0] }}'
state: absent
- name: create subdir
file:
path: subdir
state: directory
- name: create src file
file:
path: "{{ item }}"
state: touch
loop:
- foo.txt
- subdir/bar.txt
- name: Copy file, dest is a nonexistent target directory
copy:
src: '{{ item.src }}'
dest: '{{ remote_dir }}/{{ item.dest }}'
remote_src: true
register: copy_result
- name: assert copy worked
assert:
that:
- 'copy_result is successful'
- 'copy_result is changed'
- name: stat copied file
stat:
path: '{{ remote_dir }}/{{ item.check }}'
register: stat_file_in_dir_result
- name: assert that file exists
assert:
that:
- stat_file_in_dir_result.stat.exists
- stat_file_in_dir_result.stat.isreg

View file

@ -0,0 +1,32 @@
- name: Ensure that dest top directory doesn't exist
file:
path: '{{ remote_dir }}/{{ dest.split("/")[0] }}'
state: absent
- name: create src file
file:
path: foo.txt
state: touch
- name: Copy file, dest is a file in non-existing target directory
copy:
src: foo.txt
dest: '{{ remote_dir }}/{{ dest }}'
remote_src: true
register: copy_result
ignore_errors: True
- name: Assert copy failed
assert:
that:
- 'copy_result is failed'
- name: Stat dest path
stat:
path: '{{ remote_dir }}/{{ dest.split("/")[0] }}'
register: stat_file_in_dir_result
- name: assert that dest doesn't exist
assert:
that:
- 'not stat_file_in_dir_result.stat.exists'

View file

@ -1466,6 +1466,22 @@
path: 'ansible-testing.txt'
state: absent
# src is a file, dest is a non-existent directory (2 levels of directories):
# using remote_src
# checks that dest is created
- include: dest_in_non_existent_directories_remote_src.yml
with_items:
- { src: 'foo.txt', dest: 'new_sub_dir1/sub_dir2/', check: 'new_sub_dir1/sub_dir2/foo.txt' }
# src is a file, dest is file in a non-existent directory: checks that a failure occurs
# using remote_src
- include: src_file_dest_file_in_non_existent_dir_remote_src.yml
with_items:
- 'new_sub_dir1/sub_dir2/foo.txt'
- 'new_sub_dir1/foo.txt'
loop_control:
loop_var: 'dest'
# src is a file, dest is a non-existent directory (2 levels of directories):
# checks that dest is created
- include: dest_in_non_existent_directories.yml
@ -1483,7 +1499,6 @@
- 'new_sub_dir1/foo.txt'
loop_control:
loop_var: 'dest'
#
# Recursive copying on remote host
#