[stable-2.16] assemble: fixed missing parameter error (#83124)

* content is an optional parameter for _get_diff_data API Fixes: #82359 Signed-off-by: Abhijeet Kasurde <[email protected]>
ansible · May 9, 2024 · 1f4eb21 · 1f4eb21
1 parent 7201355
commit 1f4eb21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/changelogs/fragments/82359_assemble_diff.yml b/changelogs/fragments/82359_assemble_diff.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+ - assemble - fixed missing parameter 'content' in _get_diff_data API (https://github.com/ansible/ansible/issues/82359).
diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py
@@ -1339,7 +1339,7 @@ def _low_level_execute_command(self, cmd, sudoable=True, in_data=None, executabl
  display.debug(u"_low_level_execute_command() done: rc=%d, stdout=%s, stderr=%s" % (rc, out, err))
  return dict(rc=rc, stdout=out, stdout_lines=out.splitlines(), stderr=err, stderr_lines=err.splitlines())
 
- def _get_diff_data(self, destination, source, task_vars, content, source_file=True):
+ def _get_diff_data(self, destination, source, task_vars, content=None, source_file=True):
 
  # Note: Since we do not diff the source and destination before we transform from bytes into
  # text the diff between source and destination may not be accurate. To fix this, we'd need

diff --git a/test/integration/targets/assemble/tasks/main.yml b/test/integration/targets/assemble/tasks/main.yml
@@ -152,3 +152,19 @@
  that:
  - "result.state == 'file'"
  - "result.checksum == '505359f48c65b3904127cf62b912991d4da7ed6d'"
+
+- name: test assemble with diff
+ assemble:
+ src: "./"
+ dest: "{{remote_tmp_dir}}/assembled11"
+ remote_src: false
+ diff: true
+ register: result
+
+- name: assert the fragments were assembled with diff
+ assert:
+ that:
+ - result.changed
+ - result.diff.after is defined
+ - result.diff.before is defined
+ - "result.state == 'file'"