ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-04 23:44:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

started implementing diff

Browse source 
diff now works with template
also fixed check mode for template and copy
This commit is contained in:
Brian Coca 2015-07-26 12:21:38 -04:00
commit 0b6fadaad7
8 changed files with 71 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/ansible/plugins/action/copy.py
View file

@ -174,17 +174,11 @@ class ActionModule(ActionBase):
if tmp is None or "-tmp-" not in tmp:
tmp = self._make_tmp_path()
# FIXME: runner shouldn't have the diff option there
#if self.runner.diff and not raw:
# diff = self._get_diff_data(tmp, dest_file, source_full, task_vars)
#else:
# diff = {}
diff = {}
if self._play_context.diff and not raw:
diffs.append(self._get_diff_data(tmp, dest_file, source_full, task_vars))
if self._play_context.check_mode:
self._remove_tempfile_if_content_defined(content, content_tempfile)
# FIXME: diff stuff
#diffs.append(diff)
changed = True
module_return = dict(changed=True)
continue
@ -231,7 +225,7 @@ class ActionModule(ActionBase):
if raw:
# Continue to next iteration if raw is defined.
# self._remove_tmp_path(tmp)
self._remove_tmp_path(tmp)
continue
# Build temporary module_args.
@ -244,6 +238,9 @@ class ActionModule(ActionBase):
)
)
if self._play_context.check_mode:
new_module_args['CHECKMODE'] = True
# Execute the file module.
module_return = self._execute_module(module_name='file', module_args=new_module_args, task_vars=task_vars, delete_remote_tmp=delete_remote_tmp)
module_executed = True
@ -299,9 +296,8 @@ class ActionModule(ActionBase):
diff['before'] = ''
elif peek_result['appears_binary']:
diff['dst_binary'] = 1
# FIXME: this should not be in utils..
#elif peek_result['size'] > utils.MAX_FILE_SIZE_FOR_DIFF:
# diff['dst_larger'] = utils.MAX_FILE_SIZE_FOR_DIFF
elif peek_result['size'] > C.MAX_FILE_SIZE_FOR_DIFF:
diff['dst_larger'] = C.MAX_FILE_SIZE_FOR_DIFF
else:
dest_result = self._execute_module(module_name='slurp', module_args=dict(path=destination), task_vars=task_vars, tmp=tmp, persist_files=True)
if 'content' in dest_result:
@ -318,9 +314,8 @@ class ActionModule(ActionBase):
st = os.stat(source)
if "\x00" in src_contents:
diff['src_binary'] = 1
# FIXME: this should not be in utils
#elif st[stat.ST_SIZE] > utils.MAX_FILE_SIZE_FOR_DIFF:
# diff['src_larger'] = utils.MAX_FILE_SIZE_FOR_DIFF
elif st[stat.ST_SIZE] > C.MAX_FILE_SIZE_FOR_DIFF:
diff['src_larger'] = C.MAX_FILE_SIZE_FOR_DIFF
else:
src.seek(0)
diff['after_header'] = source