Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not strip new lines in native jinja #46751

Merged
merged 2 commits into from
Oct 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/46743-fix-native-jinja-newlines.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- templar - Do not strip new lines in native jinja - https://github.com/ansible/ansible/issues/46743
7 changes: 2 additions & 5 deletions lib/ansible/template/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,7 @@ def do_template(self, data, preserve_trailing_newlines=True, escape_backslashes=

# For preserving the number of input newlines in the output (used
# later in this method)
if not USE_JINJA2_NATIVE:
data_newlines = _count_newlines_from_end(data)
else:
data_newlines = None
data_newlines = _count_newlines_from_end(data)

if fail_on_undefined is None:
fail_on_undefined = self._fail_on_undefined_errors
Expand Down Expand Up @@ -690,7 +687,7 @@ def do_template(self, data, preserve_trailing_newlines=True, escape_backslashes=
display.debug("failing because of a type error, template data is: %s" % to_native(data))
raise AnsibleError("Unexpected templating type error occurred on (%s): %s" % (to_native(data), to_native(te)))

if USE_JINJA2_NATIVE:
if USE_JINJA2_NATIVE and not isinstance(res, string_types):
return res

if preserve_trailing_newlines:
Expand Down
1 change: 1 addition & 0 deletions test/integration/targets/jinja2_native_types/runtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@
- import_tasks: test_dunder.yml
- import_tasks: test_types.yml
- import_tasks: test_none.yml
- import_tasks: test_template.yml
when: is_native
27 changes: 27 additions & 0 deletions test/integration/targets/jinja2_native_types/test_template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- block:
- name: Template file with newlines
template:
src: test_template_newlines.j2
dest: test_template_newlines.res

- name: Dump template file
stat:
path: test_template_newlines.j2
get_checksum: yes
register: template_stat

- name: Dump result file
stat:
path: test_template_newlines.res
get_checksum: yes
register: result_stat

- name: Check that number of newlines from original template are preserved
assert:
that:
- template_stat.stat.checksum == result_stat.stat.checksum
always:
- name: Clean up
file:
path: test_template_newlines.res
state: absent
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
First line.