[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 <akasurde@redhat.com>
pull/83226/head
Abhijeet Kasurde 7 months ago committed by GitHub
parent 72013559fe
commit 1f4eb2160b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,3 @@
---
bugfixes:
- assemble - fixed missing parameter 'content' in _get_diff_data API (https://github.com/ansible/ansible/issues/82359).

@ -1339,7 +1339,7 @@ class ActionBase(ABC):
display.debug(u"_low_level_execute_command() done: rc=%d, stdout=%s, stderr=%s" % (rc, out, err)) 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()) 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 # 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 # text the diff between source and destination may not be accurate. To fix this, we'd need

@ -152,3 +152,19 @@
that: that:
- "result.state == 'file'" - "result.state == 'file'"
- "result.checksum == '505359f48c65b3904127cf62b912991d4da7ed6d'" - "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'"

Loading…
Cancel
Save